diff --git a/.gitignore b/.gitignore
index 786886c1e..a854af234 100755
--- a/.gitignore
+++ b/.gitignore
@@ -72,6 +72,7 @@ tools/mkdocs
 /app/Config/database.php
 /app/Config/core.php
 /app/Config/config.php
+/app/Console/Command/training.json
 /app/Lib/cakephp
 /app/webroot/gpg.asc
 /app/tmp/logs
diff --git a/INSTALL/INSTALL.debian.sh b/INSTALL/INSTALL.debian.sh
index 89942c634..aaa5aebb6 100755
--- a/INSTALL/INSTALL.debian.sh
+++ b/INSTALL/INSTALL.debian.sh
@@ -16,11 +16,23 @@
 # 0/ Quick MISP Instance on Debian Based Linux - Status |
 #-------------------------------------------------------|
 #
-#    20190208: Kali Linux tested and working.
+#    20190302: Ubuntu 18.04.2 tested and working. -- sCl
+#    20190208: Kali Linux tested and working. -- sCl
+#
+#
+#-------------------------------------------------------------------------------------------------|
+# 1/ For other Debian based Linux distributions, download script and run as **unprivileged** user |
+#-------------------------------------------------------------------------------------------------|
+#
+# The following installs only MISP-core:
+# $ curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh | bash -s -- -c
+#
+# This will install MISP Core and misp-modules (recommended)
+# $ curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh | bash -s -- -c -M
 #
 #
 #-------------------------------------------------------|
-# 1/ For Kali, download and run Installer Script        |
+# 2/ For Kali, download and run Installer Script        |
 #-------------------------------------------------------|
 #
 # To install MISP on Kali copy paste the following to your r00t shell:
@@ -29,13 +41,6 @@
 # The script is tested on a plain vanilla Kali Linux Boot CD and installs quite a few dependencies.
 #
 #
-#---------------------------------------------------------------------------------------------|
-# 2/ For other Debian based Linux distributions, download script and run as unprivileged user |
-#---------------------------------------------------------------------------------------------|
-#
-# $ wget -O ~/INSTALL.debian.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh && bash ~/INSTALL.debian.sh -C
-#
-#
 #----------------------------------------------------------|
 # 3/ The following script has been partially autogenerated |
 #----------------------------------------------------------|
@@ -406,25 +411,14 @@ checkUsrLocalSrc () {
     else
       # TODO: The below might be shorter, more elegant and more modern
       #[[ -n $KALI ]] || [[ -n $UNATTENDED ]] && echo "Just do it" 
-      if [ "$KALI" == "1" -o "$UNATTENDED" == "1" ]; then
-        ANSWER="y"
-      else
-        space
-        echo "/usr/local/src need to be writeable by $MISP_USER for misp-modules, viper etc."
-        echo -n "Permission to fix? (y/n) "
-        read ANSWER
-        ANSWER=$(echo $ANSWER |tr [A-Z] [a-z])
-        space
-      fi
-      if [ "$ANSWER" == "y" ]; then
-        sudo chmod 2775 /usr/local/src
-        sudo chown root:staff /usr/local/src
-      fi
+      sudo chmod 2775 /usr/local/src
+      sudo chown root:staff /usr/local/src
     fi
   else
     echo "/usr/local/src does not exist, creating."
-    mkdir /usr/local/src
+    mkdir -p /usr/local/src
     sudo chmod 2775 /usr/local/src
+    # FIXME: This might fail on distros with no staff user
     sudo chown root:staff /usr/local/src
   fi
 }
@@ -783,7 +777,7 @@ genRCLOCAL () {
 
 # Run PyMISP tests
 runTests () {
-  sudo sed -i -E "s/url\ =\ (.*)/url\ =\ 'https:\/\/misp.local'/g" $PATH_TO_MISP/PyMISP/tests/testlive_comprehensive.py
+  sudo sed -i -E "s~url\ =\ (.*)~url\ =\ '${MISP_BASEURL}'~g" $PATH_TO_MISP/PyMISP/tests/testlive_comprehensive.py
   sudo sed -i -E "s/key\ =\ (.*)/key\ =\ '${AUTH_KEY}'/g" $PATH_TO_MISP/PyMISP/tests/testlive_comprehensive.py
   sudo chown -R $WWW_USER:$WWW_USER $PATH_TO_MISP/PyMISP/
 
@@ -1345,6 +1339,7 @@ mispmodules () {
 ##sudo sed -i -e '$i \sudo -u www-data /var/www/MISP/venv/bin/misp-modules -l 127.0.0.1 -s > /tmp/misp-modules_rc.local.log &\n' /etc/rc.local
   cd /usr/local/src/
   ## TODO: checkUsrLocalSrc in main doc
+  debug "Cloning misp-modules"
   $SUDO_USER git clone https://github.com/MISP/misp-modules.git
   cd misp-modules
   # some misp-modules dependencies
@@ -1490,17 +1485,20 @@ dashboardCAKE () {
 mail2misp () {
   debug "Installing Mail2${LBLUE}MISP${NC}"
   cd /usr/local/src/
-  sudo apt-get install cmake libcaca-dev -y
+  sudo apt-get install cmake libcaca-dev liblua5.3-dev -y
   $SUDO_USER git clone https://github.com/MISP/mail_to_misp.git
   $SUDO_USER git clone git://github.com/stricaud/faup.git faup
-  sudo chown -R ${MISP_USER}:${MISP_USER} faup mail_to_misp
-  cd faup
-  # TODO Check permissions
-  ##$SUDO mkdir -p build
+  $SUDO_USER git clone git://github.com/stricaud/gtcaca.git gtcaca
+  sudo chown -R ${MISP_USER}:${MISP_USER} faup mail_to_misp gtcaca
+  cd gtcaca
+  $SUDO_USER mkdir -p build
+  cd build
+  $SUDO_USER cmake .. && $SUDO_USER make
+  sudo make install
+  cd ../../faup
   $SUDO_USER mkdir -p build
   cd build
   $SUDO_USER cmake .. && $SUDO_USER make
-  ##$SUDO cmake .. && $SUDO make
   sudo make install
   sudo ldconfig
   cd ../../mail_to_misp
diff --git a/INSTALL/INSTALL.debian.tpl.sh b/INSTALL/INSTALL.debian.tpl.sh
index 19971a2b4..6498fc370 100755
--- a/INSTALL/INSTALL.debian.tpl.sh
+++ b/INSTALL/INSTALL.debian.tpl.sh
@@ -16,11 +16,23 @@
 # 0/ Quick MISP Instance on Debian Based Linux - Status |
 #-------------------------------------------------------|
 #
-#    20190208: Kali Linux tested and working.
+#    20190302: Ubuntu 18.04.2 tested and working. -- sCl
+#    20190208: Kali Linux tested and working. -- sCl
+#
+#
+#-------------------------------------------------------------------------------------------------|
+# 1/ For other Debian based Linux distributions, download script and run as **unprivileged** user |
+#-------------------------------------------------------------------------------------------------|
+#
+# The following installs only MISP-core:
+# $ curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh | bash -s -- -c
+#
+# This will install MISP Core and misp-modules (recommended)
+# $ curl -fsSL https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh | bash -s -- -c -M
 #
 #
 #-------------------------------------------------------|
-# 1/ For Kali, download and run Installer Script        |
+# 2/ For Kali, download and run Installer Script        |
 #-------------------------------------------------------|
 #
 # To install MISP on Kali copy paste the following to your r00t shell:
@@ -29,13 +41,6 @@
 # The script is tested on a plain vanilla Kali Linux Boot CD and installs quite a few dependencies.
 #
 #
-#---------------------------------------------------------------------------------------------|
-# 2/ For other Debian based Linux distributions, download script and run as unprivileged user |
-#---------------------------------------------------------------------------------------------|
-#
-# $ wget -O ~/INSTALL.debian.sh https://raw.githubusercontent.com/MISP/MISP/2.4/INSTALL/INSTALL.debian.sh && bash ~/INSTALL.debian.sh -C
-#
-#
 #----------------------------------------------------------|
 # 3/ The following script has been partially autogenerated |
 #----------------------------------------------------------|
diff --git a/INSTALL/MYSQL.sql b/INSTALL/MYSQL.sql
index ad1adfd6a..b429d101a 100644
--- a/INSTALL/MYSQL.sql
+++ b/INSTALL/MYSQL.sql
@@ -710,6 +710,7 @@ CREATE TABLE IF NOT EXISTS `roles` (
   `max_execution_time` VARCHAR(255) COLLATE utf8_bin DEFAULT "",
   `restricted_to_site_admin` tinyint(1) NOT NULL DEFAULT 0,
   `perm_publish_zmq` tinyint(1) NOT NULL DEFAULT 0,
+  `perm_publish_kafka` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 
@@ -1261,23 +1262,23 @@ INSERT INTO `feeds` (`id`, `provider`, `name`, `url`, `distribution`, `default`,
 -- 7. Read Only - read
 --
 
-INSERT INTO `roles` (`id`, `name`, `created`, `modified`, `perm_add`, `perm_modify`, `perm_modify_org`, `perm_publish`, `perm_publish_zmq`, `perm_sync`, `perm_admin`, `perm_audit`, `perm_full`, `perm_auth`, `perm_regexp_access`, `perm_tagger`, `perm_site_admin`, `perm_template`, `perm_sharing_group`, `perm_tag_editor`, `perm_delegate`, `perm_sighting`, `perm_object_template`, `default_role`)
-VALUES (1, 'admin', NOW(), NOW(), 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0);
+INSERT INTO `roles` (`id`, `name`, `created`, `modified`, `perm_add`, `perm_modify`, `perm_modify_org`, `perm_publish`, `perm_publish_zmq`, `perm_publish_kafka`, `perm_sync`, `perm_admin`, `perm_audit`, `perm_full`, `perm_auth`, `perm_regexp_access`, `perm_tagger`, `perm_site_admin`, `perm_template`, `perm_sharing_group`, `perm_tag_editor`, `perm_delegate`, `perm_sighting`, `perm_object_template`, `default_role`)
+VALUES (1, 'admin', NOW(), NOW(), 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0);
 
-INSERT INTO `roles` (`id`, `name`, `created`, `modified`, `perm_add`, `perm_modify`, `perm_modify_org`, `perm_publish`, `perm_publish_zmq`, `perm_sync`, `perm_admin`, `perm_audit`, `perm_full`, `perm_auth`, `perm_regexp_access`, `perm_tagger`, `perm_site_admin`, `perm_template`, `perm_sharing_group`, `perm_tag_editor`, `perm_delegate`, `perm_sighting`, `perm_object_template`, `default_role`)
-VALUES (2, 'Org Admin', NOW(), NOW(), 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0);
+INSERT INTO `roles` (`id`, `name`, `created`, `modified`, `perm_add`, `perm_modify`, `perm_modify_org`, `perm_publish`, `perm_publish_zmq`, `perm_publish_kafka`, `perm_sync`, `perm_admin`, `perm_audit`, `perm_full`, `perm_auth`, `perm_regexp_access`, `perm_tagger`, `perm_site_admin`, `perm_template`, `perm_sharing_group`, `perm_tag_editor`, `perm_delegate`, `perm_sighting`, `perm_object_template`, `default_role`)
+VALUES (2, 'Org Admin', NOW(), NOW(), 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0);
 
-INSERT INTO `roles` (`id`, `name`, `created`, `modified`, `perm_add`, `perm_modify`, `perm_modify_org`, `perm_publish`, `perm_publish_zmq`, `perm_sync`, `perm_admin`, `perm_audit`, `perm_full`, `perm_auth`, `perm_regexp_access`, `perm_tagger`, `perm_site_admin`, `perm_template`, `perm_sharing_group`, `perm_tag_editor`, `perm_delegate`, `perm_sighting`, `perm_object_template`, `default_role`)
-VALUES (3, 'User', NOW(), NOW(), 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1);
+INSERT INTO `roles` (`id`, `name`, `created`, `modified`, `perm_add`, `perm_modify`, `perm_modify_org`, `perm_publish`, `perm_publish_zmq`, `perm_publish_kafka`, `perm_sync`, `perm_admin`, `perm_audit`, `perm_full`, `perm_auth`, `perm_regexp_access`, `perm_tagger`, `perm_site_admin`, `perm_template`, `perm_sharing_group`, `perm_tag_editor`, `perm_delegate`, `perm_sighting`, `perm_object_template`, `default_role`)
+VALUES (3, 'User', NOW(), NOW(), 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1);
 
-INSERT INTO `roles` (`id`, `name`, `created`, `modified`, `perm_add`, `perm_modify`, `perm_modify_org`, `perm_publish`, `perm_publish_zmq`, `perm_sync`, `perm_admin`, `perm_audit`, `perm_full`, `perm_auth`, `perm_regexp_access`, `perm_tagger`, `perm_site_admin`, `perm_template`, `perm_sharing_group`, `perm_tag_editor`, `perm_delegate`, `perm_sighting`, `perm_object_template`, `default_role`)
-VALUES (4, 'Publisher', NOW(), NOW(), 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0);
+INSERT INTO `roles` (`id`, `name`, `created`, `modified`, `perm_add`, `perm_modify`, `perm_modify_org`, `perm_publish`, `perm_publish_zmq`, `perm_publish_kafka`, `perm_sync`, `perm_admin`, `perm_audit`, `perm_full`, `perm_auth`, `perm_regexp_access`, `perm_tagger`, `perm_site_admin`, `perm_template`, `perm_sharing_group`, `perm_tag_editor`, `perm_delegate`, `perm_sighting`, `perm_object_template`, `default_role`)
+VALUES (4, 'Publisher', NOW(), NOW(), 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0);
 
-INSERT INTO `roles` (`id`, `name`, `created`, `modified`, `perm_add`, `perm_modify`, `perm_modify_org`, `perm_publish`, `perm_publish_zmq`, `perm_sync`, `perm_admin`, `perm_audit`, `perm_full`, `perm_auth`, `perm_regexp_access`, `perm_tagger`, `perm_site_admin`, `perm_template`, `perm_sharing_group`, `perm_tag_editor`, `perm_delegate`, `perm_sighting`, `perm_object_template`, `default_role`)
-VALUES (5, 'Sync user', NOW(), NOW(), 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0);
+INSERT INTO `roles` (`id`, `name`, `created`, `modified`, `perm_add`, `perm_modify`, `perm_modify_org`, `perm_publish`, `perm_publish_zmq`, `perm_publish_kafka`, `perm_sync`, `perm_admin`, `perm_audit`, `perm_full`, `perm_auth`, `perm_regexp_access`, `perm_tagger`, `perm_site_admin`, `perm_template`, `perm_sharing_group`, `perm_tag_editor`, `perm_delegate`, `perm_sighting`, `perm_object_template`, `default_role`)
+VALUES (5, 'Sync user', NOW(), NOW(), 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 0, 0);
 
-INSERT INTO `roles` (`id`, `name`, `created`, `modified`, `perm_add`, `perm_modify`, `perm_modify_org`, `perm_publish`, `perm_publish_zmq`, `perm_sync`, `perm_admin`, `perm_audit`, `perm_full`, `perm_auth`, `perm_regexp_access`, `perm_tagger`, `perm_site_admin`, `perm_template`, `perm_sharing_group`, `perm_tag_editor`, `perm_delegate`, `perm_sighting`, `perm_object_template`, `default_role`)
-VALUES (6, 'Read Only', NOW(), NOW(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO `roles` (`id`, `name`, `created`, `modified`, `perm_add`, `perm_modify`, `perm_modify_org`, `perm_publish`, `perm_publish_zmq`, `perm_publish_kafka`, `perm_sync`, `perm_admin`, `perm_audit`, `perm_full`, `perm_auth`, `perm_regexp_access`, `perm_tagger`, `perm_site_admin`, `perm_template`, `perm_sharing_group`, `perm_tag_editor`, `perm_delegate`, `perm_sighting`, `perm_object_template`, `default_role`)
+VALUES (6, 'Read Only', NOW(), NOW(), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 
 -- --------------------------------------------------------
 
diff --git a/INSTALL/POSTGRESQL-data-initial.sql b/INSTALL/POSTGRESQL-data-initial.sql
index a1bb915a9..ab18b77d5 100644
--- a/INSTALL/POSTGRESQL-data-initial.sql
+++ b/INSTALL/POSTGRESQL-data-initial.sql
@@ -309,13 +309,13 @@ COPY public.regexp (id, regexp, replacement, type) FROM stdin;
 -- Data for Name: roles; Type: TABLE DATA; Schema: public; Owner: -
 --
 
-COPY public.roles (id, name, created, modified, perm_add, perm_modify, perm_modify_org, perm_publish, perm_delegate, perm_sync, perm_admin, perm_audit, perm_full, perm_auth, perm_site_admin, perm_regexp_access, perm_tagger, perm_template, perm_sharing_group, perm_tag_editor, perm_sighting, perm_object_template, default_role, memory_limit, max_execution_time, restricted_to_site_admin, perm_publish_zmq) FROM stdin;
-1	admin	2018-11-27 06:22:00+00	2018-11-27 06:22:00+00	t	t	t	t	t	t	t	t	t	t	t	t	t	t	t	t	t	t	f			f	t
-2	Org Admin	2018-11-27 06:22:00+00	2018-11-27 06:22:00+00	t	t	t	t	t	f	t	t	f	t	f	f	t	t	t	t	t	f	f			f	t
-3	User	2018-11-27 06:22:00+00	2018-11-27 06:22:00+00	t	t	t	f	f	f	f	f	f	t	f	f	f	f	f	f	t	f	t			f	f
-4	Publisher	2018-11-27 06:22:00+00	2018-11-27 06:22:00+00	t	t	t	t	t	f	f	f	f	t	f	f	f	f	f	f	t	f	f			f	t
-5	Sync user	2018-11-27 06:22:00+00	2018-11-27 06:22:00+00	t	t	t	t	t	t	f	f	f	t	f	f	f	f	t	f	t	f	f			f	t
-6	Read Only	2018-11-27 06:22:00+00	2018-11-27 06:22:00+00	f	f	f	f	f	f	f	f	f	t	f	f	f	f	f	f	f	f	f			f	f
+COPY public.roles (id, name, created, modified, perm_add, perm_modify, perm_modify_org, perm_publish, perm_delegate, perm_sync, perm_admin, perm_audit, perm_full, perm_auth, perm_site_admin, perm_regexp_access, perm_tagger, perm_template, perm_sharing_group, perm_tag_editor, perm_sighting, perm_object_template, default_role, memory_limit, max_execution_time, restricted_to_site_admin, perm_publish_zmq, perm_publish_kafka) FROM stdin;
+1	admin	2018-11-27 06:22:00+00	2018-11-27 06:22:00+00	t	t	t	t	t	t	t	t	t	t	t	t	t	t	t	t	t	t	f			f	t	t
+2	Org Admin	2018-11-27 06:22:00+00	2018-11-27 06:22:00+00	t	t	t	t	t	f	t	t	f	t	f	f	t	t	t	t	t	f	f			f	t	t
+3	User	2018-11-27 06:22:00+00	2018-11-27 06:22:00+00	t	t	t	f	f	f	f	f	f	t	f	f	f	f	f	f	t	f	t			f	f	f
+4	Publisher	2018-11-27 06:22:00+00	2018-11-27 06:22:00+00	t	t	t	t	t	f	f	f	f	t	f	f	f	f	f	f	t	f	f			f	t	t
+5	Sync user	2018-11-27 06:22:00+00	2018-11-27 06:22:00+00	t	t	t	t	t	t	f	f	f	t	f	f	f	f	t	f	t	f	f			f	t	t
+6	Read Only	2018-11-27 06:22:00+00	2018-11-27 06:22:00+00	f	f	f	f	f	f	f	f	f	t	f	f	f	f	f	f	f	f	f			f	f	f
 \.
 
 
diff --git a/INSTALL/POSTGRESQL-structure.sql b/INSTALL/POSTGRESQL-structure.sql
index 781c202c7..fe7b16db1 100644
--- a/INSTALL/POSTGRESQL-structure.sql
+++ b/INSTALL/POSTGRESQL-structure.sql
@@ -1134,7 +1134,8 @@ CREATE TABLE public.roles (
     memory_limit character varying(255) DEFAULT ''::character varying,
     max_execution_time character varying(255) DEFAULT ''::character varying,
     restricted_to_site_admin boolean DEFAULT false NOT NULL,
-    perm_publish_zmq boolean DEFAULT false NOT NULL
+    perm_publish_zmq boolean DEFAULT false NOT NULL,
+    perm_publish_kafka boolean DEFAULT false NOT NULL
 );
 
 
diff --git a/INSTALL/old/INSTALL.debian7.txt b/INSTALL/old/INSTALL.debian7.txt
index 3550d7c37..bed55266c 100644
--- a/INSTALL/old/INSTALL.debian7.txt
+++ b/INSTALL/old/INSTALL.debian7.txt
@@ -237,3 +237,8 @@ Optional features
 -------------------
 # MISP has a new pub/sub feature, using ZeroMQ. To enable it, simply run the following command
 pip install pyzmq
+
+# MISP has a feature for publishing events to Kafka. To enable it, simply run the following commands
+apt-get install librdkafka-dev php-dev
+pecl install rdkafka
+find /etc -name php.ini | while read f; do echo 'extension=rdkafka.so' | tee -a "$f"; done
diff --git a/INSTALL/old/INSTALL.ubuntu1404.txt b/INSTALL/old/INSTALL.ubuntu1404.txt
index de79e4abc..f461dc5ee 100644
--- a/INSTALL/old/INSTALL.ubuntu1404.txt
+++ b/INSTALL/old/INSTALL.ubuntu1404.txt
@@ -253,3 +253,8 @@ Optional features
 pip install pyzmq
 # ZeroMQ depends on the Python client for Redis
 pip install redis
+
+# MISP has a feature for publishing events to Kafka. To enable it, simply run the following commands
+apt-get install librdkafka-dev php-dev
+pecl install rdkafka
+find /etc -name php.ini | while read f; do echo 'extension=rdkafka.so' | tee -a "$f"; done
diff --git a/INSTALL/old/INSTALL.ubuntu1604.with.webmin.txt b/INSTALL/old/INSTALL.ubuntu1604.with.webmin.txt
index af55d8bf2..42fb87062 100644
--- a/INSTALL/old/INSTALL.ubuntu1604.with.webmin.txt
+++ b/INSTALL/old/INSTALL.ubuntu1604.with.webmin.txt
@@ -270,6 +270,11 @@ sudo pip install pyzmq
 # ZeroMQ depends on the Python client for Redis
 sudo pip install redis
 
+# MISP has a feature for publishing events to Kafka. To enable it, simply run the following commands
+apt-get install librdkafka-dev php-dev
+pecl install rdkafka
+find /etc -name php.ini | while read f; do echo 'extension=rdkafka.so' | tee -a "$f"; done
+
 # For the experimental ssdeep correlations, run the following installation:
 # installing ssdeep
 wget http://downloads.sourceforge.net/project/ssdeep/ssdeep-2.13/ssdeep-2.13.tar.gz
diff --git a/PyMISP b/PyMISP
index c35a2aea5..c888af177 160000
--- a/PyMISP
+++ b/PyMISP
@@ -1 +1 @@
-Subproject commit c35a2aea5544f323282b4737ce51b8fa4881b002
+Subproject commit c888af177f88af653ad395924a3b840ca22f0af4
diff --git a/VERSION.json b/VERSION.json
index c96e0e839..890e2ac90 100644
--- a/VERSION.json
+++ b/VERSION.json
@@ -1 +1 @@
-{"major":2, "minor":4, "hotfix":102}
+{"major":2, "minor":4, "hotfix":104}
diff --git a/app/Config/config.default.php b/app/Config/config.default.php
index 542617230..5fe2ce89d 100644
--- a/app/Config/config.default.php
+++ b/app/Config/config.default.php
@@ -159,6 +159,7 @@ $config = array(
 			//
 			'ldapDefaultOrg'     => '1',      // uses 1st local org in MISP if undefined,
 			'ldapAllowReferrals' => true,   // allow or disallow chasing LDAP referrals
+			//'ldapEmailField' => array('emailAddress, 'mail'), // Optional : fields from which the email address should be retrieved. Default to 'mail' only. If more than one field is set (e.g. 'emailAddress' and 'mail' in this example), only the first one will be used.
 		),
 	*/
 );
diff --git a/app/Console/Command/TrainingShell.php b/app/Console/Command/TrainingShell.php
new file mode 100644
index 000000000..8992b77b6
--- /dev/null
+++ b/app/Console/Command/TrainingShell.php
@@ -0,0 +1,585 @@
+<?php
+/*
+ * Reset a password
+ *
+ * arg0 = email
+ * arg1 = new password
+ */
+class TrainingShell extends AppShell {
+
+    public $uses = array('User', 'Organisation', 'Server');
+
+    private $__currentUrl = false;
+    private $__currentAuthKey = false;
+    private $__simulate = false;
+    private $__config = false;
+    private $__report = array();
+    private $__verbose = false;
+    private $__interactive = false;
+
+    public function simulate()
+    {
+        $this->__simulate = true;
+        $this->setup();
+    }
+
+    public function setup()
+    {
+        $this->__verbose = !empty($this->params['verbose']);
+        $this->__interactive = !empty($this->params['interactive']);
+        $this->__config = file_get_contents(APP . 'Console/Command/training.json');
+        if (empty($this->__config)) {
+            echo 'No config file found. Make sure that training.json exists and is configured.';
+            die();
+        }
+        $this->__config = json_decode($this->__config, true);
+        $this->__report = array();
+        for ($i = $this->__config['ID_start']; $i < ($this->__config['ID_start'] + $this->__config['number_of_misps_to_configure']); $i++) {
+            $id = $i;
+            if ($this->__config['ID_zero_out']) {
+                if ($id < 10) {
+                    $id = '0' . $id;
+                }
+            }
+            $this->__currentUrl = str_replace('$ID', $id, $this->__config['server_blueprint']);
+            if ($this->__interactive) {
+                $question = sprintf('Configure instance at %s?', $this->__currentUrl);
+                $input = $this->__user_input($question, array('y', 'n'));
+                if ($input === 'n') {
+                    $this->__printReport('Stopping execution. Data created so far:' . PHP_EOL . PHP_EOL);
+                    die();
+                }
+            }
+            if ($this->__verbose) {
+                echo 'INFO - Instance to configure' . $this->__currentUrl . PHP_EOL;
+            }
+            $org = $this->__createOrgFromBlueprint($id);
+            $this->__setSetting('MISP.host_org_id', $org['Organisation']['remote_org_id'], $id, $org['Organisation']['name']);
+            $this->__report['servers'][$this->__currentUrl]['host_org_id'] = $org['Organisation']['remote_org_id'];
+            $this->__report['remote_orgs'][] = array('id' => $org['Organisation']['remote_org_id'], 'name' => $org['Organisation']['name']);
+            $role_id = $this->__createRole($this->__config['role_blueprint']);
+            $this->__report['servers'][$this->__currentUrl]['training_role_id'] = $role_id;
+            $sync_user = $this->__createSyncUserLocally($org['Organisation']['remote_org_id'], $org['Organisation']['name']);
+            $this->__report['users'][] = $sync_user;
+            $local_host_org = $this->__getLocalHostOrgId();
+            $hub_org_id_on_remote = $this->__createOrg($local_host_org);
+            $external_baseurl = empty(Configure::read('MISP.external_baseurl')) ? Configure::read('MISP.baseurl') : Configure::read('MISP.external_baseurl');
+            $this->__report['servers'][$this->__currentUrl]['sync_connections'][] = $this->__addSyncConnection($external_baseurl, 'Exercise hub', $local_host_org, $hub_org_id_on_remote, $sync_user);
+            $this->__report['servers'][$this->__currentUrl]['users'] = $this->__createUsers($org['Organisation']['remote_org_id'], $role_id, $org['Organisation']['name'], $id);
+            if (!empty($this->__config['create_sync_both_ways'])) {
+                $this->__createReverseSyncConnection($org['Organisation']['id'], $org['Organisation']['name'], $local_host_org);
+            }
+            if (!empty($this->__config['create_admin_user'])) {
+                $this->__report['servers'][$this->__currentUrl['users']][] = $this->__addAdminUserRemotely($i, $org['Organisation']['name'], $org['Organisation']['remote_org_id']);
+            }
+            if (!empty($this->__config['settings'])) {
+                foreach ($this->__config['settings'] as $key => $value)
+                $this->__setSetting($key, $value, $id, $org['Organisation']['name']);
+            }
+            if ($this->__config['reset_admin_credentials']) {
+                $this->__report['servers'][$this->__currentUrl]['management_account'] = $this->__reset_admin_credentials($this->__report);
+            }
+        }
+        $this->__printReport('Setup complete. Please find the modifications below:' . PHP_EOL . PHP_EOL);
+    }
+
+    private function __createOrgFromBlueprint($id)
+    {
+        $org = str_replace('$ID', $id, $this->__config['org_blueprint']);
+        $org_id = $this->Organisation->createOrgFromName($org, 1, true);
+        $org_data = $this->Organisation->find('first', array(
+            'recursive' => -1,
+            'fields' => array('name', 'uuid', 'local'),
+            'conditions' => array('Organisation.id' => $org_id)
+        ));
+        $org_data['Organisation']['remote_org_id'] = $this->__createOrg($org_data);
+        return $org_data;
+    }
+
+    private function __getLocalHostOrgId()
+    {
+        $org = $this->Organisation->find('first', array(
+            'recursive' => -1,
+            'conditions' => array(
+                'Organisation.id' => empty(Configure::read('MISP.host_org_id')) ? -1 : Configure::read('MISP.host_org_id')
+            ),
+            'fields' => array(
+                'name', 'id', 'uuid'
+            )
+        ));
+        if (empty($org)) {
+            $this->__printReport('Stopping execution, no host_org_id set on the current instance, or the setting points to a non-existing org. Data created so far:' . PHP_EOL . PHP_EOL);
+            die();
+        }
+        return $org;
+    }
+
+    private function __createReverseSyncConnection($remote_org_id_on_local, $org_name, $host_org_id_on_local)
+    {
+        $sync_user = $this->__addSyncUserRemotely();
+        $this->__report['servers'][$this->__currentUrl]['users'][] = $sync_user;
+        $sync_server = $this->__addSyncConnectionLocally($this->__currentUrl, $org_name . '_misp', $remote_org_id_on_local, $sync_user, $host_org_id_on_local);
+        if ($sync_server) {
+            $this->__report['sync'][] = $sync_server;
+        }
+    }
+
+    private function __printReport($message)
+    {
+        echo json_encode($this->__report, JSON_PRETTY_PRINT);
+        $this->__report = '';
+        return true;
+    }
+
+    private function __findRemoteRoleId($role_name)
+    {
+        $options = array(
+            'url' => $this->__currentUrl . '/roles/index',
+            'method' => 'GET'
+        );
+        $response = $this->__queryRemoteMISP($options, true);
+        if ($response->code == 200) {
+            $roles = json_decode($response->body, true);
+            foreach ($roles as $role) {
+                if ($role['Role']['name'] == $role_name) {
+                    return $role['Role']['id'];
+                }
+            }
+        } else {
+            $this->__responseError($response, $options);
+        }
+        return false;
+    }
+
+    private function __getRemoteAdminUser()
+    {
+        $options = array(
+            'url' => $this->__currentUrl . '/users/view/me',
+            'method' => 'GET'
+        );
+        $response = $this->__queryRemoteMISP($options, true);
+        if ($response->code == 200) {
+            return json_decode($response->body, true);
+        } else {
+            $this->__responseError($response, $options);
+        }
+        return false;
+    }
+
+    private function __addAdminUserRemotely($i, $org, $remote_org_id)
+    {
+        $email = $this->__config['user_blueprint'];
+        $email = str_replace('$ORGNAME', $org, $email);
+        $email = str_replace('$ID', $i, $email);
+        $email = 'admin' . substr($email, strpos($email, '@'));
+        $admin_role_id = $this->__findRemoteRoleId('Admin');
+        if (!$admin_role_id) {
+            echo 'Remote instance lacks the required role (Admin).' . PHP_EOL ;
+            die();
+        }
+        $options = array(
+            'url' => $this->__currentUrl . '/admin/users/index/searchall:' . $email,
+            'method' => 'GET'
+        );
+        $response = $this->__queryRemoteMISP($options, true);
+        if ($response->code != 200) {
+            $this->__responseError($response, $options);
+        }
+        $newKey = $this->User->generateRandomPassword(32);
+        if (empty(json_decode($response->body, true))) {
+            $user = array(
+                'email' => $email,
+                'password' => $newKey,
+                'role_id' => $admin_role_id,
+                'org_id' => $remote_org_id
+            );
+            $options = array(
+                'url' => $this->__currentUrl . '/admin/users/add',
+                'method' => 'POST',
+                'body' => $user
+            );
+            $response = $this->__queryRemoteMISP($options, true);
+            if ($response->code != 200) {
+                $this->__responseError($response, $options);
+            } else {
+                $response_data = json_decode($response->body, true);
+                if (!$this->__simulate) {
+                    $user['authkey'] = $response_data['User']['authkey'];
+                }
+            }
+        } else {
+            $user = json_decode($response->body, true)[0]['User'];
+        }
+        return $user;
+    }
+
+    private function __addSyncUserRemotely()
+    {
+        $sync_user_role_id = $this->__findRemoteRoleId('Sync user');
+        if (!$sync_user_role_id) {
+            echo 'Remote instance lacks the required role (Sync user).' . PHP_EOL ;
+            die();
+        }
+        $remote_admin = $this->__getRemoteAdminUser();
+        if (!$remote_admin) {
+            echo 'Remote instance did not return the admin user\'s information.' . PHP_EOL ;
+            die();
+        }
+        $email = $remote_admin['User']['email'];
+        $email = 'sync' . substr($email, strpos($email, '@'));
+        $options = array(
+            'url' => $this->__currentUrl . '/admin/users/index/searchall:' . $email,
+            'method' => 'GET'
+        );
+        $response = $this->__queryRemoteMISP($options, true);
+        if ($response->code != 200) {
+            $this->__responseError($response, $options);
+        }
+        $newKey = $this->User->generateRandomPassword(32);
+        if (empty(json_decode($response->body, true))) {
+            $user = array(
+                'email' => $email,
+                'password' => $newKey,
+                'role_id' => $sync_user_role_id,
+                'org_id' => $remote_admin['User']['role_id']
+            );
+            $options = array(
+                'url' => $this->__currentUrl . '/admin/users/add',
+                'method' => 'POST',
+                'body' => $user
+            );
+            $response = $this->__queryRemoteMISP($options, true);
+            if ($response->code != 200) {
+                $this->__responseError($response, $options);
+            } else {
+                $response_data = json_decode($response->body, true);
+                if (!$this->__simulate) {
+                    $user['authkey'] = $response_data['User']['authkey'];
+                }
+            }
+        } else {
+            $user = json_decode($response->body, true)[0]['User'];
+        }
+        return $user;
+    }
+
+    private function __addSyncConnectionLocally($baseurl, $org_name, $remote_org_id_on_local, $sync_user)
+    {
+        $this->Server->create();
+        $server = array(
+            "name" => $org_name,
+            "url" => $baseurl,
+            "authkey" => $sync_user['authkey'],
+            "push" => 1,
+            "pull" => 1,
+            "remote_org_id" => $sync_user['org_id'],
+            "self_signed" => 1,
+            "org_id" => $host_org_id_on_local
+        );
+        $result = $this->Server->save($server);
+        if (!$result) {
+            echo sprintf(
+                'Could not add connection to %s. Reason: %s.' . PHP_EOL,
+                $baseurl,
+                json_encode($this->Server->validationErrors)
+            );
+            return false;
+        }
+        return $server;
+    }
+
+    private function __addSyncConnection($baseurl, $name, $local_host_org, $hub_org_id_on_remote, $sync_user)
+    {
+        $server = array(
+            'name' => $name,
+            'url' => $baseurl,
+            'authkey' => $sync_user['User']['authkey'],
+            'remote_org_id' => $hub_org_id_on_remote,
+            'push' => 1,
+            'pull' => 1,
+            'self_signed' => 1
+        );
+        $options = array(
+            'url' => $this->__currentUrl . '/servers/add',
+            'method' => 'POST',
+            'body' => $server
+        );
+        $response = $this->__queryRemoteMISP($options, true);
+        if ($response->code != 200) {
+            $this->__responseError($response, $options);
+        } else {
+            $response_data = json_decode($response->body, true);
+            return array(
+                'url' => $response_data['Server']['url'],
+                'authkey' => $response_data['Server']['authkey']
+            );
+        }
+    }
+
+    private function __createSyncUserLocally($remote_org_id, $org)
+    {
+        $sync_role = $this->User->Role->find('first', array('recursive' => -1, 'conditions' => array('Role.name' => 'Sync user')));
+        $sync_role = $sync_role['Role']['id'];
+        $this->User->create();
+        $this->User->save(array(
+                'external_auth_required' => 0,
+                'external_auth_key' => '',
+                'server_id' => 0,
+                'gpgkey' => '',
+                'certif_public' => '',
+                'autoalert' => 0,
+                'contactalert' => 0,
+                'disabled' => 0,
+                'newsread' => 0,
+                'change_pw' => 1,
+                'authkey' => $this->User->generateAuthKey(),
+                'termsaccepted' => 0,
+                'org_id' => $remote_org_id,
+                'role_id' => $sync_role,
+                'email' => 'sync_user@' . $org . '.test'
+        ));
+        $user = $this->User->find('first', array('recursive' => -1, 'conditions' => array('User.email' => 'sync_user@' . $org . '.test')));
+        return $user;
+    }
+
+    private function __responseError($response, $options)
+    {
+        echo sprintf(
+            "Received a non-200 response (%s). Aborting.\nQueried URL: %s\n Query type: %s\n Request payload: %s\n\n",
+            $response->code,
+            $options['url'],
+            $options['method'],
+            empty($options['body']) ? '' : json_encode($options['body'], JSON_PRETTY_PRINT)
+        );
+        if ($this->__interactive) {
+            $question = 'The above error can cause the issues to compound if you continue. For example, not creating an organisation that subsequently created users should belong to will fail. Would you like to continue?';
+            $input = $this->__user_input($question, array('y', 'n'));
+            if ($input === 'y') {
+                return true;
+            }
+        }
+        $this->__printReport('Setup failed. Output of what has been created:' . PHP_EOL . PHP_EOL);
+        die();
+    }
+
+    private function __createUsers($remote_org_id, $role_id, $org, $i)
+    {
+        $summary = array();
+        for ($j = 1; $j < (1 + $this->__config['user_count']); $j++) {
+            $email = $this->__config['user_blueprint'];
+            $email = str_replace('$ID', $i, $email);
+            $email = str_replace('$ORGNAME', $org, $email);
+            $email = str_replace('$USER_ITERATOR', $j, $email);
+            $options = array(
+                'url' => $this->__currentUrl . '/admin/users/index/searchall:' . $email,
+                'method' => 'GET'
+            );
+            $response = $this->__queryRemoteMISP($options, true);
+            if ($response->code != 200) {
+                $this->__responseError($response, $options);
+            }
+            $newKey = $this->User->generateRandomPassword(32);
+            if (empty(json_decode($response->body, true))) {
+                $user = array(
+                    'email' => $email,
+                    'password' => $newKey,
+                    'role_id' => $role_id,
+                    'org_id' => $remote_org_id
+                );
+                $options = array(
+                    'url' => $this->__currentUrl . '/admin/users/add',
+                    'method' => 'POST',
+                    'body' => $user
+                );
+                $response = $this->__queryRemoteMISP($options, true);
+                if ($response->code != 200) {
+                    $this->__responseError($response, $options);
+                } else {
+                    $response_data = json_decode($response->body, true);
+                    if ($this->__simulate) {
+                        $summary[] = $user;
+                    } else {
+                        $user['authkey'] = $response_data['User']['authkey'];
+                        $summary[] = $user;
+                    }
+                }
+            }
+        }
+        return $summary;
+    }
+
+    private function __createRole($blueprint)
+    {
+        $blueprint = array('Role' => $blueprint);
+        $options = array(
+            'url' => $this->__currentUrl . '/roles/index',
+            'method' => 'GET'
+        );
+        $response = $this->__queryRemoteMISP($options, true);
+        if ($response->code == 200) {
+            $roles = json_decode($response->body, true);
+            $found = false;
+            foreach ($roles as $role) {
+                if ($role['Role']['name'] == $blueprint['Role']['name']) {
+                    return $role['Role']['id'];
+                }
+            }
+            $options = array(
+                'url' => $this->__currentUrl . '/admin/roles/add',
+                'method' => 'POST',
+                'body' => $blueprint
+            );
+            $response = $this->__queryRemoteMISP($options, true);
+            if ($response->code != 200) {
+                $this->__responseError($response, $options);
+            } else {
+                $response_data = json_decode($response->body, true);
+                return $response_data['Role']['id'];
+            }
+        } else {
+            $this->__responseError($response, $options);
+        }
+    }
+
+    private function __reset_admin_credentials()
+    {
+        $credentials = array(
+            'authkey' => $this->User->generateAuthKey(),
+            'password' => $this->User->generateRandomPassword(32)
+        );
+        $this->__queryRemoteMISP(array(
+            'url' => $this->__currentUrl . '/admin/users/edit/1',
+            'body' => array('User' => array(
+                'password' => $credentials['password'],
+                'authkey' => $credentials['authkey']
+            )),
+            'method' => 'POST'
+        ));
+        return $credentials;
+    }
+
+    private function __createOrg($org_data)
+    {
+        $options = array(
+            'url' => $this->__currentUrl . '/organisations/index.json',
+            'method' => 'GET'
+        );
+        $response = $this->__queryRemoteMISP($options, true);
+        if ($response->code != 200) {
+            $this->__responseError($response, $options);
+        } else {
+            $response_data = json_decode($response->body, true);
+            $found = false;
+            foreach ($response_data as $existingOrg) {
+                if ($existingOrg['Organisation']['name'] == $org_data['Organisation']['name']) {
+                    return $existingOrg['Organisation']['id'];
+                }
+            }
+            $options = array(
+                'body' => $org_data,
+                'url' => $this->__currentUrl . '/admin/organisations/add',
+                'method' => 'POST'
+            );
+            $response = $this->__queryRemoteMISP($options, true);
+            if ($response->code != 200) {
+                $this->__responseError($response, $options);
+            }
+            return $response_data['Organisation']['id'];
+        }
+    }
+
+    private function __user_input($question, $valid_input_options)
+    {
+        $valid_input = false;
+        while (!$valid_input) {
+            echo sprintf(
+                '%s (%s)' . PHP_EOL,
+                $question,
+                implode('/', $valid_input_options)
+            );
+            $handle = fopen ("php://stdin","r");
+            $input = trim(strtolower(fgets($handle)));
+            if (in_array($input, $valid_input_options)) {
+                $valid_input = true;
+            }
+        }
+        return $input;
+    }
+
+
+    private function __setSetting($key, $value, $i, $org)
+    {
+        $value = str_replace('$ID', $i, $value);
+        $value = str_replace('$ORGNAME', $org, $value);
+        $options = array(
+            'url' => $this->__currentUrl . '/servers/serverSettingsEdit/' . $key,
+            'method' => 'POST',
+            'body' => array('value' => $value)
+        );
+        $response = $this->__queryRemoteMISP($options, true);
+        if ($response->code != 200) {
+            $this->__responseError($response, $options);
+        } else {
+            return true;
+        }
+    }
+
+
+    private function __queryRemoteMISP($options, $returnFullResponse = false)
+    {
+        $params = array();
+        App::uses('HttpSocket', 'Network/Http');
+        $params['ssl_allow_self_signed'] = true;
+        $params['ssl_verify_peer_name'] = false;
+        $params['ssl_verify_peer'] = false;
+        $HttpSocket = new HttpSocket($params);
+        $request = array(
+            'header' => array(
+                    'Authorization' => $this->__config['authkey'],
+                    'Accept' => 'application/json',
+                    'Content-Type' => 'application/json'
+            )
+        );
+        if ($this->__simulate) {
+            if ($this->__verbose) {
+                echo 'SIMULATION - query to be executed:' . PHP_EOL . json_encode($options) . PHP_EOL . ' using request object:' . PHP_EOL . json_encode($request) . PHP_EOL . PHP_EOL;
+            }
+            $response = new class{};
+            $response->code = 200;
+            $response->body = '{"id": 666, "Organisation": {"id": 666}, "User": {"id": 666, "email": "foo"}, "Role": {"id": 666}, "Server": {"url": "https://foo.bar", "authkey": "bla"}}';
+            return $response;
+        } else {
+            if ($this->__verbose) {
+                echo 'EXEC - query to be executed:' . PHP_EOL . json_encode($options) . PHP_EOL . ' using request object:' . PHP_EOL . json_encode($request) . PHP_EOL . PHP_EOL;
+            }
+            if ($options['method'] === 'POST') {
+                $response = $HttpSocket->post($options['url'], json_encode($options['body']), $request);
+            } else {
+                $response = $HttpSocket->get($options['url'], '', $request);
+            }
+            if ($returnFullResponse) {
+                return $response;
+            }
+            if ($response->code != 200) {
+                $this->__responseError($response, $options);
+            } else {
+                return json_decode($response->body, true);
+            }
+        }
+    }
+
+    public function getOptionParser()
+    {
+        $parser = parent::getOptionParser();
+        $parser->addOption('verbose', array(
+            'short' => 'v',
+            'help' => __('verbose mode'),
+            'boolean' => 1
+        ))->addOption('interactive', array(
+            'short' => 'i',
+            'help' => __('interactive mode'),
+            'boolean' => 1
+        ));
+        return $parser;
+    }
+}
diff --git a/app/Console/Command/training.default.json b/app/Console/Command/training.default.json
new file mode 100644
index 000000000..6e688d4cc
--- /dev/null
+++ b/app/Console/Command/training.default.json
@@ -0,0 +1,43 @@
+{
+    "ID_start": 1,
+    "ID_zero_out": 0,
+    "number_of_misps_to_configure": 5,
+    "reset_admin_credentials": 1,
+    "create_sync_both_ways": 0,
+    "create_admin_user": 0,
+    "settings": {
+
+    },
+    "authkey": "111111111111111111111111111111111",
+    "server_blueprint": "https://my_remote_misp$ID",
+    "user_blueprint": "user$USER_ITERATOR@user.$ORGNAME.test",
+    "user_count": 2,
+    "org_blueprint": "org$ID",
+    "role_blueprint": {
+        "name": "training_participant",
+        "perm_add": true,
+        "perm_modify": true,
+        "perm_modify_org": true,
+        "perm_publish": true,
+        "perm_delegate": true,
+        "perm_sync": true,
+        "perm_admin": true,
+        "perm_audit": true,
+        "perm_auth": true,
+        "perm_site_admin": false,
+        "perm_regexp_access": true,
+        "perm_tagger": true,
+        "perm_template": true,
+        "perm_sharing_group": true,
+        "perm_tag_editor": true,
+        "perm_sighting": true,
+        "perm_object_template": true,
+        "default_role": false,
+        "memory_limit": "",
+        "max_execution_time": "",
+        "restricted_to_site_admin": false,
+        "perm_publish_zmq": true,
+        "permission": "3",
+        "permission_description": "training_participant"
+    }
+}
diff --git a/app/Console/worker/start.sh b/app/Console/worker/start.sh
index 27230a0ad..c90bfc377 100755
--- a/app/Console/worker/start.sh
+++ b/app/Console/worker/start.sh
@@ -1,34 +1,57 @@
 #!/usr/bin/env bash
 
-# TODO: Improve script to bring workers up that are not.
+# TODO: Put some logic inside if many worker PIDs are detected
 
 # Extract base directory where this script is and cd into it
 cd "${0%/*}"
 
+# Set to the current webroot owner
+WWW_USER=$(ls -l ../cake |awk {'print $3'}|tail -1)
+
+# In most cases the owner of the cake script is also the user as which it should be executed.
+if [[ "$USER" != "$WWW_USER" ]]; then
+  echo "You run this script as $USER and the owner of the cake command is $WWW_USER. This might be an issue."
+fi
+
 # Check if run as root
-if [ "$EUID" -eq 0 ]; then
+if [[ "$EUID" -eq "0" ]]; then
     echo "Please DO NOT run the worker script as root"
     exit 1
 fi
 
-##[[ $(../cake CakeResque.CakeResque stop --all |grep "not permitted" ; echo $?) != 1 ]] && echo "Either you have no permissions or CakeResque is not installed/configured" && exit 1
-
-## FIXME: PIDs seem off by 1
-# Check which workers are currently running
-WORKERS_PID=$(ps a |grep CakeResque |grep -v grep |cut -f 1 -d\ )
-
-if [[ ! -z $WORKERS_PID ]]; then
-  for p in $WORKERS_PID; do
-    WORKER_RUNNING=$(ps $p |grep CakeRes|grep -v grep |grep -o -e "QUEUE=.[a-z]*" |cut -f2 -d\')
-    #echo "Worker $WORKER_RUNNING with PID $p"
-  done
+# Check if jq is present and enable advanced checks
+if [[ "$(jq -V > /dev/null 2> /dev/null; echo $?)" != 0 ]]; then
+  echo "jq is not installed, disabling advanced checks."
+  ADVANCED="0"
+else
+  ADVANCED="1"
 fi
 
-../cake CakeResque.CakeResque stop --all
-../cake CakeResque.CakeResque start --interval 5 --queue default
-../cake CakeResque.CakeResque start --interval 5 --queue prio
-../cake CakeResque.CakeResque start --interval 5 --queue cache
-../cake CakeResque.CakeResque start --interval 5 --queue email
-../cake CakeResque.CakeResque startscheduler --interval 5
+if [[ "$ADVANCED" == "1" ]]; then
+  for worker in `echo cache default email prio scheduler`; do
+    workerStatus=$(../cake Admin getWorkers |tail -n +7 |jq  -r ".$worker" |jq -r '.ok')
+    PIDcount=$(../cake admin getWorkers |tail -n +7 |jq -r ".$worker.workers" |grep pid | wc -l)
+    echo -n "$worker has $PIDcount PID(s)"
+    if [[ "$workerStatus" != "true" ]]; then
+      echo ", trying to restart."
+      if [[ "$worker" != "scheduler" ]]; then
+        ../cake CakeResque.CakeResque start --interval 5 --queue $worker
+      else
+        ../cake CakeResque.CakeResque startscheduler --interval 5
+      fi
+    else
+      echo ", up and running."
+    fi
+  done
+  exit 0
+else
 
-exit 0
+  ../cake CakeResque.CakeResque stop --all
+  ../cake CakeResque.CakeResque start --interval 5 --queue default
+  ../cake CakeResque.CakeResque start --interval 5 --queue prio
+  ../cake CakeResque.CakeResque start --interval 5 --queue cache
+  ../cake CakeResque.CakeResque start --interval 5 --queue email
+  ../cake CakeResque.CakeResque startscheduler --interval 5
+
+  exit 0
+fi
diff --git a/app/Console/worker/stop.sh b/app/Console/worker/stop.sh
new file mode 100755
index 000000000..970680ef3
--- /dev/null
+++ b/app/Console/worker/stop.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# TODO: Put some logic inside if many worker PIDs are detected
+
+# Extract base directory where this script is and cd into it
+cd "${0%/*}"
+
+# Set to the current webroot owner
+WWW_USER=$(ls -l ../cake |awk {'print $3'}|tail -1)
+
+# In most cases the owner of the cake script is also the user as which it should be executed.
+if [[ "$USER" != "$WWW_USER" ]]; then
+  echo "You run this script as $USER and the owner of the cake command is $WWW_USER. This might be an issue."
+fi
+
+# Check if run as root
+if [[ "$EUID" -eq "0" ]]; then
+    echo "Please DO NOT run the worker script as root"
+    exit 1
+fi
+
+../cake CakeResque.CakeResque stop --all
diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
index 56bdb4824..cc9e2f087 100755
--- a/app/Controller/AppController.php
+++ b/app/Controller/AppController.php
@@ -46,8 +46,8 @@ class AppController extends Controller
 
     public $helpers = array('Utility', 'OrgImg');
 
-    private $__queryVersion = '60';
-    public $pyMispVersion = '2.4.102';
+    private $__queryVersion = '63';
+    public $pyMispVersion = '2.4.103';
     public $phpmin = '7.0';
     public $phprec = '7.2';
 
@@ -442,6 +442,7 @@ class AppController extends Controller
             $this->set('isAclSharingGroup', $role['perm_sharing_group']);
             $this->set('isAclSighting', isset($role['perm_sighting']) ? $role['perm_sighting'] : false);
             $this->set('isAclZmq', isset($role['perm_publish_zmq']) ? $role['perm_publish_zmq'] : false);
+            $this->set('isAclKafka', isset($role['perm_publish_kafka']) ? $role['perm_publish_kafka'] : false);
             $this->userRole = $role;
         } else {
             $this->set('me', false);
diff --git a/app/Controller/AttributesController.php b/app/Controller/AttributesController.php
index 880b300a9..e9c8b0128 100644
--- a/app/Controller/AttributesController.php
+++ b/app/Controller/AttributesController.php
@@ -254,6 +254,10 @@ class AttributesController extends AppController
             }
             foreach ($attributes as $k => $attribute) {
                 if (empty($attribute['blocked'])) {
+                    if (!empty($attribute['encrypt'])) {
+                        $attribute = $this->Attribute->onDemandEncrypt($attribute);
+                    }
+                    $attributes[$k] = $attribute;
                     $this->Attribute->set($attribute);
                     $result = $this->Attribute->validates();
                     if (!$result) {
@@ -1171,7 +1175,7 @@ class AttributesController extends AppController
             throw new NotFoundException('Invalid attribute');
         }
         if ($this->_isRest()) {
-            $conditions = array('conditions' => array('Attribute.id' => $id), 'withAttachments' => true);
+            $conditions = array('conditions' => array('Attribute.id' => $id), 'withAttachments' => true, 'flatten' => true);
             $conditions['includeAllTags'] = false;
             $conditions['includeAttributeUuid'] = true;
             $attribute = $this->Attribute->fetchAttributes($this->Auth->user(), $conditions);
@@ -2890,23 +2894,30 @@ class AttributesController extends AppController
             foreach ($modules['modules'] as $temp) {
                 if ($temp['name'] == $type) {
                     $found = true;
+                    $format = (isset($temp['mispattributes']['format']) ? $temp['mispattributes']['format'] : 'simplified');
                     if (isset($temp['meta']['config'])) {
                         foreach ($temp['meta']['config'] as $conf) {
                             $options[$conf] = Configure::read('Plugin.Enrichment_' . $type . '_' . $conf);
                         }
                     }
+                    break;
                 }
             }
             if (!$found) {
                 throw new MethodNotAllowedException(__('No valid enrichment options found for this attribute.'));
             }
-            $data = array('module' => $type, $attribute[0]['Attribute']['type'] => $attribute[0]['Attribute']['value']);
+            $data = array('module' => $type);
             if ($persistent) {
                 $data['persistent'] = 1;
             }
             if (!empty($options)) {
                 $data['config'] = $options;
             }
+            if ($format == 'misp_standard') {
+                $data['attribute'] = $attribute[0]['Attribute'];
+            } else {
+                $data[$attribute[0]['Attribute']['type']] = $attribute[0]['Attribute']['value'];
+            }
             $data = json_encode($data);
             $result = $this->Module->queryModuleServer('/query', $data, true);
             if ($result) {
@@ -2988,10 +2999,6 @@ class AttributesController extends AppController
 
     public function addTag($id = false, $tag_id = false)
     {
-        if (!$this->request->is('post')) {
-            return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'You don\'t have permission to do that. Only POST requests are accepted.')), 'status' => 200, 'type' => 'json'));
-        }
-
         $rearrangeRules = array(
             'request' => false,
             'Attribute' => false,
@@ -3007,140 +3014,148 @@ class AttributesController extends AppController
         if ($id === 'selected') {
             $idList = json_decode($this->request->data['attribute_ids'], true);
         }
-        if ($tag_id === false) {
-            $tag_id = $this->request->data['tag'];
-        }
-        if (!is_numeric($tag_id)) {
-            if (preg_match('/^collection_[0-9]+$/i', $tag_id)) {
-                $tagChoice = explode('_', $tag_id)[1];
-                $this->loadModel('TagCollection');
-                $tagCollection = $this->TagCollection->fetchTagCollection($this->Auth->user(), array('conditions' => array('TagCollection.id' => $tagChoice)));
-                if (empty($tagCollection)) {
-                    return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag Collection.')), 'status'=>200, 'type' => 'json'));
-                }
-                $tag_id_list = array();
-                foreach ($tagCollection[0]['TagCollectionTag'] as $tagCollectionTag) {
-                    $tag_id_list[] = $tagCollectionTag['tag_id'];
-                }
-            } else {
-                // try to parse json array
-                $tag_ids = json_decode($tag_id);
-                if ($tag_ids !== null) { // can decode json
-                    $tag_id_list = array();
-                    foreach ($tag_ids as $tag_id) {
-                        if (preg_match('/^collection_[0-9]+$/i', $tag_id)) {
-                            $tagChoice = explode('_', $tag_id)[1];
-                            $this->loadModel('TagCollection');
-                            $tagCollection = $this->TagCollection->fetchTagCollection($this->Auth->user(), array('conditions' => array('TagCollection.id' => $tagChoice)));
-                            if (empty($tagCollection)) {
-                                return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag Collection.')), 'status'=>200, 'type' => 'json'));
-                            }
-                            foreach ($tagCollection[0]['TagCollectionTag'] as $tagCollectionTag) {
-                                $tag_id_list[] = $tagCollectionTag['tag_id'];
-                            }
-                        } else {
-                            $tag_id_list[] = $tag_id;
-                        }
-                    }
-                } else {
-                    $tag = $this->Event->EventTag->Tag->find('first', array('recursive' => -1, 'conditions' => $conditions));
-                    if (empty($tag)) {
-                        return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag.')), 'status'=>200, 'type' => 'json'));
-                    }
-                    $tag_id = $tag['Tag']['id'];
-                }
-            }
-        }
-        if (!isset($idList)) {
-            $idList = array($id);
-        }
-        if (empty($tag_id_list)) {
-            $tag_id_list = array($tag_id);
-        }
-        $success = 0;
-        $fails = 0;
-        foreach ($idList as $id) {
-            $this->Attribute->id = $id;
-            if (!$this->Attribute->exists()) {
-                throw new NotFoundException(__('Invalid attribute'));
-            }
-            $this->Attribute->read();
-            if (!$this->_isSiteAdmin() && $this->Attribute->data['Event']['orgc_id'] !== $this->Auth->user('org_id')) {
-                $fails++;
-                continue;
-            }
-            if ($this->Attribute->data['Attribute']['deleted']) {
-                throw new NotFoundException(__('Invalid attribute'));
-            }
-            $eventId = $this->Attribute->data['Attribute']['event_id'];
-            $this->Attribute->Event->recursive = -1;
-            $event = $this->Attribute->Event->read(array(), $eventId);
-            if (!$this->_isSiteAdmin() && !$this->userRole['perm_sync']) {
-                if (!$this->userRole['perm_tagger'] || ($this->Auth->user('org_id') !== $event['Event']['org_id'] && $this->Auth->user('org_id') !== $event['Event']['orgc_id'])) {
-                    return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'You don\'t have permission to do that.')), 'status' => 200, 'type' => 'json'));
-                }
-            }
-            if (!$this->_isRest()) {
-                $this->Attribute->Event->insertLock($this->Auth->user(), $eventId);
-            }
-            $this->Attribute->recursive = -1;
-
-            foreach ($tag_id_list as $tag_id) {
-                $this->Attribute->AttributeTag->Tag->id = $tag_id;
-                if (!$this->Attribute->AttributeTag->Tag->exists()) {
-                    $fails++;
-                    continue;
-                }
-                $tag = $this->Attribute->AttributeTag->Tag->find('first', array(
-                    'conditions' => array('Tag.id' => $tag_id),
-                    'recursive' => -1,
-                    'fields' => array('Tag.name')
-                ));
-                $found = $this->Attribute->AttributeTag->find('first', array(
-                    'conditions' => array(
-                        'attribute_id' => $id,
-                        'tag_id' => $tag_id
-                    ),
-                    'recursive' => -1,
-                ));
-                $this->autoRender = false;
-                if (!empty($found)) {
-                    $fails++;
-                    continue;
-                }
-                $this->Attribute->AttributeTag->create();
-                if ($this->Attribute->AttributeTag->save(array('attribute_id' => $id, 'tag_id' => $tag_id, 'event_id' => $eventId))) {
-                    $event['Event']['published'] = 0;
-                    $date = new DateTime();
-                    $event['Event']['timestamp'] = $date->getTimestamp();
-                    $this->Attribute->Event->save($event);
-                    $this->Attribute->data['Attribute']['timestamp'] = $date->getTimestamp();
-                    $this->Attribute->save($this->Attribute->data);
-                    $log = ClassRegistry::init('Log');
-                    $log->createLogEntry($this->Auth->user(), 'tag', 'Attribute', $id, 'Attached tag (' . $tag_id . ') "' . $tag['Tag']['name'] . '" to attribute (' . $id . ')', 'Attribute (' . $id . ') tagged as Tag (' . $tag_id . ')');
-                    $success++;
-                } else {
-                    $fails++;
-                }
-            }
-        }
-        if ($fails == 0) {
-            if ($success == 1) {
-                $message = 'Tag added.';
-            } else {
-                $message = $success . ' tags added.';
-            }
-            return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => $message, 'check_publish' => true)), 'status' => 200, 'type' => 'json'));
+        if (!$this->request->is('post')) {
+            $this->set('object_id', $id);
+            $this->set('scope', 'Attribute');
+            $this->layout = false;
+            $this->autoRender = false;
+            $this->render('/Events/add_tag');
         } else {
-            if ($fails == 1) {
-                $message = 'Tag could not be added.';
+            if ($tag_id === false) {
+                $tag_id = $this->request->data['tag'];
+            }
+            if (!is_numeric($tag_id)) {
+                if (preg_match('/^collection_[0-9]+$/i', $tag_id)) {
+                    $tagChoice = explode('_', $tag_id)[1];
+                    $this->loadModel('TagCollection');
+                    $tagCollection = $this->TagCollection->fetchTagCollection($this->Auth->user(), array('conditions' => array('TagCollection.id' => $tagChoice)));
+                    if (empty($tagCollection)) {
+                        return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag Collection.')), 'status'=>200, 'type' => 'json'));
+                    }
+                    $tag_id_list = array();
+                    foreach ($tagCollection[0]['TagCollectionTag'] as $tagCollectionTag) {
+                        $tag_id_list[] = $tagCollectionTag['tag_id'];
+                    }
+                } else {
+                    // try to parse json array
+                    $tag_ids = json_decode($tag_id);
+                    if ($tag_ids !== null) { // can decode json
+                        $tag_id_list = array();
+                        foreach ($tag_ids as $tag_id) {
+                            if (preg_match('/^collection_[0-9]+$/i', $tag_id)) {
+                                $tagChoice = explode('_', $tag_id)[1];
+                                $this->loadModel('TagCollection');
+                                $tagCollection = $this->TagCollection->fetchTagCollection($this->Auth->user(), array('conditions' => array('TagCollection.id' => $tagChoice)));
+                                if (empty($tagCollection)) {
+                                    return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag Collection.')), 'status'=>200, 'type' => 'json'));
+                                }
+                                foreach ($tagCollection[0]['TagCollectionTag'] as $tagCollectionTag) {
+                                    $tag_id_list[] = $tagCollectionTag['tag_id'];
+                                }
+                            } else {
+                                $tag_id_list[] = $tag_id;
+                            }
+                        }
+                    } else {
+                        $tag = $this->Event->EventTag->Tag->find('first', array('recursive' => -1, 'conditions' => $conditions));
+                        if (empty($tag)) {
+                            return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag.')), 'status'=>200, 'type' => 'json'));
+                        }
+                        $tag_id = $tag['Tag']['id'];
+                    }
+                }
+            }
+            if (!isset($idList)) {
+                $idList = array($id);
+            }
+            if (empty($tag_id_list)) {
+                $tag_id_list = array($tag_id);
+            }
+            $success = 0;
+            $fails = 0;
+            foreach ($idList as $id) {
+                $this->Attribute->id = $id;
+                if (!$this->Attribute->exists()) {
+                    throw new NotFoundException(__('Invalid attribute'));
+                }
+                $this->Attribute->read();
+                if (!$this->_isSiteAdmin() && $this->Attribute->data['Event']['orgc_id'] !== $this->Auth->user('org_id')) {
+                    $fails++;
+                    continue;
+                }
+                if ($this->Attribute->data['Attribute']['deleted']) {
+                    throw new NotFoundException(__('Invalid attribute'));
+                }
+                $eventId = $this->Attribute->data['Attribute']['event_id'];
+                $this->Attribute->Event->recursive = -1;
+                $event = $this->Attribute->Event->read(array(), $eventId);
+                if (!$this->_isSiteAdmin() && !$this->userRole['perm_sync']) {
+                    if (!$this->userRole['perm_tagger'] || ($this->Auth->user('org_id') !== $event['Event']['org_id'] && $this->Auth->user('org_id') !== $event['Event']['orgc_id'])) {
+                        return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'You don\'t have permission to do that.')), 'status' => 200, 'type' => 'json'));
+                    }
+                }
+                if (!$this->_isRest()) {
+                    $this->Attribute->Event->insertLock($this->Auth->user(), $eventId);
+                }
+                $this->Attribute->recursive = -1;
+
+                foreach ($tag_id_list as $tag_id) {
+                    $this->Attribute->AttributeTag->Tag->id = $tag_id;
+                    if (!$this->Attribute->AttributeTag->Tag->exists()) {
+                        $fails++;
+                        continue;
+                    }
+                    $tag = $this->Attribute->AttributeTag->Tag->find('first', array(
+                        'conditions' => array('Tag.id' => $tag_id),
+                        'recursive' => -1,
+                        'fields' => array('Tag.name')
+                    ));
+                    $found = $this->Attribute->AttributeTag->find('first', array(
+                        'conditions' => array(
+                            'attribute_id' => $id,
+                            'tag_id' => $tag_id
+                        ),
+                        'recursive' => -1,
+                    ));
+                    $this->autoRender = false;
+                    if (!empty($found)) {
+                        $fails++;
+                        continue;
+                    }
+                    $this->Attribute->AttributeTag->create();
+                    if ($this->Attribute->AttributeTag->save(array('attribute_id' => $id, 'tag_id' => $tag_id, 'event_id' => $eventId))) {
+                        $event['Event']['published'] = 0;
+                        $date = new DateTime();
+                        $event['Event']['timestamp'] = $date->getTimestamp();
+                        $this->Attribute->Event->save($event);
+                        $this->Attribute->data['Attribute']['timestamp'] = $date->getTimestamp();
+                        $this->Attribute->save($this->Attribute->data);
+                        $log = ClassRegistry::init('Log');
+                        $log->createLogEntry($this->Auth->user(), 'tag', 'Attribute', $id, 'Attached tag (' . $tag_id . ') "' . $tag['Tag']['name'] . '" to attribute (' . $id . ')', 'Attribute (' . $id . ') tagged as Tag (' . $tag_id . ')');
+                        $success++;
+                    } else {
+                        $fails++;
+                    }
+                }
+            }
+            if ($fails == 0) {
+                if ($success == 1) {
+                    $message = 'Tag added.';
+                } else {
+                    $message = $success . ' tags added.';
+                }
+                return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => $message, 'check_publish' => true)), 'status' => 200, 'type' => 'json'));
             } else {
-                $message = $fails . ' tags could not be added.';
+                if ($fails == 1) {
+                    $message = 'Tag could not be added.';
+                } else {
+                    $message = $fails . ' tags could not be added.';
+                }
+                if ($success > 0) {
+                    $message .= ' However, ' . $success . ' tag(s) were added.';
+                }
+                return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => $message)), 'status' => 200, 'type' => 'json'));
             }
-            if ($success > 0) {
-                $message .= ' However, ' . $success . ' tag(s) were added.';
-            }
-            return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => $message)), 'status' => 200, 'type' => 'json'));
         }
     }
 
diff --git a/app/Controller/Component/ACLComponent.php b/app/Controller/Component/ACLComponent.php
index 93b152b5d..2b441a4fe 100644
--- a/app/Controller/Component/ACLComponent.php
+++ b/app/Controller/Component/ACLComponent.php
@@ -115,6 +115,7 @@ class ACLComponent extends Component
                     'getEventGraphReferences' => array('*'),
                     'getEventGraphTags' => array('*'),
                     'getEventGraphGeneric' => array('*'),
+                    'genDistributionGraph' => array('*'),
                     'getDistributionGraph' => array('*'),
                     'getReferenceData' => array('*'),
                     'getReferences' => array('*'),
@@ -129,6 +130,7 @@ class ACLComponent extends Component
                     'proposalEventIndex' => array('*'),
                     'publish' => array('perm_publish'),
                     'pushEventToZMQ' => array('perm_publish_zmq'),
+                    'pushEventToKafka' => array('perm_publish_kafka'),
                     'pushProposals' => array('perm_sync'),
                     'queryEnrichment' => array('perm_add'),
                     'removePivot' => array('*'),
@@ -165,6 +167,7 @@ class ACLComponent extends Component
                     'disable' => array(),
                     'edit' => array(),
                     'enable' => array(),
+                    'feedCoverage' => array('*'),
                     'fetchFromAllFeeds' => array(),
                     'fetchFromFeed' => array(),
                     'fetchSelectedFromFreetextIndex' => array(),
@@ -179,6 +182,7 @@ class ACLComponent extends Component
             'galaxies' => array(
                 'attachCluster' => array('perm_tagger'),
                 'attachMultipleClusters' => array('perm_tagger'),
+                'delete' => array(),
                 'index' => array('*'),
                 'selectGalaxy' => array('perm_tagger'),
                 'selectGalaxyNamespace' => array('perm_tagger'),
@@ -193,7 +197,8 @@ class ACLComponent extends Component
                 'delete' => array('perm_site_admin'),
                 'detach' => array('perm_tagger'),
                 'index' => array('*'),
-                'view' => array('*')
+                'view' => array('*'),
+                'viewGalaxyMatrix' => array('*')
             ),
             'galaxyElements' => array(
                     'index' => array('*')
@@ -302,6 +307,10 @@ class ACLComponent extends Component
                     'cleanRegexModifiers' => array('perm_regexp_access'),
                     'index' => array('*'),
             ),
+            'restClientHistory' => array(
+                    'delete' => array('*'),
+                    'index' => array('*')
+            ),
             'roles' => array(
                     'admin_add' => array(),
                     'admin_delete' => array(),
@@ -429,8 +438,13 @@ class ACLComponent extends Component
                     'enable' => array(),
                     'index' => array('*'),
                     'taxonomyMassConfirmation' => array('perm_tagger'),
+                    'taxonomyMassHide' => array('perm_tagger'),
+                    'taxonomyMassUnhide' => array('perm_tagger'),
+                    'toggleRequired' => array('perm_site_admin'),
                     'update' => array(),
                     'view' => array('*'),
+                    'unhideTag' => array('perm_tagger'),
+                    'hideTag' => array('perm_tagger'),
             ),
             'templateElements' => array(
                     'add' => array('perm_template'),
diff --git a/app/Controller/Component/Auth/ApacheAuthenticate.php b/app/Controller/Component/Auth/ApacheAuthenticate.php
index abedd0c99..5fcfd50cb 100644
--- a/app/Controller/Component/Auth/ApacheAuthenticate.php
+++ b/app/Controller/Component/Auth/ApacheAuthenticate.php
@@ -38,6 +38,17 @@ class ApacheAuthenticate extends BaseAuthenticate
         }
         return $returnCode;
     }
+	
+    private function getEmailAddress($ldapEmailField, $ldapUserData)
+    {
+	// return the email address of an LDAP user if one of the fields in $ldapEmaiLField exists
+        foreach($ldapEmailField as $field) {
+            if (isset($ldapUserData[0][$field][0])) {
+                return $ldapUserData[0][$field][0];
+            }
+        }
+        return NULL;
+    }
 
     public function authenticate(CakeRequest $request, CakeResponse $response)
     {
@@ -51,6 +62,7 @@ class ApacheAuthenticate extends BaseAuthenticate
         $ldaprdn = Configure::read('ApacheSecureAuth.ldapReaderUser');     // DN ou RDN LDAP
         $ldappass = Configure::read('ApacheSecureAuth.ldapReaderPassword');
         $ldapSearchFilter = Configure::read('ApacheSecureAuth.ldapSearchFilter');
+        $ldapEmailField = Configure::read('ApacheSecureAuth.ldapEmailField');
 
         // LDAP connection
         ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, Configure::read('ApacheSecureAuth.ldapNetworkTimeout', -1));
@@ -83,13 +95,17 @@ class ApacheAuthenticate extends BaseAuthenticate
 
             $ldapUserData = ldap_get_entries($ldapconn, $result);
 
-            // the request returns only 1 field
-            if (isset($ldapUserData[0]['mail'][0])) {
+            // find the email address in the query's result
+            // first if the ldapEmailField option is not specified, look for the email address in the default field
+            if (!isset($ldapEmailField) && isset($ldapUserData[0]['mail'][0])) {
                 // assign the real user for MISP
                 $mispUsername = $ldapUserData[0]['mail'][0];
+            } else if (isset($ldapEmailField)) {
+                $mispUsername = $this->getEmailAddress($ldapEmailField, $ldapUserData);		        
             } else {
                 die("User not found in LDAP");
             }
+		
             // close LDAP connection
             ldap_close($ldapconn);
         }
diff --git a/app/Controller/Component/RestResponseComponent.php b/app/Controller/Component/RestResponseComponent.php
index 977c37afa..3938a522c 100644
--- a/app/Controller/Component/RestResponseComponent.php
+++ b/app/Controller/Component/RestResponseComponent.php
@@ -243,6 +243,10 @@ class RestResponseComponent extends Component
                 'description' => "POST a body and a subject in a JSON to send an e-mail through MISP to the user ID given in the URL",
                 'mandatory' => array('subject', 'body')
             ),
+            'change_pw' => array(
+                'description' => "POST a password via a JSON object containing the password key to reset the given user\'s password.",
+                'mandatory' => array('password')
+            ),
             'statistics' => array(
                 'description' => 'Simply GET the url endpoint to view the API output of the statistics API. Additional statistics are available via the following tab-options similar to the UI: data, orgs, users, tags, attributehistogram, sightings, attackMatrix',
                 'params' => array('tab'),
diff --git a/app/Controller/EventsController.php b/app/Controller/EventsController.php
index fb7377b02..332d3ae3c 100644
--- a/app/Controller/EventsController.php
+++ b/app/Controller/EventsController.php
@@ -26,7 +26,7 @@ class EventsController extends AppController
     );
 
     private $acceptedFilteringNamedParams = array('sort', 'direction', 'focus', 'extended', 'overrideLimit', 'filterColumnsOverwrite', 'attributeFilter', 'extended', 'page',
-        'searchFor', 'attributeFilter', 'proposal', 'correlation', 'warning', 'deleted', 'includeRelatedTags', 'distribution', 'taggedAttributes', 'galaxyAttachedAttributes', 'objectType', 'attributeType', 'focus', 'extended', 'overrideLimit', 'filterColumnsOverwrite', 'feed', 'server', 'toIDS'
+        'searchFor', 'proposal', 'correlation', 'warning', 'deleted', 'includeRelatedTags', 'distribution', 'taggedAttributes', 'galaxyAttachedAttributes', 'objectType', 'attributeType', 'focus', 'extended', 'overrideLimit', 'filterColumnsOverwrite', 'feed', 'server', 'toIDS'
     );
 
     public $defaultFilteringRules =  array(
@@ -296,19 +296,31 @@ class EventsController extends AppController
         $passedArgsArray = array();
         $urlparams = "";
         $overrideAbleParams = array('all', 'attribute', 'published', 'eventid', 'datefrom', 'dateuntil', 'org', 'eventinfo', 'tag', 'tags', 'distribution', 'sharinggroup', 'analysis', 'threatlevel', 'email', 'hasproposal', 'timestamp', 'publishtimestamp', 'publish_timestamp', 'minimal');
+        $paginationParams = array('limit', 'page', 'sort', 'direction', 'order');
         $passedArgs = $this->passedArgs;
         if (isset($this->request->data)) {
             if (isset($this->request->data['request'])) {
                 $this->request->data = $this->request->data['request'];
             }
-            foreach ($overrideAbleParams as $oap) {
-                if (isset($this->request->data['search' . $oap])) {
-                    $this->request->data[$oap] = $this->request->data['search' . $oap];
+            foreach ($this->request->data as $k => $v) {
+                if (substr($k, 0, 6) === 'search' && in_array(strtolower(substr($k, 6)), $overrideAbleParams)) {
+                    unset($this->request->data[$k]);
+                    $this->request->data[strtolower(substr($k, 6))] = $v;
+                } else if (in_array(strtolower($k), $overrideAbleParams)) {
+                    unset($this->request->data[$k]);
+                    $this->request->data[strtolower($k)] = $v;
                 }
+            }
+            foreach ($overrideAbleParams as $oap) {
                 if (isset($this->request->data[$oap])) {
                     $passedArgs['search' . $oap] = $this->request->data[$oap];
                 }
             }
+            foreach ($paginationParams as $paginationParam) {
+                if (isset($this->request->data[$paginationParam])) {
+                    $passedArgs[$paginationParam] = $this->request->data[$paginationParam];
+                }
+            }
         }
         $this->set('passedArgs', json_encode($passedArgs));
         // check each of the passed arguments whether they're a filter (could also be a sort for example) and if yes, add it to the pagination conditions
@@ -699,12 +711,6 @@ class EventsController extends AppController
             } else {
                 $rules['order'] = array('Event.id' => 'DESC');
             }
-            if (isset($passedArgs['limit'])) {
-                $rules['limit'] = intval($passedArgs['limit']);
-            }
-            if (isset($passedArgs['page'])) {
-                $rules['page'] = intval($passedArgs['page']);
-            }
             $rules['contain'] = $this->paginate['contain'];
             if (isset($this->paginate['conditions'])) {
                 $rules['conditions'] = $this->paginate['conditions'];
@@ -714,6 +720,12 @@ class EventsController extends AppController
                 $rules['recursive'] = -1;
                 $rules['fields'] = array('id', 'timestamp', 'published', 'uuid');
             }
+            $paginationRules = array('page', 'limit', 'sort', 'direction', 'order');
+            foreach ($paginationRules as $paginationRule) {
+                if (isset($passedArgs[$paginationRule])) {
+                    $rules[$paginationRule] = $passedArgs[$paginationRule];
+                }
+            }
             if (empty($rules['limit'])) {
                 $events = array();
                 $i = 1;
@@ -856,6 +868,7 @@ class EventsController extends AppController
         $this->set('analysisLevels', $this->Event->analysisLevels);
         $this->set('distributionLevels', $this->Event->distributionLevels);
         $this->set('shortDist', $this->Event->shortDist);
+        $this->set('distributionData', $this->genDistributionGraph(-1));
         if ($this->params['ext'] === 'csv') {
             App::uses('CsvExport', 'Export');
             $export = new CsvExport();
@@ -1444,6 +1457,7 @@ class EventsController extends AppController
         $orgTable = $this->Event->Orgc->find('list', array(
             'fields' => array('Orgc.id', 'Orgc.name')
         ));
+        $this->set('required_taxonomies', $this->Event->getRequiredTaxonomies());
         $this->set('orgTable', $orgTable);
         $this->set('currentUri', $attributeUri);
         $this->set('filters', $filters);
@@ -2350,6 +2364,18 @@ class EventsController extends AppController
             $result = $this->Event->save($event, array('fieldList' => $fieldList));
             if ($result) {
                 $message = __('Event unpublished.');
+                $kafkaTopic = Configure::read('Plugin.Kafka_event_publish_notifications_topic');
+                if (Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_event_publish_notifications_enable') && !empty($kafkaTopic)) {
+                    $kafkaPubTool = $this->Event->getKafkaPubTool();
+                    $params = array('eventid' => $id);
+                    if (Configure::read('Plugin.Kafka_include_attachments')) {
+                        $params['includeAttachments'] = 1;
+                    }
+                    $pubEvent = $this->Event->fetchEvent($this->Auth->user(), $params);
+                    if (!empty($pubEvent)) {
+                        $kafkaPubTool->publishJson($kafkaTopic, $pubEvent[0], 'unpublish');
+                    }
+                }
                 if ($this->_isRest()) {
                     return $this->RestResponse->saveSuccessResponse('events', 'unpublish', $id, false, $message);
                 } else {
@@ -2387,6 +2413,13 @@ class EventsController extends AppController
         $errors = array();
         // only allow form submit CSRF protection.
         if ($this->request->is('post') || $this->request->is('put')) {
+            if (!$this->_isRest()) {
+                $publishable = $this->Event->checkIfPublishable($id);
+                if ($publishable !== true) {
+                    $this->Flash->error(__('Could not publish event - no tag for required taxonomies missing: %s', implode(', ', $publishable)));
+                    $this->redirect(array('action' => 'view', $id));
+                }
+            }
             // Performs all the actions required to publish an event
             $result = $this->Event->publishRouter($id, null, $this->Auth->user());
             if (!Configure::read('MISP.background_jobs')) {
@@ -3518,9 +3551,6 @@ class EventsController extends AppController
 
     public function addTag($id = false, $tag_id = false)
     {
-        if (!$this->request->is('post')) {
-            return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'You don\'t have permission to do that.')), 'status'=>200, 'type' => 'json'));
-        }
         $rearrangeRules = array(
                 'request' => false,
                 'Event' => false,
@@ -3533,112 +3563,120 @@ class EventsController extends AppController
         if ($id === false) {
             $id = $this->request->data['event'];
         }
-        if ($tag_id === false) {
-            $tag_id = $this->request->data['tag'];
-        }
-        $conditions = array('LOWER(Tag.name) LIKE' => strtolower(trim($tag_id)));
-        if (!$this->_isSiteAdmin()) {
-            $conditions['Tag.org_id'] = array('0', $this->Auth->user('org_id'));
-            $conditions['Tag.user_id'] = array('0', $this->Auth->user('id'));
-        }
-        if (!is_numeric($tag_id)) {
-            if (preg_match('/^collection_[0-9]+$/i', $tag_id)) {
-                $tagChoice = explode('_', $tag_id)[1];
-                $this->loadModel('TagCollection');
-                $tagCollection = $this->TagCollection->fetchTagCollection($this->Auth->user(), array('conditions' => array('TagCollection.id' => $tagChoice)));
-                if (empty($tagCollection)) {
-                    return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag Collection.')), 'status'=>200, 'type' => 'json'));
-                }
-                $tag_id_list = array();
-                foreach ($tagCollection[0]['TagCollectionTag'] as $tagCollectionTag) {
-                    $tag_id_list[] = $tagCollectionTag['tag_id'];
-                }
-            } else {
-                $tag_ids = json_decode($tag_id);
-                if ($tag_ids !== null) { // can decode json
-                    $tag_id_list = array();
-                    foreach ($tag_ids as $tag_id) {
-                        if (preg_match('/^collection_[0-9]+$/i', $tag_id)) {
-                            $tagChoice = explode('_', $tag_id)[1];
-                            $this->loadModel('TagCollection');
-                            $tagCollection = $this->TagCollection->fetchTagCollection($this->Auth->user(), array('conditions' => array('TagCollection.id' => $tagChoice)));
-                            if (empty($tagCollection)) {
-                                return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag Collection.')), 'status'=>200, 'type' => 'json'));
-                            }
-                            $tag_id_list = array();
-                            foreach ($tagCollection[0]['TagCollectionTag'] as $tagCollectionTag) {
-                                $tag_id_list[] = $tagCollectionTag['tag_id'];
-                            }
-                        } else {
-                            $tag_id_list[] = $tag_id;
-                        }
-                    }
-                } else {
-                    $tag = $this->Event->EventTag->Tag->find('first', array('recursive' => -1, 'conditions' => $conditions));
-                    if (empty($tag)) {
-                        return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag.')), 'status'=>200, 'type' => 'json'));
-                    }
-                    $tag_id = $tag['Tag']['id'];
-                }
-            }
-        }
         $this->Event->recursive = -1;
         $event = $this->Event->read(array(), $id);
         if (empty($event)) {
             return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid event.')), 'status'=>200, 'type' => 'json'));
         }
-        if (!$this->_isSiteAdmin() && !$this->userRole['perm_sync']) {
-            if (!$this->userRole['perm_tagger'] || ($this->Auth->user('org_id') !== $event['Event']['orgc_id'])) {
-                return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'You don\'t have permission to do that.')), 'status'=>200, 'type' => 'json'));
-            }
-        }
-        $this->autoRender = false;
-        $error = false;
-        $success = false;
-        if (empty($tag_id_list)) {
-            $tag_id_list = array($tag_id);
-        }
-        foreach ($tag_id_list as $tag_id) {
-            $this->Event->EventTag->Tag->id = $tag_id;
-            if (!$this->Event->EventTag->Tag->exists()) {
-                $error = __('Invalid Tag.');
-                continue;
-            }
-            $tag = $this->Event->EventTag->Tag->find('first', array(
-                'conditions' => array('Tag.id' => $tag_id),
-                'recursive' => -1,
-                'fields' => array('Tag.name')
-            ));
-            $found = $this->Event->EventTag->find('first', array(
-                'conditions' => array(
-                    'event_id' => $id,
-                    'tag_id' => $tag_id
-                ),
-                'recursive' => -1,
-            ));
-            if (!empty($found)) {
-                $error = __('Tag is already attached to this event.');
-                continue;
-            }
-            $this->Event->EventTag->create();
-            if ($this->Event->EventTag->save(array('event_id' => $id, 'tag_id' => $tag_id))) {
-                $event['Event']['published'] = 0;
-                $date = new DateTime();
-                $event['Event']['timestamp'] = $date->getTimestamp();
-                $this->Event->save($event);
-                $log = ClassRegistry::init('Log');
-                $log->createLogEntry($this->Auth->user(), 'tag', 'Event', $id, 'Attached tag (' . $tag_id . ') "' . $tag['Tag']['name'] . '" to event (' . $id . ')', 'Event (' . $id . ') tagged as Tag (' . $tag_id . ')');
-                $success = __('Tag(s) added.');
-            } else {
-                $fail = __('Tag could not be added.');
-            }
-        }
-        if ($success) {
-            return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => __('Tag(s) added.'), 'check_publish' => true)), 'status'=>200, 'type' => 'json'));
-        } elseif (empty($fail)) {
-            return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => __('All tags are already present, nothing to add.'), 'check_publish' => true)), 'status'=>200, 'type' => 'json'));
+        if (!$this->request->is('post')) {
+            $this->set('object_id', $id);
+            $this->set('scope', 'Event');
+            $this->layout = false;
+            $this->autoRender = false;
+            $this->render('/Events/add_tag');
         } else {
-            return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => $fail)), 'status'=>200, 'type' => 'json'));
+            if ($tag_id === false) {
+                $tag_id = $this->request->data['tag'];
+            }
+            if (!$this->_isSiteAdmin() && !$this->userRole['perm_sync']) {
+                if (!$this->userRole['perm_tagger'] || ($this->Auth->user('org_id') !== $event['Event']['orgc_id'])) {
+                    return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'You don\'t have permission to do that.')), 'status'=>200, 'type' => 'json'));
+                }
+            }
+            $conditions = array('LOWER(Tag.name) LIKE' => strtolower(trim($tag_id)));
+            if (!$this->_isSiteAdmin()) {
+                $conditions['Tag.org_id'] = array('0', $this->Auth->user('org_id'));
+                $conditions['Tag.user_id'] = array('0', $this->Auth->user('id'));
+            }
+            if (!is_numeric($tag_id)) {
+                if (preg_match('/^collection_[0-9]+$/i', $tag_id)) {
+                    $tagChoice = explode('_', $tag_id)[1];
+                    $this->loadModel('TagCollection');
+                    $tagCollection = $this->TagCollection->fetchTagCollection($this->Auth->user(), array('conditions' => array('TagCollection.id' => $tagChoice)));
+                    if (empty($tagCollection)) {
+                        return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag Collection.')), 'status'=>200, 'type' => 'json'));
+                    }
+                    $tag_id_list = array();
+                    foreach ($tagCollection[0]['TagCollectionTag'] as $tagCollectionTag) {
+                        $tag_id_list[] = $tagCollectionTag['tag_id'];
+                    }
+                } else {
+                    $tag_ids = json_decode($tag_id);
+                    if ($tag_ids !== null) { // can decode json
+                        $tag_id_list = array();
+                        foreach ($tag_ids as $tag_id) {
+                            if (preg_match('/^collection_[0-9]+$/i', $tag_id)) {
+                                $tagChoice = explode('_', $tag_id)[1];
+                                $this->loadModel('TagCollection');
+                                $tagCollection = $this->TagCollection->fetchTagCollection($this->Auth->user(), array('conditions' => array('TagCollection.id' => $tagChoice)));
+                                if (empty($tagCollection)) {
+                                    return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag Collection.')), 'status'=>200, 'type' => 'json'));
+                                }
+                                $tag_id_list = array();
+                                foreach ($tagCollection[0]['TagCollectionTag'] as $tagCollectionTag) {
+                                    $tag_id_list[] = $tagCollectionTag['tag_id'];
+                                }
+                            } else {
+                                $tag_id_list[] = $tag_id;
+                            }
+                        }
+                    } else {
+                        $tag = $this->Event->EventTag->Tag->find('first', array('recursive' => -1, 'conditions' => $conditions));
+                        if (empty($tag)) {
+                            return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag.')), 'status'=>200, 'type' => 'json'));
+                        }
+                        $tag_id = $tag['Tag']['id'];
+                    }
+                }
+            }
+            $this->autoRender = false;
+            $error = false;
+            $success = false;
+            if (empty($tag_id_list)) {
+                $tag_id_list = array($tag_id);
+            }
+            foreach ($tag_id_list as $tag_id) {
+                $this->Event->EventTag->Tag->id = $tag_id;
+                if (!$this->Event->EventTag->Tag->exists()) {
+                    $error = __('Invalid Tag.');
+                    continue;
+                }
+                $tag = $this->Event->EventTag->Tag->find('first', array(
+                    'conditions' => array('Tag.id' => $tag_id),
+                    'recursive' => -1,
+                    'fields' => array('Tag.name')
+                ));
+                $found = $this->Event->EventTag->find('first', array(
+                    'conditions' => array(
+                        'event_id' => $id,
+                        'tag_id' => $tag_id
+                    ),
+                    'recursive' => -1,
+                ));
+                if (!empty($found)) {
+                    $error = __('Tag is already attached to this event.');
+                    continue;
+                }
+                $this->Event->EventTag->create();
+                if ($this->Event->EventTag->save(array('event_id' => $id, 'tag_id' => $tag_id))) {
+                    $event['Event']['published'] = 0;
+                    $date = new DateTime();
+                    $event['Event']['timestamp'] = $date->getTimestamp();
+                    $this->Event->save($event);
+                    $log = ClassRegistry::init('Log');
+                    $log->createLogEntry($this->Auth->user(), 'tag', 'Event', $id, 'Attached tag (' . $tag_id . ') "' . $tag['Tag']['name'] . '" to event (' . $id . ')', 'Event (' . $id . ') tagged as Tag (' . $tag_id . ')');
+                    $success = __('Tag(s) added.');
+                } else {
+                    $fail = __('Tag could not be added.');
+                }
+            }
+            if ($success) {
+                return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => __('Tag(s) added.'), 'check_publish' => true)), 'status'=>200, 'type' => 'json'));
+            } elseif (empty($fail)) {
+                return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => __('All tags are already present, nothing to add.'), 'check_publish' => true)), 'status'=>200, 'type' => 'json'));
+            } else {
+                return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => $fail)), 'status'=>200, 'type' => 'json'));
+            }
         }
     }
 
@@ -4655,8 +4693,7 @@ class EventsController extends AppController
         return new CakeResponse(array('body' => json_encode($json), 'status' => 200, 'type' => 'json'));
     }
 
-    public function getDistributionGraph($id, $type = 'event')
-    {
+    private function genDistributionGraph($id, $type = 'event', $extended = 0) {
         $validTools = array('event');
         if (!in_array($type, $validTools)) {
             throw new MethodNotAllowedException(__('Invalid type.'));
@@ -4665,9 +4702,6 @@ class EventsController extends AppController
         $this->loadModel('Organisation');
         App::uses('DistributionGraphTool', 'Tools');
         $grapher = new DistributionGraphTool();
-        $data = $this->request->is('post') ? $this->request->data : array();
-
-        $extended = isset($this->params['named']['extended']) ? 1 : 0;
 
         $servers = $this->Server->find('list', array(
             'fields' => array('name'),
@@ -4680,6 +4714,13 @@ class EventsController extends AppController
                 $item = utf8_encode($item);
             }
         });
+        return $json;
+    }
+
+    public function getDistributionGraph($id, $type = 'event')
+    {
+        $extended = isset($this->params['named']['extended']) ? 1 : 0;
+        $json = $this->genDistributionGraph($id, $type, $extended);
         $this->response->type('json');
         return new CakeResponse(array('body' => json_encode($json), 'status' => 200, 'type' => 'json'));
     }
@@ -4903,7 +4944,6 @@ class EventsController extends AppController
             App::uses('ColourGradientTool', 'Tools');
             $gradientTool = new ColourGradientTool();
             $colours = $gradientTool->createGradientFromValues($scores);
-
             $this->set('eventId', $eventId);
             $this->set('target_type', $scope);
             $this->set('columnOrders', $killChainOrders);
@@ -4986,12 +5026,12 @@ class EventsController extends AppController
         if (empty($attribute)) {
             throw new MethodNotAllowedException(__('Attribute not found or you are not authorised to see it.'));
         }
+        $this->loadModel('Module');
+        $enabledModules = $this->Module->getEnabledModules($this->Auth->user(), false, $type);
+        if (!is_array($enabledModules) || empty($enabledModules)) {
+            throw new MethodNotAllowedException(__('No valid %s options found for this attribute.', $type));
+        }
         if ($this->request->is('ajax')) {
-            $this->loadModel('Module');
-            $enabledModules = $this->Module->getEnabledModules($this->Auth->user(), false, $type);
-            if (!is_array($enabledModules) || empty($enabledModules)) {
-                throw new MethodNotAllowedException(__('No valid %s options found for this attribute.', $type));
-            }
             $modules = array();
             foreach ($enabledModules['modules'] as $module) {
                 if (in_array($attribute[0]['Attribute']['type'], $module['mispattributes']['input'])) {
@@ -5004,65 +5044,16 @@ class EventsController extends AppController
             $this->set('type', $type);
             $this->render('ajax/enrichmentChoice');
         } else {
-            $this->loadModel('Module');
-            $enabledModules = $this->Module->getEnabledModules($this->Auth->user(), false, $type);
-            if (!is_array($enabledModules) || empty($enabledModules)) {
-                throw new MethodNotAllowedException(__('no valid %s options found for this attribute.', $type));
-            }
             $options = array();
             foreach ($enabledModules['modules'] as $temp) {
                 if ($temp['name'] == $module) {
+                    $format = (isset($temp['mispattributes']['format']) ? $temp['mispattributes']['format'] : 'simplified');
                     if (isset($temp['meta']['config'])) {
                         foreach ($temp['meta']['config'] as $conf) {
                             $options[$conf] = Configure::read('Plugin.' . $type . '_' . $module . '_' . $conf);
                         }
                     }
-                }
-            }
-            $data = array('module' => $module, $attribute[0]['Attribute']['type'] => $attribute[0]['Attribute']['value'], 'event_id' => $attribute[0]['Attribute']['event_id'], 'attribute_uuid' => $attribute[0]['Attribute']['uuid']);
-            if ($this->Event->Attribute->typeIsAttachment($attribute[0]['Attribute']['type'])) {
-                $data['data'] = $this->Event->Attribute->base64EncodeAttachment($attribute[0]['Attribute']);
-            }
-            if (!empty($options)) {
-                $data['config'] = $options;
-            }
-            $data = json_encode($data);
-            $result = $this->Module->queryModuleServer('/query', $data, false, $type);
-            if (!$result) {
-                throw new MethodNotAllowedException(__('%s service not reachable.', $type));
-            }
-            if (isset($result['error'])) {
-                $this->Flash->error($result['error']);
-            }
-            if (!is_array($result)) {
-                throw new Exception($result);
-            }
-            $resultArray = $this->Event->handleModuleResult($result, $attribute[0]['Attribute']['event_id']);
-            if (isset($result['comment']) && $result['comment'] != "") {
-                $importComment = $result['comment'];
-            } else {
-                $importComment = $attribute[0]['Attribute']['value'] . __(': Enriched via the %s', $module) . ($type != 'Enrichment' ? ' ' . $type : '')  . ' module';
-            }
-            $typeCategoryMapping = array();
-            foreach ($this->Event->Attribute->categoryDefinitions as $k => $cat) {
-                foreach ($cat['types'] as $type) {
-                    $typeCategoryMapping[$type][$k] = $k;
-                }
-            }
-            foreach ($resultArray as $key => $result) {
-                $options = array(
-                        'conditions' => array('OR' => array('Attribute.value1' => $result['value'], 'Attribute.value2' => $result['value'])),
-                        'fields' => array('Attribute.type', 'Attribute.category', 'Attribute.value', 'Attribute.comment'),
-                        'order' => false
-                );
-                $resultArray[$key]['related'] = $this->Event->Attribute->fetchAttributes($this->Auth->user(), $options);
-                if (isset($result['data'])) {
-                    App::uses('FileAccessTool', 'Tools');
-                    $fileAccessTool = new FileAccessTool();
-                    $tmpdir = Configure::read('MISP.tmpdir') ? Configure::read('MISP.tmpdir') : '/tmp';
-                    $tempFile = $fileAccessTool->createTempFile($tmpdir, $prefix = 'MISP');
-                    $fileAccessTool->writeToFile($tempFile, $result['data']);
-                    $resultArray[$key]['data'] = basename($tempFile) . '|' . filesize($tempFile);
+                    break;
                 }
             }
             $distributions = $this->Event->Attribute->distributionLevels;
@@ -5072,18 +5063,133 @@ class EventsController extends AppController
             }
             $this->set('distributions', $distributions);
             $this->set('sgs', $sgs);
-            $this->set('type', $type);
-            $this->set('event', array('Event' => $attribute[0]['Event']));
-            $this->set('resultArray', $resultArray);
-            $this->set('typeList', array_keys($this->Event->Attribute->typeDefinitions));
-            $this->set('defaultCategories', $this->Event->Attribute->defaultCategories);
-            $this->set('typeCategoryMapping', $typeCategoryMapping);
-            $this->set('title', 'Enrichment Results');
-            $this->set('importComment', $importComment);
-            $this->render('resolved_attributes');
+            if ($format == 'misp_standard') {
+                $this->__queryEnrichment($attribute, $module, $options, $type);
+            } else {
+                $this->__queryOldEnrichment($attribute, $module, $options, $type);
+            }
         }
     }
 
+    private function __queryEnrichment($attribute, $module, $options, $type)
+    {
+        if ($this->Event->Attribute->typeIsAttachment($attribute[0]['Attribute']['type'])) {
+            $attribute[0]['Attribute']['data'] = $this->Event->Attribute->base64EncodeAttachment($attribute[0]['Attribute']);
+        }
+        $event_id = $attribute[0]['Event']['id'];
+        $data = array('module' => $module, 'attribute' => $attribute[0]['Attribute'], 'event_id' => $event_id);
+        if (!empty($options)) {
+            $data['config'] = $options;
+        }
+        $data = json_encode($data);
+        $result = $this->Module->queryModuleServer('/query', $data, false, $type);
+        if (!$result) {
+            throw new MethodNotAllowedException(__('%s service not reachable.', $type));
+        }
+        if (isset($result['error'])) {
+            $this->Flash->error($result['error']);
+        }
+        if (!is_array($result)) {
+            throw new Exception($result);
+        }
+        $attributes = array();
+        $objects = array();
+        if (isset($result['results']['Attribute']) && !empty($result['results']['Attribute'])) {
+            foreach ($result['results']['Attribute'] as $tmp_attribute) {
+                array_push($attributes, $this->Event->Attribute->captureAttribute($tmp_attribute, $event_id, $this->Auth->user()));
+            }
+            unset($result['results']['Attribute']);
+        }
+        if (isset($result['results']['Object']) && !empty($result['results']['Object'])) {
+            foreach ($result['results']['Object'] as $tmp_object) {
+                $this->Event->Object->captureObject($tmp_object, $event_id, $this->Auth->user());
+                array_push($objects, $tmp_object);
+            }
+            unset($result['results']['Object']);
+        }
+        if (empty($attributes) && empty($objects)) {
+            $this->__handleSimplifiedFormat($attribute, $module, $options, $result, $type);
+        } else {
+            $event = array('Event' => $attribute[0]['Event']);
+            $event['Attribute'] = $attributes;
+            $event['Object'] = $objects;
+            $this->set('event', $event);
+            if (!empty($result['results'])) {
+                $this->__handleSimplifiedFormat($attribute, $module, $options, $result, $type, $event = true, $render_name = 'resolved_misp_format');
+            } else {
+                $this->set('menuItem', 'enrichmentResults');
+                $this->set('title', 'Enrichment Results');
+                $this->render('resolved_misp_format');
+            }
+        }
+    }
+
+    private function __queryOldEnrichment($attribute, $module, $options, $type)
+    {
+        $data = array('module' => $module, $attribute[0]['Attribute']['type'] => $attribute[0]['Attribute']['value'], 'event_id' => $attribute[0]['Attribute']['event_id'], 'attribute_uuid' => $attribute[0]['Attribute']['uuid']);
+        if ($this->Event->Attribute->typeIsAttachment($attribute[0]['Attribute']['type'])) {
+            $data['data'] = $this->Event->Attribute->base64EncodeAttachment($attribute[0]['Attribute']);
+        }
+        if (!empty($options)) {
+            $data['config'] = $options;
+        }
+        $data = json_encode($data);
+        $result = $this->Module->queryModuleServer('/query', $data, false, $type);
+        if (!$result) {
+            throw new MethodNotAllowedException(__('%s service not reachable.', $type));
+        }
+        if (isset($result['error'])) {
+            $this->Flash->error($result['error']);
+        }
+        if (!is_array($result)) {
+            throw new Exception($result);
+        }
+        $this->__handleSimplifiedFormat($attribute, $module, $options, $result, $type);
+    }
+
+    private function __handleSimplifiedFormat($attribute, $module, $options, $result, $type, $event = false, $renderName = 'resolved_attributes')
+    {
+        $resultArray = $this->Event->handleModuleResult($result, $attribute[0]['Attribute']['event_id']);
+        if (isset($result['comment']) && $result['comment'] != "") {
+            $importComment = $result['comment'];
+        } else {
+            $importComment = $attribute[0]['Attribute']['value'] . __(': Enriched via the %s', $module) . ($type != 'Enrichment' ? ' ' . $type : '')  . ' module';
+        }
+        $typeCategoryMapping = array();
+        foreach ($this->Event->Attribute->categoryDefinitions as $k => $cat) {
+            foreach ($cat['types'] as $type) {
+                $typeCategoryMapping[$type][$k] = $k;
+            }
+        }
+        foreach ($resultArray as $key => $result) {
+            $options = array(
+                    'conditions' => array('OR' => array('Attribute.value1' => $result['value'], 'Attribute.value2' => $result['value'])),
+                    'fields' => array('Attribute.type', 'Attribute.category', 'Attribute.value', 'Attribute.comment'),
+                    'order' => false
+            );
+            $resultArray[$key]['related'] = $this->Event->Attribute->fetchAttributes($this->Auth->user(), $options);
+            if (isset($result['data'])) {
+                App::uses('FileAccessTool', 'Tools');
+                $fileAccessTool = new FileAccessTool();
+                $tmpdir = Configure::read('MISP.tmpdir') ? Configure::read('MISP.tmpdir') : '/tmp';
+                $tempFile = $fileAccessTool->createTempFile($tmpdir, $prefix = 'MISP');
+                $fileAccessTool->writeToFile($tempFile, $result['data']);
+                $resultArray[$key]['data'] = basename($tempFile) . '|' . filesize($tempFile);
+            }
+        }
+        $this->set('type', $type);
+        if (!$event){
+            $this->set('event', array('Event' => $attribute[0]['Event']));
+        }
+        $this->set('resultArray', $resultArray);
+        $this->set('typeList', array_keys($this->Event->Attribute->typeDefinitions));
+        $this->set('defaultCategories', $this->Event->Attribute->defaultCategories);
+        $this->set('typeCategoryMapping', $typeCategoryMapping);
+        $this->set('title', 'Enrichment Results');
+        $this->set('importComment', $importComment);
+        $this->render($renderName);
+    }
+
     public function importModule($module, $eventId)
     {
         $this->loadModel('Module');
@@ -5339,6 +5445,59 @@ class EventsController extends AppController
         }
     }
 
+    public function pushEventToKafka($id)
+    {
+        if ($this->request->is('Post')) {
+            $message = 'Kafka event publishing not enabled.';
+            if (Configure::read('Plugin.Kafka_enable')) {
+                $kafkaEventTopic = Configure::read('Plugin.Kafka_event_notifications_topic');
+                $event = $this->Event->quickFetchEvent(array('eventid' => $id));
+                if (Configure::read('Plugin.Kafka_event_notifications_enable') && !empty($kafkaEventTopic)) {
+                    $kafkaPubTool = $this->Event->getKafkaPubTool();
+                    if (!empty($event)) {
+                        $kafkaPubTool->publishJson($kafkaEventTopic, $event, 'manual_publish');
+                        $success = 1;
+                        $message = 'Event published to Kafka';
+                    } else {
+                        $success = 0;
+                        $message = 'Invalid event.';
+                    }
+                }
+                $kafkaPubTopic = Configure::read('Plugin.Kafka_event_publish_notifications_topic');
+                if (!empty($event['Event']['published']) && Configure::read('Plugin.Kafka_event_publish_notifications_enable') && !empty($kafkaPubTopic)) {
+                    $kafkaPubTool = $this->Event->getKafkaPubTool();
+                    $params = array('eventid' => $id);
+                    if (Configure::read('Plugin.Kafka_include_attachments')) {
+                        $params['includeAttachments'] = 1;
+                    }
+                    $event = $this->Event->fetchEvent($this->Auth->user(), $params);
+                    if (!empty($event)) {
+                        $kafkaPubTool->publishJson($kafkaPubTopic, $event[0], 'manual_publish');
+                        if (!isset($success)) {
+                            $success = 1;
+                            $message = 'Event published to Kafka';
+                        }
+                    } else {
+                        $success = 0;
+                        $message = 'Invalid event.';
+                    }
+                }
+            }
+        } else {
+            $message = 'This functionality is only available via POST requests';
+        }
+        if ($this->_isRest()) {
+            return $this->RestResponse->saveSuccessResponse('Events', 'pushEventToKafka', $id, $this->response->type(), $message);
+        } else {
+            if (!empty($success)) {
+                $this->Flash->success($message);
+            } else {
+                $this->Flash->error($message);
+            }
+            $this->redirect($this->referer());
+        }
+    }
+
     public function getEventInfoById($id)
     {
         if (empty($id)) {
diff --git a/app/Controller/FeedsController.php b/app/Controller/FeedsController.php
index 29080d161..5e36f4a7f 100644
--- a/app/Controller/FeedsController.php
+++ b/app/Controller/FeedsController.php
@@ -23,6 +23,7 @@ class FeedsController extends AppController
     {
         parent::beforeFilter();
         $this->Security->unlockedActions[] = 'previewIndex';
+        $this->Security->unlockedActions[] = 'feedCoverage';
         if (!$this->_isSiteAdmin() && $this->Auth->user('org_id') != Configure::read('MISP.host_org_id')) {
             throw new MethodNotAllowedException(__('You don\'t have the required privileges to do that.'));
         }
@@ -88,12 +89,32 @@ class FeedsController extends AppController
             'recursive' => -1,
             'contain' => array('Tag')
         ));
+        $feed['Feed']['cached_elements'] = $this->Feed->getCachedElements($feed['Feed']['id']);
+        $feed['Feed']['coverage_by_other_feeds'] = $this->Feed->getFeedCoverage($feed['Feed']['id'], 'feed', 'all') . '%';
         if ($this->_isRest()) {
             if (empty($feed['Tag']['id'])) {
                 unset($feed['Tag']);
             }
             return $this->RestResponse->viewData($feed, $this->response->type());
         }
+        $feeds = $this->Feed->getAllCachingEnabledFeeds($feed['Feed']['id'], true);
+        $this->set('other_feeds', $feeds);
+        $this->set('feed', $feed);
+    }
+    
+    public function feedCoverage($feedId)
+    {
+        if (!$this->_isSiteAdmin() && !$this->Auth->user('org_id') == Configure::read('MISP.host_org_id')) {
+            throw NotAllowedException('You don\'t have access to this feature.');
+        }
+        $feed = $this->Feed->find('first', array(
+            'conditions' => array('Feed.id' => $feedId),
+            'recursive' => -1,
+            'contain' => array('Tag')
+        ));
+        $result = $this->Feed->getFeedCoverage($feed['Feed']['id'], 'feed', $this->request->data);
+        return $this->RestResponse->viewData($result, $this->response->type());
+
     }
 
     public function importFeeds()
@@ -238,6 +259,7 @@ class FeedsController extends AppController
             throw new NotFoundException(__('Invalid feed.'));
         }
         $this->Feed->read();
+        $this->set('feed', $this->Feed->data);
         $this->loadModel('Event');
         $sgs = $this->Event->SharingGroup->fetchAllAuthorised($this->Auth->user(), 'name', 1);
         $distributionLevels = $this->Event->distributionLevels;
diff --git a/app/Controller/GalaxiesController.php b/app/Controller/GalaxiesController.php
index eaee5fa97..56debcbc0 100644
--- a/app/Controller/GalaxiesController.php
+++ b/app/Controller/GalaxiesController.php
@@ -77,6 +77,38 @@ class GalaxiesController extends AppController
         }
     }
 
+    public function delete($id)
+    {
+        if (!is_numeric($id)) {
+            throw new NotFoundException('Invalid galaxy.');
+        }
+        $galaxy = $this->Galaxy->find('first', array(
+                'recursive' => -1,
+                'conditions' => array('Galaxy.id' => $id)
+        ));
+        if (empty($galaxy)) {
+            throw new NotFoundException('Invalid galaxy.');
+        }
+        $result = $this->Galaxy->delete($id);
+        if ($result) {
+            $message = 'Galaxy deleted';
+            if ($this->_isRest()) {
+                return $this->RestResponse->saveSuccessResponse('Galaxy', 'delete', false, $this->response->type(), $message);
+            } else {
+                $this->Flash->success($message);
+                $this->redirect(array('controller' => 'galaxies', 'action' => 'index'));
+            }
+        } else {
+            $message = 'Could not delete Galaxy.';
+            if ($this->_isRest()) {
+                return $this->RestResponse->saveFailResponse('Galaxy', 'delete', false, $message);
+            } else {
+                $this->Flash->success($message);
+                $this->redirect($this->referer());
+            }
+        }
+    }
+
     public function selectGalaxy($target_id, $target_type='event', $namespace='misp')
     {
         $mitreAttackGalaxyId = $this->Galaxy->getMitreAttackGalaxyId();
@@ -238,34 +270,42 @@ class GalaxiesController extends AppController
 
     public function attachMultipleClusters($target_id, $target_type = 'event')
     {
-        if ($target_id === 'selected') {
-            $target_id_list = json_decode($this->request->data['Galaxy']['attribute_ids']);
-        } else {
-            $target_id_list = array($target_id);
-        }
-        $cluster_ids = $this->request->data['Galaxy']['target_ids'];
-        if (!empty($cluster_ids)) {
-            $cluster_ids = json_decode($cluster_ids, true);
-            if ($cluster_ids === null) {
-                return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'error' => __('Failed to parse request.'))), 'status'=>200, 'type' => 'json'));
+        if ($this->request->is('post')) {
+            if ($target_id === 'selected') {
+                $target_id_list = json_decode($this->request->data['Galaxy']['attribute_ids']);
+            } else {
+                $target_id_list = array($target_id);
+            }
+            $cluster_ids = $this->request->data['Galaxy']['target_ids'];
+            if (!empty($cluster_ids)) {
+                $cluster_ids = json_decode($cluster_ids, true);
+                if ($cluster_ids === null) {
+                    return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'error' => __('Failed to parse request.'))), 'status'=>200, 'type' => 'json'));
+                }
+            } else {
+                return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'error' => __('No clusters picked.'))), 'status'=>200, 'type' => 'json'));
+            }
+            $result = "";
+            if (!is_array($cluster_ids)) { // in case we only want to attach 1
+                $cluster_ids = array($cluster_ids);
+            }
+            foreach ($cluster_ids as $cluster_id) {
+                foreach ($target_id_list as $target_id) {
+                    $result = $this->Galaxy->attachCluster($this->Auth->user(), $target_type, $target_id, $cluster_id);
+                }
+            }
+            if ($this->request->is('ajax')) {
+                return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => $result, 'check_publish' => true)), 'status'=>200, 'type' => 'json'));
+            } else {
+                $this->Flash->info($result);
+                $this->redirect($this->referer());
             }
         } else {
-            return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'error' => __('No clusters picked.'))), 'status'=>200, 'type' => 'json'));
-        }
-        $result = "";
-        if (!is_array($cluster_ids)) { // in case we only want to attach 1
-            $cluster_ids = array($cluster_ids);
-        }
-        foreach ($cluster_ids as $cluster_id) {
-            foreach ($target_id_list as $target_id) {
-                $result = $this->Galaxy->attachCluster($this->Auth->user(), $target_type, $target_id, $cluster_id);
-            }
-        }
-        if ($this->request->is('ajax')) {
-            return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => $result, 'check_publish' => true)), 'status'=>200, 'type' => 'json'));
-        } else {
-            $this->Flash->info($result);
-            $this->redirect($this->referer());
+            $this->set('target_id', $target_id);
+            $this->set('target_type', $target_type);
+            $this->layout = false;
+            $this->autoRender = false;
+            $this->render('/Galaxies/ajax/attach_multiple_clusters');
         }
     }
 
diff --git a/app/Controller/GalaxyClustersController.php b/app/Controller/GalaxyClustersController.php
index 149711948..a56fa9c03 100644
--- a/app/Controller/GalaxyClustersController.php
+++ b/app/Controller/GalaxyClustersController.php
@@ -356,4 +356,107 @@ class GalaxyClustersController extends AppController
             }
         }
     }
+
+    public function viewGalaxyMatrix($id) {
+        if (!$this->request->is('ajax')) {
+            throw new MethodNotAllowedException('This function can only be reached via AJAX.');
+        }
+
+        $cluster = $this->GalaxyCluster->find('first', array(
+            'conditions' => array('id' => $id)
+        ));
+        if (empty($cluster)) {
+            throw new Exception("Invalid Galaxy Cluster.");
+        }
+        $this->loadModel('Event');
+        $mitreAttackGalaxyId = $this->GalaxyCluster->Galaxy->getMitreAttackGalaxyId();
+        $attackPatternTagNames = $this->GalaxyCluster->find('list', array(
+            'conditions' => array('galaxy_id' => $mitreAttackGalaxyId),
+            'fields' => array('tag_name')
+        ));
+
+        $cluster = $cluster['GalaxyCluster'];
+        $tag_name = $cluster['tag_name'];
+
+        // fetch all attribute ids having the requested cluster
+        $attributeIds = $this->Event->Attribute->AttributeTag->find('list', array(
+            'contain' => array('Tag'),
+            'conditions' => array(
+                'Tag.name' => $tag_name
+            ),
+            'fields' => array('attribute_id'),
+            'recursive' => -1
+        ));
+        // fetch all related tags belonging to attack pattern
+        $attributeTags = $this->Event->Attribute->AttributeTag->find('all', array(
+            'contain' => array('Tag'),
+            'conditions' => array(
+                'attribute_id' => $attributeIds,
+                'Tag.name' => $attackPatternTagNames
+            ),
+            'fields' => array('Tag.name, COUNT(DISTINCT event_id) as tag_count'),
+            'recursive' => -1,
+            'group' => array('Tag.name')
+        ));
+
+        // fetch all event ids having the requested cluster
+        $eventIds = $this->Event->EventTag->find('list', array(
+            'contain' => array('Tag'),
+            'conditions' => array(
+                'Tag.name' => $tag_name
+            ),
+            'fields' => array('event_id'),
+            'recursive' => -1
+        ));
+        // fetch all related tags belonging to attack pattern
+        $eventTags = $this->Event->EventTag->find('all', array(
+            'contain' => array('Tag'),
+            'conditions' => array(
+                'event_id' => $eventIds,
+                'Tag.name' => $attackPatternTagNames
+            ),
+            'fields' => array('Tag.name, COUNT(DISTINCT event_id) as tag_count'),
+            'recursive' => -1,
+            'group' => array('Tag.name')
+        ));
+
+        $scores = array();
+        foreach ($attributeTags as $tag) {
+            $tagName = $tag['Tag']['name'];
+            $scores[$tagName] = intval($tag[0]['tag_count']);
+        }
+        foreach ($eventTags as $tag) {
+            $tagName = $tag['Tag']['name'];
+            if (isset($scores[$tagName])) {
+                $scores[$tagName] = $scores[$tagName] + intval($tag[0]['tag_count']);
+            } else {
+                $scores[$tagName] = intval($tag[0]['tag_count']);
+            }
+        }
+
+        $maxScore = count($scores) > 0 ? max(array_values($scores)) : 0;
+        $matrixData = $this->GalaxyCluster->Galaxy->getMatrix($mitreAttackGalaxyId);
+        $tabs = $matrixData['tabs'];
+        $matrixTags = $matrixData['matrixTags'];
+        $killChainOrders = $matrixData['killChain'];
+        $instanceUUID = $matrixData['instance-uuid'];
+
+        App::uses('ColourGradientTool', 'Tools');
+        $gradientTool = new ColourGradientTool();
+        $colours = $gradientTool->createGradientFromValues($scores);
+        $this->set('target_type', 'attribute');
+        $this->set('columnOrders', $killChainOrders);
+        $this->set('tabs', $tabs);
+        $this->set('scores', $scores);
+        $this->set('maxScore', $maxScore);
+        if (!empty($colours)) {
+            $this->set('colours', $colours['mapping']);
+            $this->set('interpolation', $colours['interpolation']);
+        }
+        $this->set('pickingMode', false);
+        $this->set('defaultTabName', 'mitre-attack');
+        $this->set('removeTrailling', 2);
+
+        $this->render('cluster_matrix');
+    }
 }
diff --git a/app/Controller/NewsController.php b/app/Controller/NewsController.php
old mode 100644
new mode 100755
index 7a91ed1a1..6a6ad0f7f
--- a/app/Controller/NewsController.php
+++ b/app/Controller/NewsController.php
@@ -48,10 +48,10 @@ class NewsController extends AppController
                 $this->request->data['News']['user_id'] = 0;
             }
             if ($this->News->save($this->request->data)) {
-                $this->Flash->success('News item added.');
+                $this->Flash->success(__('News item added.'));
                 $this->redirect(array('action' => 'index'));
             } else {
-                $this->Flash->error('The news item could not be added.');
+                $this->Flash->error(__('The news item could not be added.'));
             }
         }
     }
@@ -65,10 +65,10 @@ class NewsController extends AppController
         if ($this->request->is('post') || $this->request->is('put')) {
             $this->request->data['News']['id'] = $id;
             if ($this->News->save($this->request->data)) {
-                $this->Flash->success('News item updated.');
+                $this->Flash->success(__('News item updated.'));
                 $this->redirect(array('action' => 'index'));
             } else {
-                $this->Flash->error('Could not update news item.');
+                $this->Flash->error(__('Could not update news item.'));
             }
         } else {
             $this->request->data = $this->News->read(null, $id);
@@ -86,10 +86,10 @@ class NewsController extends AppController
             throw new NotFoundException('Invalid news item');
         }
         if ($this->News->delete()) {
-            $this->Flash->success('News item deleted.');
+            $this->Flash->success(__('News item deleted.'));
             $this->redirect(array('action' => 'index'));
         }
-        $this->Flash->error('News item could not be deleted.');
+        $this->Flash->error(__('News item could not be deleted.'));
         $this->redirect(array('action' => 'index'));
     }
 }
diff --git a/app/Controller/ObjectsController.php b/app/Controller/ObjectsController.php
index e7b6c6f4c..e07dad163 100644
--- a/app/Controller/ObjectsController.php
+++ b/app/Controller/ObjectsController.php
@@ -198,7 +198,9 @@ class ObjectsController extends AppController
                     $object['Attribute'][$k]['event_id'] = $eventId;
                     $this->MispObject->Event->Attribute->set($attribute);
                     if (!$this->MispObject->Event->Attribute->validates()) {
-                        $error = 'Could not save object as at least one attribute has failed validation (' . $attribute['object_relation'] . '). ' . json_encode($this->MispObject->Event->Attribute->validationErrors);
+                        if ($this->MispObject->Event->Attribute->validationErrors['value'][0] !== 'Composite type found but the value not in the composite (value1|value2) format.') {
+                            $error = 'Could not save object as at least one attribute has failed validation (' . $attribute['object_relation'] . '). ' . json_encode($this->MispObject->Event->Attribute->validationErrors);
+                        }
                     }
                 }
             }
diff --git a/app/Controller/OrganisationsController.php b/app/Controller/OrganisationsController.php
index 1c21ea2a3..fc125e62b 100644
--- a/app/Controller/OrganisationsController.php
+++ b/app/Controller/OrganisationsController.php
@@ -25,7 +25,7 @@ class OrganisationsController extends AppController
     public function index()
     {
         if (!$this->Auth->user('Role')['perm_sharing_group'] && Configure::read('Security.hide_organisation_index_from_users')) {
-            throw new MethodNotAllowedException('This feature is disabled on this instance for normal users.');
+            throw new MethodNotAllowedException(__('This feature is disabled on this instance for normal users.'));
         }
         $conditions = array();
         // We can either index all of the organisations existing on this instance (default)
@@ -130,14 +130,14 @@ class OrganisationsController extends AppController
                     ));
                     return $this->RestResponse->viewData($org, $this->response->type());
                 } else {
-                    $this->Flash->success('The organisation has been successfully added.');
+                    $this->Flash->success(__('The organisation has been successfully added.'));
                     $this->redirect(array('admin' => false, 'action' => 'index'));
                 }
             } else {
                 if ($this->_isRest()) {
                     return $this->RestResponse->saveFailResponse('Organisations', 'admin_add', false, $this->Organisation->validationErrors, $this->response->type());
                 } else {
-                    $this->Flash->error('The organisation could not be added.');
+                    $this->Flash->error(__('The organisation could not be added.'));
                 }
             }
         } else {
@@ -152,7 +152,7 @@ class OrganisationsController extends AppController
     {
         $this->Organisation->id = $id;
         if (!$this->Organisation->exists()) {
-            throw new NotFoundException('Invalid organisation');
+            throw new NotFoundException(__('Invalid organisation'));
         }
         if ($this->request->is('post') || $this->request->is('put')) {
             if ($this->_isRest()) {
@@ -191,7 +191,7 @@ class OrganisationsController extends AppController
                     ));
                     return $this->RestResponse->viewData($org, $this->response->type());
                 } else {
-                    $this->Flash->success('Organisation updated.');
+                    $this->Flash->success(__('Organisation updated.'));
                     $this->redirect(array('admin' => false, 'action' => 'view', $this->Organisation->id));
                 }
             } else {
@@ -206,7 +206,7 @@ class OrganisationsController extends AppController
                         ));
                         $this->set('duplicate_org', $duplicate_org['Organisation']['id']);
                     }
-                    $this->Flash->error('The organisation could not be updated.');
+                    $this->Flash->error(__('The organisation could not be updated.'));
                 }
             }
         } else {
@@ -227,11 +227,11 @@ class OrganisationsController extends AppController
     public function admin_delete($id)
     {
         if (!$this->request->is('post')) {
-            throw new MethodNotAllowedException('Action not allowed, post request expected.');
+            throw new MethodNotAllowedException(__('Action not allowed, post request expected.'));
         }
         $this->Organisation->id = $id;
         if (!$this->Organisation->exists()) {
-            throw new NotFoundException('Invalid organisation');
+            throw new NotFoundException(__('Invalid organisation'));
         }
 
         $org = $this->Organisation->find('first', array(
@@ -272,19 +272,19 @@ class OrganisationsController extends AppController
         if (Validation::uuid($id)) {
             $temp = $this->Organisation->find('first', array('recursive' => -1, 'fields' => array('Organisation.id'), 'conditions' => array('Organisation.uuid' => $id)));
             if (empty($temp)) {
-                throw new NotFoundException('Invalid organisation.');
+                throw new NotFoundException(__('Invalid organisation.'));
             }
             $id = $temp['Organisation']['id'];
         } elseif (!is_numeric($id)) {
             $temp = $this->Organisation->find('first', array('recursive' => -1, 'fields' => array('Organisation.id'), 'conditions' => array('Organisation.name' => urldecode($id))));
             if (empty($temp)) {
-                throw new NotFoundException('Invalid organisation.');
+                throw new NotFoundException(__('Invalid organisation.'));
             }
             $id = $temp['Organisation']['id'];
         }
         $this->Organisation->id = $id;
         if (!$this->Organisation->exists()) {
-            throw new NotFoundException('Invalid organisation');
+            throw new NotFoundException(__('Invalid organisation'));
         }
         $fullAccess = false;
         $fields = array('id', 'name', 'date_created', 'date_modified', 'type', 'nationality', 'sector', 'contacts', 'description', 'local', 'uuid', 'restricted_to_domain');
@@ -311,7 +311,7 @@ class OrganisationsController extends AppController
                     'conditions' => array('ShadowAttribute.org_id' => $org['Organisation']['id'])
                 ));
                 if (empty($proposal)) {
-                    throw new NotFoundException('Invalid organisation');
+                    throw new NotFoundException(__('Invalid organisation'));
                 }
             }
         }
@@ -344,12 +344,12 @@ class OrganisationsController extends AppController
     {
         $this->Organisation->id = $id;
         if (!$this->Organisation->exists()) {
-            throw new NotFoundException('Invalid organisation');
+            throw new NotFoundException(__('Invalid organisation'));
         }
         $org = $this->Organisation->find('first', array('conditions' => array('id' => $id), 'fields' => array('landingpage', 'name')));
         $landingpage = $org['Organisation']['landingpage'];
         if (empty($landingpage)) {
-            $landingpage = "No landing page has been created for this organisation.";
+            $landingpage = __('No landing page has been created for this organisation.');
         }
         $this->set('landingPage', $landingpage);
         $this->set('org', $org['Organisation']['name']);
@@ -398,7 +398,7 @@ class OrganisationsController extends AppController
     public function getUUIDs()
     {
         if (!$this->Auth->user('Role')['perm_sync']) {
-            throw new MethodNotAllowedException('This action is restricted to sync users');
+            throw new MethodNotAllowedException(__('This action is restricted to sync users'));
         }
         $temp = $this->Organisation->find('all', array(
                 'recursive' => -1,
@@ -415,15 +415,15 @@ class OrganisationsController extends AppController
     public function admin_merge($id, $target_id = false)
     {
         if (!$this->_isSiteAdmin()) {
-            throw new MethodNotAllowedException('You are not authorised to do that.');
+            throw new MethodNotAllowedException(__('You are not authorised to do that.'));
         }
         if ($this->request->is('Post')) {
             $result = $this->Organisation->orgMerge($id, $this->request->data, $this->Auth->user());
             if ($result) {
-                $this->Flash->success('The organisation has been successfully merged.');
+                $this->Flash->success(__('The organisation has been successfully merged.'));
                 $this->redirect(array('admin' => false, 'action' => 'view', $result));
             } else {
-                $this->Flash->error('There was an error while merging the organisations. To find out more about what went wrong, refer to the audit logs. If you would like to revert the changes, you can find a .sql file ');
+                $this->Flash->error(__('There was an error while merging the organisations. To find out more about what went wrong, refer to the audit logs. If you would like to revert the changes, you can find a .sql file'));
             }
             $this->redirect(array('admin' => false, 'action' => 'index'));
         } else {
diff --git a/app/Controller/RestClientHistoryController.php b/app/Controller/RestClientHistoryController.php
new file mode 100644
index 000000000..5858f90f3
--- /dev/null
+++ b/app/Controller/RestClientHistoryController.php
@@ -0,0 +1,68 @@
+<?php
+
+App::uses('AppController', 'Controller');
+
+class RestClientHistoryController extends AppController
+{
+    public $components = array(
+        'Security',
+        'AdminCrud',
+        'RequestHandler'
+    );
+
+    public $paginate = array(
+            'limit' => 10,
+            'recursive' => -1
+    );
+
+    public function beforeFilter()
+    {
+        parent::beforeFilter();
+        $this->Security->unlockedActions = array('delete');
+        // We don't care about CSRF protection for deleting these entries.
+    }
+
+    public function index($bookmarked = false)
+    {
+        $params = array(
+            'recursive' => -1,
+            'conditions' => array(
+                'RestClientHistory.user_id' => $this->Auth->user('id')
+            ),
+            'order' => array(
+                'RestClientHistory.timestamp' => 'DESC'
+            ),
+        );
+        if ($bookmarked) {
+            $params['conditions']['RestClientHistory.bookmark'] = $bookmarked ? 1 : 0;
+        }
+        if ($this->_isRest()) {
+            $list = $this->RestClientHistory->find('all', $params);
+        } else {
+            $this->paginate = array_merge($this->paginate, $params);
+            $list = $this->paginate();
+        }
+        if ($this->_isRest()) {
+            return $this->RestResponse->viewData($list, $this->response->type());
+        } else {
+            $this->set('bookmarked', $bookmarked);
+            $this->set('list', $list);
+            $this->layout = false;
+            $this->autoRender = false;
+            $this->render('index');
+        }
+    }
+
+    public function delete($id)
+    {
+        $entry = $this->RestClientHistory->find('first', array(
+            'recursive' => -1,
+            'conditions' => array('RestClientHistory.id' => $id, 'RestClientHistory.user_id' => $this->Auth->user('id')),
+        ));
+        if (empty($entry)) {
+            throw new NotFoundException(__('Invalid entry.'));
+        }
+        $this->RestClientHistory->delete($id);
+        return $this->RestResponse->saveSuccessResponse('RestClientHistory', 'delete', $id, false, __('Entry removed.'));
+    }
+}
diff --git a/app/Controller/RolesController.php b/app/Controller/RolesController.php
index 7efc083b4..7beed3f1b 100644
--- a/app/Controller/RolesController.php
+++ b/app/Controller/RolesController.php
@@ -56,7 +56,7 @@ class RolesController extends AppController
                     ));
                     return $this->RestResponse->viewData($role, $this->response->type());
                 } else {
-                    $this->Flash->success('The Role has been saved');
+                    $this->Flash->success(__('The Role has been saved'));
                     $this->redirect(array('action' => 'index'));
                 }
             } else {
@@ -82,7 +82,7 @@ class RolesController extends AppController
         }
         $this->Role->id = $id;
         if (!$this->Role->exists() && !$this->request->is('get')) {
-            throw new NotFoundException('Invalid Role');
+            throw new NotFoundException(__('Invalid Role'));
         }
         if ($this->request->is('post') || $this->request->is('put')) {
             if (!isset($this->request->data['Role'])) {
@@ -97,7 +97,7 @@ class RolesController extends AppController
                     ));
                     return $this->RestResponse->viewData($role, $this->response->type());
                 } else {
-                    $this->Flash->success('The Role has been saved');
+                    $this->Flash->success(__('The Role has been saved'));
                     $this->redirect(array('action' => 'index'));
                 }
             } else {
@@ -148,7 +148,7 @@ class RolesController extends AppController
         }
         $this->Role->id = $id;
         if (!$this->Role->exists()) {
-            throw new NotFoundException('Invalid Role');
+            throw new NotFoundException(__('Invalid Role'));
         }
         if ($this->Role->delete()) {
             if ($this->_isRest()) {
@@ -161,7 +161,7 @@ class RolesController extends AppController
         if ($this->_isRest()) {
             return $this->RestResponse->saveFailResponse('Roles', 'admin_delete', $id, $this->Role->validationErrors, $this->response->type());
         } else {
-            $this->Flash->error('Role could not be deleted');
+            $this->Flash->error(__('Role could not be deleted'));
             $this->redirect(array('action' => 'index'));
         }
     }
@@ -197,7 +197,7 @@ class RolesController extends AppController
         $this->loadModel('AdminSetting');
         $result = $this->AdminSetting->changeSetting('default_role', $role_id);
         if ($result === true) {
-            $message = $role_id ? 'Default role set.' : 'Default role unset.';
+            $message = $role_id ? __('Default role set.') : __('Default role unset.');
             if ($this->_isRest()) {
                 return $this->RestResponse->saveSuccessResponse('Roles', 'admin_set_default', $role_id, $this->response->type(), $message);
             } else {
diff --git a/app/Controller/ServersController.php b/app/Controller/ServersController.php
index 1df1c9ab0..a57b62040 100644
--- a/app/Controller/ServersController.php
+++ b/app/Controller/ServersController.php
@@ -215,7 +215,6 @@ class ServersController extends AppController
                     throw new MethodNotAllowedException('No remote org ID set. Please pass it as remote_org_id');
                 }
             }
-
             $fail = false;
             if (empty(Configure::read('MISP.host_org_id'))) {
                 $this->request->data['Server']['internal'] = 0;
@@ -240,7 +239,6 @@ class ServersController extends AppController
                     $this->Flash->error($error_msg);
                 }
             }
-
             if (!$fail) {
                 if ($this->_isRest()) {
                     $defaults = array(
@@ -334,7 +332,7 @@ class ServersController extends AppController
                         }
                     } else {
                         if ($this->_isRest()) {
-                            return $this->RestResponse->saveFailResponse('Servers', 'add', false, $this->Server->validationError, $this->response->type());
+                            return $this->RestResponse->saveFailResponse('Servers', 'add', false, $this->Server->validationErrors, $this->response->type());
                         } else {
                             $this->Flash->error(__('The server could not be saved. Please, try again.'));
                         }
@@ -1142,10 +1140,16 @@ class ServersController extends AppController
         if (!$this->_isSiteAdmin()) {
             throw new MethodNotAllowedException();
         }
-        if (!isset($setting_name) || !isset($id)) {
+        if (!isset($setting_name)) {
             throw new MethodNotAllowedException();
         }
-        $this->set('id', $id);
+        if (!$this->_isRest()) {
+            if (!isset($id)) {
+                throw new MethodNotAllowedException();
+            }
+            $this->set('id', $id);
+        }
+
         $setting = $this->Server->getSettingData($setting_name);
         if ($this->request->is('get')) {
             if ($setting != null) {
@@ -1568,6 +1572,23 @@ class ServersController extends AppController
     {
         App::uses('SyncTool', 'Tools');
         $params = array();
+        $this->loadModel('RestClientHistory');
+        $this->RestClientHistory->create();
+        $date = new DateTime();
+        $rest_history_item = array(
+            'org_id' => $this->Auth->user('org_id'),
+            'user_id' => $this->Auth->user('id'),
+            'headers' => $request['header'],
+            'body' => empty($request['body']) ? '' : $request['body'],
+            'url' => $request['url'],
+            'http_method' => $request['method'],
+            'use_full_path' => $request['use_full_path'],
+            'show_result' => $request['show_result'],
+            'skip_ssl' => $request['skip_ssl_validation'],
+            'bookmark' => $request['bookmark'],
+            'bookmark_name' => $request['name'],
+            'timestamp' => $date->getTimestamp()
+        );
         if (!empty($request['url'])) {
             if (empty($request['use_full_path'])) {
                 $path = preg_replace('#^(://|[^/?])+#', '', $request['url']);
@@ -1581,6 +1602,8 @@ class ServersController extends AppController
         }
         if (!empty($request['skip_ssl_validation'])) {
             $params['ssl_verify_peer'] = false;
+            $params['ssl_verify_host'] = false;
+            $params['ssl_allow_self_signed'] = true;
         }
         $params['timeout'] = 300;
         App::uses('HttpSocket', 'Network/Http');
@@ -1638,6 +1661,9 @@ class ServersController extends AppController
                 $view_data['data'] = 'Something went wrong.';
             }
         }
+        $rest_history_item['outcome'] = $response->code;
+        $this->RestClientHistory->save($rest_history_item);
+        $this->RestClientHistory->cleanup($this->Auth->user('id'));
         return $view_data;
     }
 
@@ -1678,7 +1704,7 @@ misp.direct_call(relative_path, body)
             $request['header']['Authorization'],
             $verifyCert,
             $relative,
-            (empty($request['body']) ? 'Null' : '\'' . $request['body'] . '\'')
+            (empty($request['body']) ? 'Null' : $request['body'])
         );
         return $python_script;
     }
diff --git a/app/Controller/ShadowAttributesController.php b/app/Controller/ShadowAttributesController.php
index a293f1b0e..97f80cea9 100644
--- a/app/Controller/ShadowAttributesController.php
+++ b/app/Controller/ShadowAttributesController.php
@@ -68,6 +68,7 @@ class ShadowAttributesController extends AppController
         if (empty($shadow)) {
             return array('false' => true, 'errors' => 'Proposal not found or you are not authorised to accept it.');
         }
+        $this->ShadowAttribute->publishKafkaNotification('shadow_attribute', $shadow, 'accept');
         $shadow = $shadow['ShadowAttribute'];
         if ($this->ShadowAttribute->typeIsAttachment($shadow['type'])) {
             $encodedFile = $this->ShadowAttribute->base64EncodeAttachment($shadow);
@@ -229,6 +230,7 @@ class ShadowAttributesController extends AppController
         if (empty($sa)) {
             return false;
         }
+        $this->ShadowAttribute->publishKafkaNotification('shadow_attribute', $sa, 'discard');
         $eventId = $sa['ShadowAttribute']['event_id'];
         $this->loadModel('Event');
         $this->Event->Behaviors->detach('SysLogLogable.SysLogLogable');
diff --git a/app/Controller/TagCollectionsController.php b/app/Controller/TagCollectionsController.php
index 77eb8ffc2..ea15fc20b 100644
--- a/app/Controller/TagCollectionsController.php
+++ b/app/Controller/TagCollectionsController.php
@@ -227,9 +227,6 @@ class TagCollectionsController extends AppController
 
     public function addTag($id = false, $tag_id = false)
     {
-        if (!$this->request->is('post')) {
-            return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'You don\'t have permission to do that.')), 'status'=>200, 'type' => 'json'));
-        }
         $rearrangeRules = array(
                 'request' => false,
                 'TagCollection' => false,
@@ -242,102 +239,110 @@ class TagCollectionsController extends AppController
         if ($id === false) {
             $id = $this->request->data['tag_collection'];
         }
-        if ($tag_id === false) {
-            $tag_id = $this->request->data['tag'];
-        }
-        $conditions = array();
-        if (!$this->_isSiteAdmin()) {
-            $conditions['Tag.org_id'] = array('0', $this->Auth->user('org_id'));
-            $conditions['Tag.user_id'] = array('0', $this->Auth->user('id'));
-        }
-        if (!is_numeric($tag_id)) {
-            $tag_ids = json_decode($tag_id);
-            $tag_lookups = array();
-            foreach ($tag_ids as $temp) {
-                if (is_numeric($temp)) {
-                    $tag_lookups['OR']['Tag.id'][] = $temp;
-                } else {
-                    $tag_lookups['OR']['LOWER(Tag.name) LIKE'][] = strtolower(trim($tag_id));
-                }
-            }
-            if ($tag_ids !== null && is_array($tag_ids)) { // can decode json
-                $tag_ids = $this->TagCollection->TagCollectionTag->Tag->find('list', array(
-                    'conditions' => array(
-                        'AND' => array(
-                            $conditions,
-                            $tag_lookups
-                        )
-                    ),
-                    'fields' => array('Tag.id', 'Tag.id')
-                ));
-                $tag_id_list = array_values($tag_ids);
-                if (empty($tag_id_list)) {
-                    return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag(s).')), 'status'=>200, 'type' => 'json'));
-                }
-            } else {
-                $tag = $this->TagCollection->TagCollectionTag->Tag->find('first', array('recursive' => -1, 'conditions' => $conditions));
-                if (empty($tag)) {
-                    return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag.')), 'status'=>200, 'type' => 'json'));
-                }
-                $tag_id = $tag['Tag']['id'];
-            }
-        }
-        $tagCollection = $this->TagCollection->find('first', array(
-            'recursive' => -1,
-            'conditions' => array('TagCollection.id' => $id)
-        ));
-        if (empty($tagCollection)) {
-            return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid tag collection.')), 'status'=>200, 'type' => 'json'));
-        }
-        if (!$this->_isSiteAdmin()) {
-            if (!$this->userRole['perm_tagger'] || ($this->Auth->user('org_id') !== $tagCollection['TagCollection']['org_id'])) {
-                return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'You don\'t have permission to do that.')), 'status'=>200, 'type' => 'json'));
-            }
-        }
-        $this->autoRender = false;
-        $error = false;
-        $success = false;
-        if (empty($tag_id_list)) {
-            $tag_id_list = array($tag_id);
-        }
-
-        foreach ($tag_id_list as $tag_id) {
-            $this->TagCollection->TagCollectionTag->Tag->id = $tag_id;
-            if (!$this->TagCollection->TagCollectionTag->Tag->exists()) {
-                $error = __('Invalid Tag.');
-                continue;
-            }
-            $tag = $this->TagCollection->TagCollectionTag->Tag->find('first', array(
-                'conditions' => array('Tag.id' => $tag_id),
-                'recursive' => -1,
-                'fields' => array('Tag.name')
-            ));
-            $found = $this->TagCollection->TagCollectionTag->find('first', array(
-                'conditions' => array(
-                    'tag_collection_id' => $id,
-                    'tag_id' => $tag_id
-                ),
-                'recursive' => -1,
-            ));
-            if (!empty($found)) {
-                $error = __('Tag is already attached to this event.');
-                continue;
-            }
-            $this->TagCollection->TagCollectionTag->create();
-            if ($this->TagCollection->TagCollectionTag->save(array('tag_collection_id' => $id, 'tag_id' => $tag_id))) {
-                $log = ClassRegistry::init('Log');
-                $log->createLogEntry($this->Auth->user(), 'tag', 'TagCollection', $id, 'Attached tag (' . $tag_id . ') "' . $tag['Tag']['name'] . '" to collection (' . $id . ')', 'Event (' . $id . ') tagged as Tag (' . $tag_id . ')');
-                $success = __('Tag(s) added.');
-            } else {
-                $fail = __('Tag(s) could not be added.');
-            }
-        }
-        if ($success) {
-            return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => $success)), 'status'=>200, 'type' => 'json'));
-        } elseif (empty($fail)) {
-            return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => __('All tags are already present, nothing to add.'), 'check_publish' => true)), 'status'=>200, 'type' => 'json'));
+        if (!$this->request->is('post')) {
+            $this->set('object_id', $id);
+            $this->set('scope', 'TagCollection');
+            $this->layout = false;
+            $this->autoRender = false;
+            $this->render('/Events/add_tag');
         } else {
-            return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => $fail)), 'status'=>200, 'type' => 'json'));
+            if ($tag_id === false) {
+                $tag_id = $this->request->data['tag'];
+            }
+            $conditions = array();
+            if (!$this->_isSiteAdmin()) {
+                $conditions['Tag.org_id'] = array('0', $this->Auth->user('org_id'));
+                $conditions['Tag.user_id'] = array('0', $this->Auth->user('id'));
+            }
+            if (!is_numeric($tag_id)) {
+                $tag_ids = json_decode($tag_id);
+                $tag_lookups = array();
+                foreach ($tag_ids as $temp) {
+                    if (is_numeric($temp)) {
+                        $tag_lookups['OR']['Tag.id'][] = $temp;
+                    } else {
+                        $tag_lookups['OR']['LOWER(Tag.name) LIKE'][] = strtolower(trim($tag_id));
+                    }
+                }
+                if ($tag_ids !== null && is_array($tag_ids)) { // can decode json
+                    $tag_ids = $this->TagCollection->TagCollectionTag->Tag->find('list', array(
+                        'conditions' => array(
+                            'AND' => array(
+                                $conditions,
+                                $tag_lookups
+                            )
+                        ),
+                        'fields' => array('Tag.id', 'Tag.id')
+                    ));
+                    $tag_id_list = array_values($tag_ids);
+                    if (empty($tag_id_list)) {
+                        return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag(s).')), 'status'=>200, 'type' => 'json'));
+                    }
+                } else {
+                    $tag = $this->TagCollection->TagCollectionTag->Tag->find('first', array('recursive' => -1, 'conditions' => $conditions));
+                    if (empty($tag)) {
+                        return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid Tag.')), 'status'=>200, 'type' => 'json'));
+                    }
+                    $tag_id = $tag['Tag']['id'];
+                }
+            }
+            $tagCollection = $this->TagCollection->find('first', array(
+                'recursive' => -1,
+                'conditions' => array('TagCollection.id' => $id)
+            ));
+            if (empty($tagCollection)) {
+                return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'Invalid tag collection.')), 'status'=>200, 'type' => 'json'));
+            }
+            if (!$this->_isSiteAdmin()) {
+                if (!$this->userRole['perm_tagger'] || ($this->Auth->user('org_id') !== $tagCollection['TagCollection']['org_id'])) {
+                    return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => 'You don\'t have permission to do that.')), 'status'=>200, 'type' => 'json'));
+                }
+            }
+            $this->autoRender = false;
+            $error = false;
+            $success = false;
+            if (empty($tag_id_list)) {
+                $tag_id_list = array($tag_id);
+            }
+
+            foreach ($tag_id_list as $tag_id) {
+                $this->TagCollection->TagCollectionTag->Tag->id = $tag_id;
+                if (!$this->TagCollection->TagCollectionTag->Tag->exists()) {
+                    $error = __('Invalid Tag.');
+                    continue;
+                }
+                $tag = $this->TagCollection->TagCollectionTag->Tag->find('first', array(
+                    'conditions' => array('Tag.id' => $tag_id),
+                    'recursive' => -1,
+                    'fields' => array('Tag.name')
+                ));
+                $found = $this->TagCollection->TagCollectionTag->find('first', array(
+                    'conditions' => array(
+                        'tag_collection_id' => $id,
+                        'tag_id' => $tag_id
+                    ),
+                    'recursive' => -1,
+                ));
+                if (!empty($found)) {
+                    $error = __('Tag is already attached to this event.');
+                    continue;
+                }
+                $this->TagCollection->TagCollectionTag->create();
+                if ($this->TagCollection->TagCollectionTag->save(array('tag_collection_id' => $id, 'tag_id' => $tag_id))) {
+                    $log = ClassRegistry::init('Log');
+                    $log->createLogEntry($this->Auth->user(), 'tag', 'TagCollection', $id, 'Attached tag (' . $tag_id . ') "' . $tag['Tag']['name'] . '" to collection (' . $id . ')', 'Event (' . $id . ') tagged as Tag (' . $tag_id . ')');
+                    $success = __('Tag(s) added.');
+                } else {
+                    $fail = __('Tag(s) could not be added.');
+                }
+            }
+            if ($success) {
+                return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => $success)), 'status'=>200, 'type' => 'json'));
+            } elseif (empty($fail)) {
+                return new CakeResponse(array('body'=> json_encode(array('saved' => true, 'success' => __('All tags are already present, nothing to add.'), 'check_publish' => true)), 'status'=>200, 'type' => 'json'));
+            } else {
+                return new CakeResponse(array('body'=> json_encode(array('saved' => false, 'errors' => $fail)), 'status'=>200, 'type' => 'json'));
+            }
         }
     }
 
diff --git a/app/Controller/TagsController.php b/app/Controller/TagsController.php
index 4309a7276..215a6c9e0 100644
--- a/app/Controller/TagsController.php
+++ b/app/Controller/TagsController.php
@@ -476,6 +476,7 @@ class TagsController extends AppController
                 'fields' => array('Event.id', 'Event.orgc_id', 'Event.org_id', 'Event.user_id'),
                 'conditions' => array('Event.id' => $id)
         ));
+        $this->set('required_taxonomies', $this->EventTag->Event->getRequiredTaxonomies());
         $this->set('event', $event);
         $this->layout = 'ajax';
         $this->render('/Events/ajax/ajaxTags');
diff --git a/app/Controller/TaxonomiesController.php b/app/Controller/TaxonomiesController.php
index ca0fa6c99..7e34bef84 100644
--- a/app/Controller/TaxonomiesController.php
+++ b/app/Controller/TaxonomiesController.php
@@ -54,10 +54,24 @@ class TaxonomiesController extends AppController
         $filter = isset($this->passedArgs['filter']) ? $this->passedArgs['filter'] : false;
         $taxonomy = $this->Taxonomy->getTaxonomy($id, array('full' => true, 'filter' => $filter));
         if (empty($taxonomy)) {
-            throw new NotFoundException('Taxonomy not found.');
+            throw new NotFoundException(__('Taxonomy not found.'));
         }
+        $this->loadModel('EventTag');
+        $this->loadModel('AttributeTag');
         foreach ($taxonomy['entries'] as $key => $value) {
-            $taxonomy['entries'][$key]['events'] = empty($value['existing_tag']) ? 0 : count($value['existing_tag']['EventTag']);
+            $count = 0;
+            if (!empty($value['existing_tag'])) {
+                foreach ($value['existing_tag'] as $et) {
+                    $count = $this->EventTag->find('count', array(
+                        'conditions' => array('EventTag.tag_id' => $et['id'])
+                    ));
+                    $count_a = $this->AttributeTag->find('count', array(
+                        'conditions' => array('AttributeTag.tag_id' => $et['id'])
+                    ));
+                }
+            }
+            $taxonomy['entries'][$key]['events'] = $count;
+            $taxonomy['entries'][$key]['attributes'] = $count_a;
         }
         $this->set('filter', $filter);
         $customPagination = new CustomPaginationTool();
@@ -82,7 +96,7 @@ class TaxonomiesController extends AppController
     public function enable($id)
     {
         if (!$this->_isSiteAdmin() || !$this->request->is('Post')) {
-            throw new MethodNotAllowedException('You don\'t have permission to do that.');
+            throw new MethodNotAllowedException(__('You don\'t have permission to do that.'));
         }
         $taxonomy = $this->Taxonomy->find('first', array(
             'recursive' => -1,
@@ -105,7 +119,7 @@ class TaxonomiesController extends AppController
         if ($this->_isRest()) {
             return $this->RestResponse->saveSuccessResponse('Taxonomy', 'enable', $id, $this->response->type());
         } else {
-            $this->Flash->success('Taxonomy enabled.');
+            $this->Flash->success(__('Taxonomy enabled.'));
             $this->redirect($this->referer());
         }
     }
@@ -113,7 +127,7 @@ class TaxonomiesController extends AppController
     public function disable($id)
     {
         if (!$this->_isSiteAdmin() || !$this->request->is('Post')) {
-            throw new MethodNotAllowedException('You don\'t have permission to do that.');
+            throw new MethodNotAllowedException(__('You don\'t have permission to do that.'));
         }
         $taxonomy = $this->Taxonomy->find('first', array(
                 'recursive' => -1,
@@ -137,7 +151,7 @@ class TaxonomiesController extends AppController
         if ($this->_isRest()) {
             return $this->RestResponse->saveSuccessResponse('Taxonomy', 'disable', $id, $this->response->type());
         } else {
-            $this->Flash->success('Taxonomy disabled.');
+            $this->Flash->success(__('Taxonomy disabled.'));
             $this->redirect($this->referer());
         }
     }
@@ -145,7 +159,7 @@ class TaxonomiesController extends AppController
     public function update()
     {
         if (!$this->_isSiteAdmin()) {
-            throw new MethodNotAllowedException('You don\'t have permission to do that.');
+            throw new MethodNotAllowedException(__('You don\'t have permission to do that.'));
         }
         $result = $this->Taxonomy->update();
         $this->Log = ClassRegistry::init('Log');
@@ -205,15 +219,15 @@ class TaxonomiesController extends AppController
         $message = '';
         if ($successes == 0 && $fails == 0) {
             $flashType = 'info';
-            $message = 'All taxonomy libraries are up to date already.';
+            $message = __('All taxonomy libraries are up to date already.');
         } elseif ($successes == 0) {
             $flashType = 'error';
-            $message = 'Could not update any of the taxonomy libraries';
+            $message = __('Could not update any of the taxonomy libraries');
         } else {
             $flashType = 'success';
-            $message = 'Successfully updated ' . $successes . ' taxonomy libraries.';
+            $message = __('Successfully updated ') . $successes . __(' taxonomy libraries.');
             if ($fails != 0) {
-                $message .= ' However, could not update ' . $fails . ' taxonomy libraries.';
+                $message .= __(' However, could not update ') . $fails . __(' taxonomy libraries.');
             }
         }
         if ($this->_isRest()) {
@@ -227,7 +241,7 @@ class TaxonomiesController extends AppController
     public function addTag($taxonomy_id = false)
     {
         if ((!$this->_isSiteAdmin() && !$this->userRole['perm_tagger']) || !$this->request->is('post')) {
-            throw new NotFoundException('You don\'t have permission to do that.');
+            throw new NotFoundException(__('You don\'t have permission to do that.'));
         }
         if ($taxonomy_id) {
             $result = $this->Taxonomy->addTags($taxonomy_id);
@@ -247,9 +261,69 @@ class TaxonomiesController extends AppController
             $result = $this->Taxonomy->addTags($this->request->data['Tag']['taxonomy_id'], $this->request->data['Tag']['nameList']);
         }
         if ($result) {
-            $this->Flash->success('The tag(s) has been saved.');
+            $this->Flash->success(__('The tag(s) has been saved.'));
         } else {
-            $this->Flash->error('The tag(s) could not be saved. Please, try again.');
+            $this->Flash->error(__('The tag(s) could not be saved. Please, try again.'));
+        }
+        $this->redirect($this->referer());
+    }
+
+    public function hideTag($taxonomy_id = false)
+    {
+        if ((!$this->_isSiteAdmin() && !$this->userRole['perm_tagger']) || !$this->request->is('post')) {
+            throw new NotFoundException(__('You don\'t have permission to do that.'));
+        }
+        if ($taxonomy_id) {
+            $result = $this->Taxonomy->hideTags($taxonomy_id);
+        } else {
+            if (isset($this->request->data['Taxonomy'])) {
+                $this->request->data['Tag'] = $this->request->data['Taxonomy'];
+                unset($this->request->data['Taxonomy']);
+            }
+            if (isset($this->request->data['Tag']['request'])) {
+                $this->request->data['Tag'] = $this->request->data['Tag']['request'];
+            }
+            if (!isset($this->request->data['Tag']['nameList'])) {
+                $this->request->data['Tag']['nameList'] = array($this->request->data['Tag']['name']);
+            } else {
+                $this->request->data['Tag']['nameList'] = json_decode($this->request->data['Tag']['nameList'], true);
+            }
+            $result = $this->Taxonomy->hideTags($this->request->data['Tag']['taxonomy_id'], $this->request->data['Tag']['nameList']);
+        }
+        if ($result) {
+            $this->Flash->success(__('The tag(s) has been saved.'));
+        } else {
+            $this->Flash->error(__('The tag(s) could not be saved. Please, try again.'));
+        }
+        $this->redirect($this->referer());
+    }
+
+    public function unhideTag($taxonomy_id = false)
+    {
+        if ((!$this->_isSiteAdmin() && !$this->userRole['perm_tagger']) || !$this->request->is('post')) {
+            throw new NotFoundException(__('You don\'t have permission to do that.'));
+        }
+        if ($taxonomy_id) {
+            $result = $this->Taxonomy->unhideTags($taxonomy_id);
+        } else {
+            if (isset($this->request->data['Taxonomy'])) {
+                $this->request->data['Tag'] = $this->request->data['Taxonomy'];
+                unset($this->request->data['Taxonomy']);
+            }
+            if (isset($this->request->data['Tag']['request'])) {
+                $this->request->data['Tag'] = $this->request->data['Tag']['request'];
+            }
+            if (!isset($this->request->data['Tag']['nameList'])) {
+                $this->request->data['Tag']['nameList'] = array($this->request->data['Tag']['name']);
+            } else {
+                $this->request->data['Tag']['nameList'] = json_decode($this->request->data['Tag']['nameList'], true);
+            }
+            $result = $this->Taxonomy->unhideTags($this->request->data['Tag']['taxonomy_id'], $this->request->data['Tag']['nameList']);
+        }
+        if ($result) {
+            $this->Flash->success(__('The tag(s) has been saved.'));
+        } else {
+            $this->Flash->error(__('The tag(s) could not be saved. Please, try again.'));
         }
         $this->redirect($this->referer());
     }
@@ -257,7 +331,7 @@ class TaxonomiesController extends AppController
     public function disableTag($taxonomy_id = false)
     {
         if ((!$this->_isSiteAdmin() && !$this->userRole['perm_tagger']) || !$this->request->is('post')) {
-            throw new NotFoundException('You don\'t have permission to do that.');
+            throw new NotFoundException(__('You don\'t have permission to do that.'));
         }
         if ($taxonomy_id) {
             $result = $this->Taxonomy->disableTags($taxonomy_id);
@@ -277,9 +351,9 @@ class TaxonomiesController extends AppController
             $result = $this->Taxonomy->disableTags($this->request->data['Tag']['taxonomy_id'], $this->request->data['Tag']['nameList']);
         }
         if ($result) {
-            $this->Flash->success('The tag(s) has been hidden.');
+            $this->Flash->success(__('The tag(s) has been hidden.'));
         } else {
-            $this->Flash->error('The tag(s) could not be hidden. Please, try again.');
+            $this->Flash->error(__('The tag(s) could not be hidden. Please, try again.'));
         }
         $this->redirect($this->referer());
     }
@@ -287,21 +361,39 @@ class TaxonomiesController extends AppController
     public function taxonomyMassConfirmation($id)
     {
         if (!$this->_isSiteAdmin() && !$this->userRole['perm_tagger']) {
-            throw new NotFoundException('You don\'t have permission to do that.');
+            throw new NotFoundException(__('You don\'t have permission to do that.'));
         }
         $this->set('id', $id);
         $this->render('ajax/taxonomy_mass_confirmation');
     }
 
+    public function taxonomyMassHide($id)
+    {
+        if (!$this->_isSiteAdmin() && !$this->userRole['perm_tagger']) {
+            throw new NotFoundException(__('You don\'t have permission to do that.'));
+        }
+        $this->set('id', $id);
+        $this->render('ajax/taxonomy_mass_hide');
+    }
+
+    public function taxonomyMassUnhide($id)
+    {
+        if (!$this->_isSiteAdmin() && !$this->userRole['perm_tagger']) {
+            throw new NotFoundException(__('You don\'t have permission to do that.'));
+        }
+        $this->set('id', $id);
+        $this->render('ajax/taxonomy_mass_unhide');
+    }
+
     public function delete($id)
     {
         if ($this->request->is('post')) {
             $result = $this->Taxonomy->delete($id, true);
             if ($result) {
-                $this->Flash->success('Taxonomy successfuly deleted.');
+                $this->Flash->success(__('Taxonomy successfuly deleted.'));
                 $this->redirect(array('controller' => 'taxonomies', 'action' => 'index'));
             } else {
-                $this->Flash->error('Taxonomy could not be deleted.');
+                $this->Flash->error(__('Taxonomy could not be deleted.'));
                 $this->redirect(array('controller' => 'taxonomies', 'action' => 'index'));
             }
         } else {
@@ -309,8 +401,34 @@ class TaxonomiesController extends AppController
                 $this->set('id', $id);
                 $this->render('ajax/taxonomy_delete_confirmation');
             } else {
-                throw new MethodNotAllowedException('This function can only be reached via AJAX.');
+                throw new MethodNotAllowedException(__('This function can only be reached via AJAX.'));
             }
         }
     }
+
+    public function toggleRequired($id)
+    {
+        $taxonomy = $this->Taxonomy->find('first', array(
+            'recursive' => -1,
+            'conditions' => array('Taxonomy.id' => $id)
+        ));
+        if (empty($taxonomy)) {
+            return $this->RestResponse->saveFailResponse('Taxonomy', 'toggleRequired', $id, 'Invalid Taxonomy', $this->response->type());
+        }
+        if ($this->request->is('post')) {
+            $taxonomy['Taxonomy']['required'] = $this->request->data['Taxonomy']['required'];
+            $result = $this->Taxonomy->save($taxonomy);
+            if ($result) {
+                return $this->RestResponse->saveSuccessResponse('Taxonomy', 'toggleRequired', $id, $this->response->type());
+            } else {
+                return $this->RestResponse->saveFailResponse('Taxonomy', 'toggleRequired', $id, $this->validationError, $this->response->type());
+            }
+        } else {
+            $this->set('required', !$taxonomy['Taxonomy']['required']);
+            $this->set('id', $id);
+            $this->autoRender = false;
+            $this->layout = 'ajax';
+            $this->render('ajax/toggle_required');
+        }
+    }
 }
diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index e0e1edbc7..d5b2f2a13 100644
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -173,37 +173,63 @@ class UsersController extends AppController
             'recursive' => -1
         ));
         if ($this->request->is('post') || $this->request->is('put')) {
+            if (!isset($this->request->data['User'])) {
+                $this->request->data = array('User' => $this->request->data);
+            }
             $abortPost = false;
             if (Configure::read('Security.require_password_confirmation')) {
                 if (!empty($this->request->data['User']['current_password'])) {
                     $hashed = $this->User->verifyPassword($this->Auth->user('id'), $this->request->data['User']['current_password']);
                     if (!$hashed) {
+                        $message = __('Invalid password. Please enter your current password to continue.');
+                        if ($this->_isRest()) {
+                            return $this->RestResponse->saveFailResponse('Users', 'change_pw', false, $message, $this->response->type());
+                        }
                         $abortPost = true;
-                        $this->Flash->error('Invalid password. Please enter your current password to continue.');
+                        $this->Flash->error($message);
                     }
                     unset($this->request->data['User']['current_password']);
-                } else {
+                } else if (!$this->_isRest()) {
+                    $message = __('Please enter your current password to continue.');
+                    if ($this->_isRest()) {
+                        return $this->RestResponse->saveFailResponse('Users', 'change_pw', false, $message, $this->response->type());
+                    }
                     $abortPost = true;
-                    $this->Flash->info('Please enter your current password to continue.');
+                    $this->Flash->info($message);
                 }
             }
             if (!$abortPost) {
                 // What fields should be saved (allowed to be saved)
                 $user['User']['change_pw'] = 0;
                 $user['User']['password'] = $this->request->data['User']['password'];
-                $user['User']['confirm_password'] = $this->request->data['User']['confirm_password'];
+                if ($this->_isRest()) {
+                    $user['User']['confirm_password'] = $this->request->data['User']['password'];
+                } else {
+                    $user['User']['confirm_password'] = $this->request->data['User']['confirm_password'];
+                }
                 $temp = $user['User']['password'];
                 // Save the data
                 if ($this->User->save($user)) {
-                    $this->Flash->success(__('Password Changed.'));
-                    $this->_refreshAuth();
+                    $message = __('Password Changed.');
                     $this->__extralog("change_pw");
+                    if ($this->_isRest()) {
+                        return $this->RestResponse->saveSuccessResponse('User', 'change_pw', false, $this->response->type(), $message);
+                    }
+                    $this->Flash->success($message);
+                    $this->_refreshAuth();
                     $this->redirect(array('action' => 'view', $id));
                 } else {
-                    $this->Flash->error(__('The password could not be updated. Make sure you meet the minimum password length / complexity requirements.'));
+                    $message = __('The password could not be updated. Make sure you meet the minimum password length / complexity requirements.');
+                    if ($this->_isRest()) {
+                        return $this->RestResponse->saveFailResponse('Users', 'change_pw', false, $message, $this->response->type());
+                    }
+                    $this->Flash->error($message);
                 }
             }
         }
+        if ($this->_isRest()) {
+            return $this->RestResponse->describe('Users', 'change_pw', false, $this->response->type());
+        }
         $this->loadModel('Server');
         $this->set('complexity', !empty(Configure::read('Security.password_policy_complexity')) ? Configure::read('Security.password_policy_complexity') : $this->Server->serverSettings['Security']['password_policy_complexity']['value']);
         $this->set('length', !empty(Configure::read('Security.password_policy_length')) ? Configure::read('Security.password_policy_length') : $this->Server->serverSettings['Security']['password_policy_length']['value']);
@@ -1122,7 +1148,7 @@ class UsersController extends AppController
             $this->_refreshAuth();
             $this->redirect($this->referer());
         } else {
-            return $this->RestResponse->saveSuccessResponse('User', 'resetauthkey', $id, $this->response->type(), 'User\'s authkey has been reset.');
+            return $this->RestResponse->saveSuccessResponse('User', 'resetauthkey', $id, $this->response->type(), 'Authkey updated: ' . $newkey);
         }
     }
 
@@ -1256,7 +1282,7 @@ class UsersController extends AppController
         } elseif ($action == 'edit') {
             $description = "User (" . $this->User->id . "): " . $this->data['User']['email'];
         } elseif ($action == 'change_pw') {
-            $description = "User (" . $this->User->id . "): " . $this->data['User']['email'];
+            $description = "User (" . $this->User->id . "): " . $this->Auth->user('email');
             $fieldsResult = "Password changed.";
         }
 
@@ -1527,7 +1553,7 @@ class UsersController extends AppController
     public function statistics($page = 'data')
     {
         $this->set('page', $page);
-        $pages = array('data' => 'Usage data', 'orgs' => 'Organisations', 'users' => 'User and Organisation statistics', 'tags' => 'Tags', 'attributehistogram' => 'Attribute histogram', 'sightings' => 'Sightings toplists', 'attackMatrix' => 'ATT&CK Matrix');
+        $pages = array('data' => 'Usage data', 'orgs' => 'Organisations', 'users' => 'User and Organisation statistics', 'tags' => 'Tags', 'attributehistogram' => 'Attribute histogram', 'sightings' => 'Sightings toplists', 'galaxyMatrix' => 'Galaxy Matrix');
         if (!$this->_isSiteAdmin() && !empty(Configure::read('Security.hide_organisation_index_from_users'))) {
             unset($pages['orgs']);
         }
@@ -1552,8 +1578,8 @@ class UsersController extends AppController
             }
         } elseif ($page == 'sightings') {
             $result = $this->__statisticsSightings($this->params['named']);
-        } elseif ($page == 'attackMatrix') {
-            $result = $this->__statisticsAttackMatrix($this->params['named']);
+        } elseif ($page == 'galaxyMatrix') {
+            $result = $this->__statisticsGalaxyMatrix($this->params['named']);
         }
         if ($this->_isRest()) {
             return $result;
@@ -1855,12 +1881,16 @@ class UsersController extends AppController
         }
     }
 
-    private function __statisticsAttackMatrix($params = array())
+    private function __statisticsGalaxyMatrix($params = array())
     {
         $this->loadModel('Event');
         $this->loadModel('Galaxy');
-
-        $galaxy_id = $this->Galaxy->getMitreAttackGalaxyId();
+        $mitre_galaxy_id = $this->Galaxy->getMitreAttackGalaxyId();
+        if (isset($params['galaxy_id'])) {
+            $galaxy_id = $params['galaxy_id'];
+        } else {
+            $galaxy_id = $mitre_galaxy_id;
+        }
         $matrixData = $this->Galaxy->getMatrix($galaxy_id);
 
         $tabs = $matrixData['tabs'];
@@ -1877,7 +1907,7 @@ class UsersController extends AppController
         $maxScore = max($scoresDataAttr['maxScore'], $scoresDataEvent['maxScore']);
         $scores = $scoresData;
         // FIXME: temporary fix: add the score of deprecated mitre galaxies to the new one (for the stats)
-        if ($matrixData['galaxy']['id'] == $galaxy_id) {
+        if ($matrixData['galaxy']['id'] == $mitre_galaxy_id) {
             $mergedScore = array();
             foreach ($scoresData as $tag => $v) {
                 $predicateValue = explode(':', $tag, 2)[1];
@@ -1937,10 +1967,17 @@ class UsersController extends AppController
                 $this->set('interpolation', $colours['interpolation']);
             }
             $this->set('pickingMode', false);
-            $this->set('defaultTabName', "mitre-attack");
+            if ($matrixData['galaxy']['id'] == $mitre_galaxy_id) {
+                $this->set('defaultTabName', "mitre-attack");
+            }
             $this->set('removeTrailling', 2);
 
-            $this->render('statistics_attackmatrix');
+            $this->set('galaxyName', $matrixData['galaxy']['name']);
+            $this->set('galaxyId', $matrixData['galaxy']['id']);
+            $matrixGalaxies = $this->Galaxy->getAllowedMatrixGalaxies();
+            $this->set('matrixGalaxies', $matrixGalaxies);
+
+            $this->render('statistics_galaxymatrix');
         }
     }
 
diff --git a/app/Lib/Export/BroExport.php b/app/Lib/Export/BroExport.php
index ac8c18a0f..4c017e196 100644
--- a/app/Lib/Export/BroExport.php
+++ b/app/Lib/Export/BroExport.php
@@ -162,8 +162,8 @@ class BroExport
                 $orgName = $instanceString . ' (' . $item['Event']['uuid'] . ')' . ' - ' . $orgs[$item['Event']['orgc_id']];
             }
             $ruleFormatReference = Configure::read('MISP.baseurl') . '/events/view/' . $item['Event']['id'];
-            $ruleFormat = "%s\t%s\t" . $orgName . "\t" . $this->replaceIllegalChars($item['Event']['info']) . ". %s" . "\t" . $ruleFormatReference . "\t%s\t%s";
-            $rule = $this->__generateRule($item['Attribute'], $ruleFormat, $valueField, $whitelist);
+            $ruleFormat = "%s\t%s\t" . $orgName . "\t%s. %s\t" . $ruleFormatReference . "\t%s\t%s";
+            $rule = $this->__generateRule($item, $ruleFormat, $valueField, $whitelist);
             if (!empty($rule)) {
                 $intel[] = $rule;
             }
@@ -171,32 +171,33 @@ class BroExport
         return $intel;
     }
 
-    private function __generateRule($attribute, $ruleFormat, $valueField, $whitelist = array())
+    private function __generateRule($item, $ruleFormat, $valueField, $whitelist = array())
     {
-        if (isset($this->mapping[$attribute['type']])) {
-            if (empty($whitelist) || !$this->checkWhitelist($attribute['value'], $whitelist)) {
-                $brotype = $this->mapping[$attribute['type']]['brotype'];
-                if (isset($this->mapping[$attribute['type']]['alternate'])) {
-                    if (preg_match($this->mapping[$attribute['type']]['alternate'][0], $attribute['value'])) {
-                        $brotype = $this->mapping[$attribute['type']]['alternate'][1];
+        if (isset($this->mapping[$item['Attribute']['type']])) {
+            if (empty($whitelist) || !$this->checkWhitelist($item['Attribute']['value' . $valueField], $whitelist)) {
+                $brotype = $this->mapping[$item['Attribute']['type']]['brotype'];
+                if (isset($this->mapping[$item['Attribute']['type']]['alternate'])) {
+                    if (preg_match($this->mapping[$item['Attribute']['type']]['alternate'][0], $item['Attribute']['value' . $valueField])) {
+                        $brotype = $this->mapping[$item['Attribute']['type']]['alternate'][1];
                     }
                 }
-                if ($valueField == 2 && isset($this->mapping[$attribute['type']]['composite'])) {
-                    $brotype = $this->mapping[$attribute['type']]['composite'];
+                if ($valueField == 2 && isset($this->mapping[$item['Attribute']['type']]['composite'])) {
+                    $brotype = $this->mapping[$item['Attribute']['type']]['composite'];
                 }
-                $attribute['value'] = $this->replaceIllegalChars($attribute['value']);  // substitute chars not allowed in rule
-                if (isset($this->mapping[$attribute['type']]['replace'])) {
-                    $attribute['value'] = preg_replace(
-                        $this->mapping[$attribute['type']]['replace'][0],
-                        $this->mapping[$attribute['type']]['replace'][1],
-                        $attribute['value']
+                $item['Attribute']['value' . $valueField] = $this->replaceIllegalChars($item['Attribute']['value' . $valueField]);  // substitute chars not allowed in rule
+                if (isset($this->mapping[$item['Attribute']['type']]['replace'])) {
+                    $item['Attribute']['value' . $valueField] = preg_replace(
+                        $this->mapping[$item['Attribute']['type']]['replace'][0],
+                        $this->mapping[$item['Attribute']['type']]['replace'][1],
+                        $item['Attribute']['value' . $valueField]
                     );
                 }
                 return sprintf(
                     $ruleFormat,
-                                $this->replaceIllegalChars($attribute['value']),    // value - for composite values only the relevant element is taken
+                                $this->replaceIllegalChars($item['Attribute']['value' . $valueField]),    // value - for composite values only the relevant element is taken
                                 'Intel::' . $brotype,   // type
-                                $this->replaceIllegalChars($attribute['comment']),
+                                $this->replaceIllegalChars($item['Event']['info']),
+                                $this->replaceIllegalChars($item['Attribute']['comment']),
                                 'T',    // meta.do_notice
                                 '-'  // meta.if_in
                                 );
diff --git a/app/Lib/Export/RPZExport.php b/app/Lib/Export/RPZExport.php
index f1bc3b00d..321edd087 100644
--- a/app/Lib/Export/RPZExport.php
+++ b/app/Lib/Export/RPZExport.php
@@ -169,6 +169,7 @@ class RPZExport
     public function buildHeader($rpzSettings)
     {
         $rpzSettings['serial'] = str_replace('$date', date('Ymd'), $rpzSettings['serial']);
+        $rpzSettings['serial'] = str_replace('$time', time(), $rpzSettings['serial']);
         $header = '';
         $header .= '$TTL ' . $rpzSettings['ttl'] . ';' . PHP_EOL;
         $header .= '@               SOA ' . $rpzSettings['ns'] . ' ' . $rpzSettings['email'] . ' ('  . $rpzSettings['serial'] . ' ' . $rpzSettings['refresh'] . ' ' . $rpzSettings['retry'] . ' ' . $rpzSettings['expiry'] . ' ' . $rpzSettings['minimum_ttl'] . ')' . PHP_EOL;
diff --git a/app/Lib/Tools/ComplexTypeTool.php b/app/Lib/Tools/ComplexTypeTool.php
index 79d262e8c..8dfa9aded 100644
--- a/app/Lib/Tools/ComplexTypeTool.php
+++ b/app/Lib/Tools/ComplexTypeTool.php
@@ -352,7 +352,7 @@ class ComplexTypeTool
 	        // Phone numbers - for automatic recognition, needs to start with + or include dashes
 		if (!empty($input['raw'])) {
 	        if ($input['raw'][0] === '+' || strpos($input['raw'], '-')) {
-	            if (preg_match("#^(\+)?([0-9]{1,3}(\(0\))?)?[0-9\/\-]{5,}[0-9]$#i", $input['raw'])) {
+	            if (!preg_match('#^[0-9]{4}-[0-9]{2}-[0-9]{2}$#i', $input['raw']) && preg_match("#^(\+)?([0-9]{1,3}(\(0\))?)?[0-9\/\-]{5,}[0-9]$#i", $input['raw'])) {
 	                return array('types' => array('phone-number', 'prtn', 'whois-registrant-phone'), 'categories' => array('Other'), 'to_ids' => false, 'default_type' => 'phone-number', 'value' => $input['raw']);
 	            }
 	        }
diff --git a/app/Lib/Tools/DistributionGraphTool.php b/app/Lib/Tools/DistributionGraphTool.php
index 20483d040..6cc41ec18 100644
--- a/app/Lib/Tools/DistributionGraphTool.php
+++ b/app/Lib/Tools/DistributionGraphTool.php
@@ -16,8 +16,8 @@
 
             // construct distribution info
             $this->__json['distributionInfo'] = array();
-            $sgs = $this->__eventModel->SharingGroup->fetchAllAuthorised($this->__user, 'name', 1);
-            $this->__json['allSharingGroup'] = h(array_values($sgs));
+            $sgs = $this->__eventModel->SharingGroup->fetchAllAuthorised($this->__user, 'simplified', 1);
+            $this->__json['allSharingGroup'] = h($sgs);
             $distributionLevels = $this->__eventModel->distributionLevels;
             foreach ($distributionLevels as $key => $value) {
                 $this->__json['distributionInfo'][$key] = array('key' => h($value), 'desc' => h($this->__eventModel->distributionDescriptions[$key]['formdesc']), 'value' => h($key));
@@ -59,6 +59,12 @@
                 $this->__json['additionalDistributionInfo'][$distributionLevel] = array();
             }
             $this->__json['additionalDistributionInfo'][$distributionLevel][h($data)] = 0; // set-alike
+            if ($distributionLevel == 4) {
+                if (!isset($this->__json['sharingGroupRepartition'][h($data)])) {
+                    $this->__json['sharingGroupRepartition'][h($data)] = 0;
+                }
+                $this->__json['sharingGroupRepartition'][h($data)]++;
+            }
         }
 
         private function __addOtherDistributionInfo()
@@ -124,17 +130,28 @@
 
         public function get_distributions_graph($id)
         {
-            $event = $this->__get_event($id);
-            $eventDist = $event['distribution'];
-            $eventSGName = $event['SharingGroupName'];
-            $this->__eventDistribution = $eventDist;
-            $this->__eventSharingGroupName = $eventSGName;
             $this->__json['event'] = $this->init_array_distri();
             $this->__json['attribute'] = $this->init_array_distri();
             $this->__json['object'] = $this->init_array_distri();
             $this->__json['obj_attr'] = $this->init_array_distri();
             $this->__json['additionalDistributionInfo'] = $this->init_array_distri(array());
+            $this->__json['sharingGroupRepartition'] = array();
 
+            $this->__addOtherDistributionInfo();
+
+            // transform set into array
+            foreach (array_keys($this->__json['additionalDistributionInfo']) as $d) {
+                $this->__json['additionalDistributionInfo'][$d] = array_keys($this->__json['additionalDistributionInfo'][$d]);
+            }
+
+            if ($id === -1) {
+                return $this->__json;
+            }
+            $event = $this->__get_event($id);
+            $eventDist = $event['distribution'];
+            $eventSGName = $event['SharingGroupName'];
+            $this->__eventDistribution = $eventDist;
+            $this->__eventSharingGroupName = $eventSGName;
 
             if (empty($event)) {
                 return $this->__json;
@@ -188,13 +205,8 @@
 
             unset($this->__json['distributionInfo'][5]); // inherit event.
 
-
-            $this->__addOtherDistributionInfo();
-
-            // transform set into array
-            foreach (array_keys($this->__json['additionalDistributionInfo']) as $d) {
-                $this->__json['additionalDistributionInfo'][$d] = array_keys($this->__json['additionalDistributionInfo'][$d]);
-            }
+            // transform set into array for SG (others are already done)
+            $this->__json['additionalDistributionInfo'][4] = array_keys($this->__json['additionalDistributionInfo'][4]);
 
             return $this->__json;
         }
diff --git a/app/Lib/Tools/KafkaPubTool.php b/app/Lib/Tools/KafkaPubTool.php
new file mode 100644
index 000000000..a37cb2eac
--- /dev/null
+++ b/app/Lib/Tools/KafkaPubTool.php
@@ -0,0 +1,55 @@
+<?php
+
+class KafkaPubTool
+{
+    private $rdkafka = false;
+
+    private function __error($msg)
+    {
+        error_log($msg, 3, APP . 'tmp' . DS . 'logs' . DS . 'kafka.error.log');
+    }
+
+    public function initTool($brokers, $config)
+    {
+        if (!$this->rdkafka) {
+            try {
+                $rdConf = new RdKafka\Conf();
+                foreach ($config as $key => $val) {
+                    if (!empty($val)) {
+                        $rdConf->set($key, $val);
+                    }
+                }
+                $rdConf->setErrorCb(function ($kafka, $err, $reason) {
+                    $this->__error(sprintf("%s (reason: %s)\n", rd_kafka_err2str($err), $reason));
+                });
+                $rdkafka = new RdKafka\Producer($rdConf);
+                if ($rdkafka->addBrokers($brokers) == 0) {
+                    $this->__error("Could not add any Kafka brokers");
+                }
+                $this->rdkafka = $rdkafka;
+            } catch (Exception $e) {
+                $this->__error('Exception: ' . $e->getMessage() . "\n");
+            }
+        }
+    }
+
+    public function publishJson($topicName, $data, $action = false)
+    {
+        try {
+            if (!empty($action)) {
+                $data['action'] = $action;
+            }
+            $body = json_encode($data);
+            if (!$body) {
+                $this->__error("Error encoding to JSON: ". $data);
+            }
+            if (!empty($this->rdkafka)) {
+                $topic = $this->rdkafka->newTopic($topicName);
+                $topic->produce(RD_KAFKA_PARTITION_UA, 0, $body);
+                $this->rdkafka->poll(0);
+            }
+        } catch (Exception $e) {
+            $this->__error('Exception: ' . $e->getMessage() . "\n");
+        }
+    }
+}
diff --git a/app/Lib/cakephp b/app/Lib/cakephp
index ab5578dbc..c4a51509c 160000
--- a/app/Lib/cakephp
+++ b/app/Lib/cakephp
@@ -1 +1 @@
-Subproject commit ab5578dbc9f88e661d2b017489cd156fca961429
+Subproject commit c4a51509c554a0762e8b4d9b3985fe042b445fe7
diff --git a/app/Locale/cze/LC_MESSAGES/default.po b/app/Locale/cze/LC_MESSAGES/default.po
index e3ef28571..7ad57c3b4 100644
--- a/app/Locale/cze/LC_MESSAGES/default.po
+++ b/app/Locale/cze/LC_MESSAGES/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-01-22 21:21\n"
+"PO-Revision-Date: 2019-03-06 02:05\n"
 "Last-Translator: SteveClement <steve@localhost.lu>\n"
 "Language-Team: Czech\n"
 "MIME-Version: 1.0\n"
@@ -15,272 +15,285 @@ msgstr ""
 "Language: cs_CZ\n"
 
 #: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:149;153;157
+#: Controller/AttributesController.php:125;129;133
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1001;1348;1352;1356;1385;1800;1876;1880;1884;2102;2166;2248;2903;5264;5429;5433;5442
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
 #: Controller/PostsController.php:56
+#: Model/Galaxy.php:292
 msgid "Invalid event"
 msgstr "Neplatná událost"
 
-#: Controller/AppController.php:607
+#: Console/Command/ServerShell.php:49
+#: Controller/ServersController.php:632
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+msgstr ""
+
+#: Console/Command/ServerShell.php:51
+msgid "ERROR: %s"
+msgstr ""
+
+#: Controller/AppController.php:383
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr ""
+
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
+msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+msgstr "Tento ověřovací klíč nemá oprávnění použítí pro export. Obraťte se na správce."
+
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
+msgid "You have to be logged in to do that."
+msgstr "Pro tuto akci je nutné se přihlásit."
+
+#: Controller/AppController.php:627
+msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
+msgstr ""
+
+#: Controller/AppController.php:752
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Vše je hotovo. attribute_count generované od začátku pro "
 
-#: Controller/AppController.php:726
-#: Controller/AttributesController.php:2668
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
 #: Controller/ShadowAttributesController.php:1276
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "Úloha ve frontě. Pokud přejdete do zobrazení aktivních úloh (Správa-> Úlohy), můžete zobrazit průběh."
 
-#: Controller/AttributesController.php:140;1392
+#: Controller/AttributesController.php:116;1403
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "Není nastaveno ID události."
 
-#: Controller/AttributesController.php:143
+#: Controller/AttributesController.php:119
 msgid "You don't have permissions to create attributes"
 msgstr "Nemáte oprávnění k vytvoření atributů"
 
-#: Controller/AttributesController.php:163;489;666
+#: Controller/AttributesController.php:139;488;668
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1684;1705;1739
-#: Controller/ObjectsController.php:442
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
 msgid "You do not have permission to do that."
 msgstr "K tomu nemáte oprávnění."
 
-#: Controller/AttributesController.php:414;864;869;873;1072;1152;2684;2698;2731;2753;2762;3309;3313;3409;3413
-#: Controller/ShadowAttributesController.php:824;1067;1091;1124;1134
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
 #: Controller/TagsController.php:491
 msgid "Invalid attribute"
 msgstr "Neplatný atribut"
 
-#: Controller/AttributesController.php:424
-#: Controller/ShadowAttributesController.php:500
+#: Controller/AttributesController.php:421
+#: Controller/ShadowAttributesController.php:499
 msgid "You do not have the permission to view this event."
 msgstr "Nemáte oprávnění k zobrazení této události."
 
-#: Controller/AttributesController.php:472
+#: Controller/AttributesController.php:468
 msgid "Attribute not an attachment or malware-sample"
 msgstr "Atribut není přílohou nebo vzorkem malware"
 
-#: Controller/AttributesController.php:504;677
-#: Controller/ShadowAttributesController.php:548
-msgid "PHP says file was not uploaded. Are you attacking me?"
-msgstr "PHP říká, že soubor nebyl odeslán. Útočíš na mě?"
-
-#: Controller/AttributesController.php:680
-#: Controller/ShadowAttributesController.php:551;561
-msgid "There was a problem to upload the file."
-msgstr "Došlo k potížím při nahrávání souboru."
-
-#: Controller/AttributesController.php:824
-msgid "The ThreatConnect data has been imported."
-msgstr "ThreatConnect data byla importována."
-
-#: Controller/AttributesController.php:827
-msgid "%s entries imported."
-msgstr "%s položek importováno."
-
-#: Controller/AttributesController.php:831
-msgid "%s entries could not be imported."
-msgstr "%s položek nelze importovat."
-
-#: Controller/AttributesController.php:881;924;926
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "Neplatný atribut."
-
-#: Controller/AttributesController.php:920
-msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
-msgstr "Atribut nelze uložit: atribut v požadavku není novější než místní kopie."
-
-#: Controller/AttributesController.php:936;1401
-#: Controller/EventsController.php:4635;4648;5213;5227
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
 msgid "Invalid Event."
 msgstr "Neplatná událost."
 
-#: Controller/AttributesController.php:953
+#: Controller/AttributesController.php:503;679
+#: Controller/ShadowAttributesController.php:546
+msgid "PHP says file was not uploaded. Are you attacking me?"
+msgstr "PHP říká, že soubor nebyl odeslán. Útočíš na mě?"
+
+#: Controller/AttributesController.php:682
+#: Controller/ShadowAttributesController.php:549;559
+msgid "There was a problem to upload the file."
+msgstr "Došlo k potížím při nahrávání souboru."
+
+#: Controller/AttributesController.php:826
+msgid "The ThreatConnect data has been imported."
+msgstr "ThreatConnect data byla importována."
+
+#: Controller/AttributesController.php:829
+msgid "%s entries imported."
+msgstr "%s položek importováno."
+
+#: Controller/AttributesController.php:833
+msgid "%s entries could not be imported."
+msgstr "%s položek nelze importovat."
+
+#: Controller/AttributesController.php:883;931;933
+#: Controller/ShadowAttributesController.php:829
+msgid "Invalid attribute."
+msgstr "Neplatný atribut."
+
+#: Controller/AttributesController.php:927
+msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
+msgstr "Atribut nelze uložit: atribut v požadavku není novější než místní kopie."
+
+#: Controller/AttributesController.php:960
 msgid "The attribute has been saved"
 msgstr "Atribut byl uložen"
 
-#: Controller/AttributesController.php:985
+#: Controller/AttributesController.php:995
 msgid "The attribute could not be saved. Please, try again."
 msgstr "Atribut nelze uložit. Prosím opakujte akci."
 
-#: Controller/AttributesController.php:1076
+#: Controller/AttributesController.php:1087
 msgid "Invalid event id."
 msgstr "Neplatné Id události."
 
-#: Controller/AttributesController.php:1106
-#: Controller/EventsController.php:2023
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
+#: Controller/ShadowAttributesController.php:729
 msgid "Invalid input."
 msgstr "Neplatný vstup."
 
-#: Controller/AttributesController.php:1111
+#: Controller/AttributesController.php:1122
 msgid "Invalid field."
 msgstr "Neplatné pole."
 
-#: Controller/AttributesController.php:1156
+#: Controller/AttributesController.php:1167
 msgid "Invalid attribute id."
 msgstr "Neplatné ID atributu."
 
-#: Controller/AttributesController.php:1231;1241
+#: Controller/AttributesController.php:1242;1252
 msgid "Attribute deleted"
 msgstr "Atribut odstraněn"
 
-#: Controller/AttributesController.php:1236;1238
+#: Controller/AttributesController.php:1247;1249
 msgid "Attribute was not deleted"
 msgstr "Atribut nebyl odstraněn"
 
-#: Controller/AttributesController.php:1263;3155
-#: Controller/ShadowAttributesController.php:864
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
 msgid "Invalid Attribute"
 msgstr "Neplatný atribut"
 
-#: Controller/AttributesController.php:1290
+#: Controller/AttributesController.php:1301
 msgid "Could not restore the attribute"
 msgstr "Nelze obnovit atribut"
 
-#: Controller/AttributesController.php:1311;1318;1322
+#: Controller/AttributesController.php:1322;1329;1333
 msgid "Attribute not found or not authorised."
 msgstr "Atribut nebyl nalezen nebo není povolen."
 
-#: Controller/AttributesController.php:1372
+#: Controller/AttributesController.php:1383
 msgid "This function is only accessible via POST requests."
 msgstr "Tato funkce je pouze přístupné prostřednictvím POST požadavku."
 
-#: Controller/AttributesController.php:1427
+#: Controller/AttributesController.php:1438
 msgid "No matching attributes found."
 msgstr "Nebyly nalezeny žádné stejné atributy."
 
-#: Controller/AttributesController.php:1461
+#: Controller/AttributesController.php:1472
 msgid "This method can only be accessed via AJAX."
 msgstr "Tato metoda je přístupná pouze přes AJAX."
 
-#: Controller/AttributesController.php:1472
+#: Controller/AttributesController.php:1482
 msgid "You are not authorized to edit this event."
 msgstr "Nemáte oprávnění k úpravě této události."
 
-#: Controller/AttributesController.php:1537
+#: Controller/AttributesController.php:1580
 msgid "No event ID provided."
 msgstr "Žádné ID události není k dispozici."
 
-#: Controller/AttributesController.php:1640
-msgid "Invalid tag"
-msgstr "Neplatná značka"
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
+msgid "Synonyms: "
+msgstr ""
 
-#: Controller/AttributesController.php:2107;2282;2391;2441;2524;2610
-#: Controller/EventsController.php:2484;2600;2662;2720;3079;3301;3993;4011
-msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
-msgstr "Tento ověřovací klíč nemá oprávnění použítí pro export. Obraťte se na správce."
-
-#: Controller/AttributesController.php:2112;2277;2384
-#: Controller/EventsController.php:3084
+#: Controller/AttributesController.php:1997;2104
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr ""
 
-#: Controller/AttributesController.php:2123
-msgid "Content type and parameter mismatch. Expecting JSON."
-msgstr "Neshoda typu obsahu a parametru. Byl očekáván JSON."
-
-#: Controller/AttributesController.php:2128
-msgid "Content type and parameter mismatch. Expecting XML."
-msgstr "Neshoda typu obsahu a parametru. Byl očekáván XML."
-
-#: Controller/AttributesController.php:2132;2290
+#: Controller/AttributesController.php:2010
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
 msgstr ""
 
-#: Controller/AttributesController.php:2310
+#: Controller/AttributesController.php:2030
 msgid "You don't have access to that event."
 msgstr "Nemáte přístup k této události."
 
-#: Controller/AttributesController.php:2373
+#: Controller/AttributesController.php:2093
 msgid "No matches."
 msgstr "Žádná shoda."
 
-#: Controller/AttributesController.php:2395;2404
+#: Controller/AttributesController.php:2115;2124
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Neplatný atribut nebo nemáte oprávnění k jeho zobrazení."
 
-#: Controller/AttributesController.php:2445;2528;2614
-#: Controller/EventsController.php:2488;2605;2667;2724;3305;3997;4015
-msgid "You have to be logged in to do that."
-msgstr "Pro tuto akci je nutné se přihlásit."
-
-#: Controller/AttributesController.php:2472
+#: Controller/AttributesController.php:2192
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
 msgstr ""
 
-#: Controller/AttributesController.php:2536
+#: Controller/AttributesController.php:2256
 msgid "Invalid event ID format."
 msgstr "Neplatný formát ID události."
 
-#: Controller/AttributesController.php:2645
+#: Controller/AttributesController.php:2365
 #: Controller/ShadowAttributesController.php:1254
 msgid "All done. "
 msgstr "Vše je hotovo. "
 
-#: Controller/AttributesController.php:2677;2724
+#: Controller/AttributesController.php:2397;2444
 #: Controller/ShadowAttributesController.php:1062
 msgid "Invalid field requested."
 msgstr "Požadováno neplatné pole."
 
-#: Controller/AttributesController.php:2680;2727
+#: Controller/AttributesController.php:2400;2447
 msgid "This function can only be accessed via AJAX."
 msgstr "Tato funkce je přístupná pouze přes AJAX."
 
-#: Controller/AttributesController.php:2792;2800
-#: Controller/EventsController.php:3689;3967
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "Událost nebyla nalezena nebo nemáte oprávnění k vytvoření atributů"
 
-#: Controller/AttributesController.php:2821
+#: Controller/AttributesController.php:2541
 msgid "This action can only be accessed via AJAX."
 msgstr "Tato akce je přístupná pouze přes AJAX."
 
-#: Controller/AttributesController.php:2830;3081;3095;3106
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
 msgid "You are not authorised to do that."
 msgstr "K tomu nemáte oprávnění."
 
-#: Controller/AttributesController.php:2935
-#: Controller/EventsController.php:4431
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
 msgid "This functionality requires API key access."
 msgstr "Tato funkce vyžaduje API klíč."
 
-#: Controller/AttributesController.php:2943
+#: Controller/AttributesController.php:2663
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr "Tato akce je pouze pro API. Na stránce automatizace jsou informace o pouzívání."
 
-#: Controller/AttributesController.php:2955
+#: Controller/AttributesController.php:2675
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "Nebyl přiajt žádný hash nebo ID události. Je nutné nastavit alespoň jeden ze dvou."
 
-#: Controller/AttributesController.php:3116
+#: Controller/AttributesController.php:2836
 msgid "Invalid script."
 msgstr "Neplatný skript."
 
-#: Controller/AttributesController.php:3181
+#: Controller/AttributesController.php:2901
 msgid "No valid enrichment options found for this attribute."
 msgstr "Žádná platná obohacování možnosti pro tento atribut."
 
-#: Controller/AttributesController.php:3245
+#: Controller/AttributesController.php:2964
 msgid "Invalid type requested."
 msgstr "Vyžádán neplatný typ."
 
-#: Controller/AttributesController.php:3476
-#: Controller/EventsController.php:5209
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "Zákaz korelace není na tuto instanci možný."
 
-#: Controller/AttributesController.php:3480;3495
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3243;3258
+#: Controller/ShadowAttributesController.php:677
 msgid "Invalid Attribute."
 msgstr "Neplatný atribut."
 
-#: Controller/AttributesController.php:3483;3498
-#: Controller/EventsController.php:5216;5230
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
 msgid "You don't have permission to do that."
 msgstr "K tomu nemáte oprávnění."
 
@@ -288,254 +301,286 @@ msgstr "K tomu nemáte oprávnění."
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "V této instanci není zapsání události na blacklist povoleno."
 
-#: Controller/EventsController.php:804
+#: Controller/EventsController.php:848
 msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
 msgstr "Ve Vašem profilu není nastaven x509 certifikát nebo GnuPG klíč. Pro příjem emailů musíte nahrát Váš veřejný certifikát nebo GnuPG klíč k profilu."
 
-#: Controller/EventsController.php:806
+#: Controller/EventsController.php:850
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "Žádný klíč GnuPG v profilu. Chcete-li dostávat e-maily, nahrajte váš veřejný klíč k vašemu profilu."
 
-#: Controller/EventsController.php:812
+#: Controller/EventsController.php:856
 msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
 msgstr "Ve vašem profilu není nastaven x 509 certifikát nebo GnuPG klíč. Chcete-li dostávat atributy e-mailem, vložte veřejný certifikát nebo GnuPG klíč do vašeho profilu."
 
-#: Controller/EventsController.php:814
+#: Controller/EventsController.php:858
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr "V profilu chybí klíč GnuPG. Chcete-li zobrazit atributy v e-mailech, nahrajte váš veřejný klíč do vašeho profilu."
 
-#: Controller/EventsController.php:1527
+#: Controller/EventsController.php:1559
+msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
+msgstr ""
+
+#: Controller/EventsController.php:1769
 msgid "You don't have permissions to create events"
 msgstr "Nemáte oprávnění k vytváření událostí"
 
-#: Controller/EventsController.php:1533
+#: Controller/EventsController.php:1775
 msgid "No valid event data received."
 msgstr "Nebyla přijata žádná platná data událostí."
 
-#: Controller/EventsController.php:1569
+#: Controller/EventsController.php:1811
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr ""
 
-#: Controller/EventsController.php:1573;1577
+#: Controller/EventsController.php:1815;1819
 msgid "Invalid Sharing Group or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:1601
+#: Controller/EventsController.php:1843
 msgid "Event blocked by local blacklist."
 msgstr "Událost zablokována místním blacklistem."
 
-#: Controller/EventsController.php:1614;1693;1955
+#: Controller/EventsController.php:1856;1933;2197
 msgid "The event has been saved"
 msgstr "Událost byla uložena"
 
-#: Controller/EventsController.php:1622
+#: Controller/EventsController.php:1864
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "Událost již existuje, pokud byste chtěli upravit, použijte adresu url v hlavičce umístění."
 
-#: Controller/EventsController.php:1633
+#: Controller/EventsController.php:1870
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "Vytvoření události brání vstup na blacklistu. Obraťte se na tým pro správu této instance"
 
-#: Controller/EventsController.php:1635;1958
+#: Controller/EventsController.php:1872;2200
 msgid "The event could not be saved. Please, try again."
 msgstr "Událost nelze uložit. Prosím opakujte akci."
 
-#: Controller/EventsController.php:1719
+#: Controller/EventsController.php:1912
+msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
+msgstr ""
+
+#: Controller/EventsController.php:1959
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "Můžete nahrát pouze soubory MISP XML nebo MISP JSON."
 
-#: Controller/EventsController.php:1720
+#: Controller/EventsController.php:1960
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr ""
 
-#: Controller/EventsController.php:1768
+#: Controller/EventsController.php:2009
 msgid "STIX document imported, event's created: "
 msgstr "STIX dokument importován, událost vytvořena: "
 
-#: Controller/EventsController.php:1771
+#: Controller/EventsController.php:2012
 msgid "STIX document imported."
 msgstr "STIX dokument importován."
 
-#: Controller/EventsController.php:1774
+#: Controller/EventsController.php:2015
 msgid "Could not import STIX document: "
 msgstr "Není možné importovat STIX dokument: "
 
-#: Controller/EventsController.php:1781
+#: Controller/EventsController.php:2022
 msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
 msgstr "Odeslání souboru se nezdařilo. Ujistěte se, že jste vyrali stix soubor k odeslání a že soubor nepřekračuje maximální velikost "
 
-#: Controller/EventsController.php:1805;1890
+#: Controller/EventsController.php:2046;2131
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "K tomuto nemáte oprávnění. Zvažte použití funkce \"navrhnout atribut\"."
 
-#: Controller/EventsController.php:1813
+#: Controller/EventsController.php:2054
 msgid "Invalid event ID entered."
 msgstr "Vloženo neplatné ID události."
 
-#: Controller/EventsController.php:1818
+#: Controller/EventsController.php:2059
 msgid "You are not authorised to read the selected event."
 msgstr "Nemáte oprávnění ke čtení vybrané události."
 
-#: Controller/EventsController.php:2109;2172
+#: Controller/EventsController.php:2349;2387;2450
 msgid "You don't have the permission to do that."
 msgstr "K tomu nemáte oprávnění."
 
-#: Controller/EventsController.php:2259
+#: Controller/EventsController.php:2358
+msgid "Event unpublished."
+msgstr ""
+
+#: Controller/EventsController.php:2537
 msgid "Email sent to the reporter."
 msgstr "E-mail byl odeslán reportérovi."
 
-#: Controller/EventsController.php:2261
+#: Controller/EventsController.php:2539
 msgid "Sending of email failed"
 msgstr "Odesílání e-mailu se nezdařilo"
 
-#: Controller/EventsController.php:2397
+#: Controller/EventsController.php:2678
 msgid "This feature is currently disabled"
 msgstr "Tato funkce je vypnuta"
 
-#: Controller/EventsController.php:2439;4025
+#: Controller/EventsController.php:2720;3986
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
 msgstr ""
 
-#: Controller/EventsController.php:2475
+#: Controller/EventsController.php:2756
 msgid "Invalid Event ID."
 msgstr "Neplatné ID události."
 
-#: Controller/EventsController.php:2522
+#: Controller/EventsController.php:2803
 msgid "No events found that match the passed parameters."
 msgstr ""
 
-#: Controller/EventsController.php:2547
+#: Controller/EventsController.php:2828
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
 msgstr ""
 
-#: Controller/EventsController.php:2622;2684
+#: Controller/EventsController.php:2903
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
 msgstr ""
 
-#: Controller/EventsController.php:2641
-#: Model/Attribute.php:1927
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
 msgid "Invalid hash type."
 msgstr "Neplatný typ hashe."
 
-#: Controller/EventsController.php:2871
+#: Controller/EventsController.php:3025
 msgid "Filename not allowed."
 msgstr "Tento typ souboru není povolen."
 
-#: Controller/EventsController.php:2892
+#: Controller/EventsController.php:3045
 msgid "Problem with writing the ioc file. Please report to administrator."
 msgstr "Problém se zapsáním ioc souboru. Kontaktujte administrátora."
 
-#: Controller/EventsController.php:2986
+#: Controller/EventsController.php:3139
 msgid "This is not a valid MISP XML file."
 msgstr "Toto není platný MISP XML soubor."
 
-#: Controller/EventsController.php:3101
-msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type)."
-msgstr ""
-
-#: Controller/EventsController.php:3294
+#: Controller/EventsController.php:3291
 msgid "Not yet implemented"
 msgstr "Není implementováno"
 
-#: Controller/EventsController.php:3312;3316
+#: Controller/EventsController.php:3309;3313
 msgid "Invalid event or not authorised."
 msgstr "Neplatná událost nebo není povoleno."
 
-#: Controller/EventsController.php:3336;3406
+#: Controller/EventsController.php:3333;3403
 msgid "You don't have the privileges to access this."
 msgstr ""
 
-#: Controller/EventsController.php:3920
-msgid "Could not add tags."
-msgstr "Nelze přidat tagy."
+#: Controller/EventsController.php:3610
+#: Controller/TagCollectionsController.php:307
+msgid "Invalid Tag."
+msgstr ""
 
-#: Controller/EventsController.php:3971;5055
-#: Controller/ObjectsController.php:46;140;144;438
+#: Controller/EventsController.php:3626
+#: Controller/TagCollectionsController.php:323
+msgid "Tag is already attached to this event."
+msgstr ""
+
+#: Controller/EventsController.php:3637;3643
+#: Controller/TagCollectionsController.php:330
+msgid "Tag(s) added."
+msgstr ""
+
+#: Controller/EventsController.php:3639
+msgid "Tag could not be added."
+msgstr ""
+
+#: Controller/EventsController.php:3645
+#: Controller/TagCollectionsController.php:338
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
 msgid "Invalid event."
 msgstr "Neplatná událost."
 
-#: Controller/EventsController.php:4085;4115;4131
+#: Controller/EventsController.php:3918
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
+msgstr ""
+
+#: Controller/EventsController.php:4049;4079;4095
 msgid "You do not have the permission to do that."
 msgstr "K tomu nemáte oprávnění."
 
-#: Controller/EventsController.php:4196;4334
+#: Controller/EventsController.php:4160;4300
 msgid "Invalid ID"
 msgstr "Neplatné ID"
 
-#: Controller/EventsController.php:4200;4338
+#: Controller/EventsController.php:4164;4304
 msgid "Event not found or you are not authorised to view it."
 msgstr "Událost nenalezena nebo nemáte oprávnění."
 
-#: Controller/EventsController.php:4434;4441
+#: Controller/EventsController.php:4405;4412
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4470
+#: Controller/EventsController.php:4441
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4478
+#: Controller/EventsController.php:4449
 msgid "Event not found"
 msgstr "Událost nebyla nalezena"
 
-#: Controller/EventsController.php:4501
+#: Controller/EventsController.php:4472
 msgid "Event not found."
 msgstr "Událost nebyla nalezena."
 
-#: Controller/EventsController.php:4511
+#: Controller/EventsController.php:4482
 msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
 msgstr ""
 
-#: Controller/EventsController.php:4536
+#: Controller/EventsController.php:4507
 msgid "The creation of a new event with the supplied information has failed."
 msgstr ""
 
-#: Controller/EventsController.php:4671;4693;4722;4747;4772;4802;4823
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
 msgid "Invalid type."
 msgstr "Neplatný typ."
 
-#: Controller/EventsController.php:4866
+#: Controller/EventsController.php:4906
 msgid "Invalid method."
 msgstr "Neplatná metoda."
 
-#: Controller/EventsController.php:4946
+#: Controller/EventsController.php:4989
 msgid "%s services are not enabled."
 msgstr ""
 
-#: Controller/EventsController.php:4950
+#: Controller/EventsController.php:4993
 msgid "Attribute not found or you are not authorised to see it."
 msgstr ""
 
-#: Controller/EventsController.php:4956
+#: Controller/EventsController.php:4999
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4973
+#: Controller/EventsController.php:5016
 msgid "no valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4995
+#: Controller/EventsController.php:5038
 msgid "%s service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5007
+#: Controller/EventsController.php:5050
 msgid ": Enriched via the %s"
 msgstr ""
 
-#: Controller/EventsController.php:5136
+#: Controller/EventsController.php:5184
 msgid "Import service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5303
+#: Controller/EventsController.php:5351
 msgid "Invalid ID."
 msgstr "Neplatné ID."
 
-#: Controller/EventsController.php:5351
-#: Controller/ShadowAttributesController.php:312;317;534
+#: Controller/EventsController.php:5399
+#: Controller/ShadowAttributesController.php:311;316;532
 msgid "Invalid Event"
 msgstr "Neplatná událost"
 
-#: Controller/EventsController.php:5369
+#: Controller/EventsController.php:5420
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "Úloha se zpracovává na pozadí. Vraťte se později."
 
@@ -543,122 +588,138 @@ msgstr "Úloha se zpracovává na pozadí. Vraťte se později."
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:193;291
+#: Controller/FeedsController.php:205;303
 msgid "Feed added."
 msgstr "Přidán informační kanál."
 
-#: Controller/FeedsController.php:201
+#: Controller/FeedsController.php:213
 msgid "Feed could not be added. Invalid field: %s"
 msgstr "Nebylo možné přidat informační kanál. Neplatné pole: %s"
 
-#: Controller/FeedsController.php:226;326;348;470;502;682
+#: Controller/FeedsController.php:238;338;360;482;517;721
 msgid "Invalid feed."
 msgstr "Neplatný kanál."
 
-#: Controller/FeedsController.php:299
+#: Controller/FeedsController.php:311
 msgid "Feed could not be updated. Invalid fields: %s"
 msgstr "Informační kanál nemohl být aktualizován. Neplatné pole: %s"
 
-#: Controller/FeedsController.php:322
+#: Controller/FeedsController.php:334
 msgid "This action requires a post request."
 msgstr ""
 
-#: Controller/FeedsController.php:355;474
+#: Controller/FeedsController.php:367;486
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr ""
 
-#: Controller/FeedsController.php:368;434
+#: Controller/FeedsController.php:380;446
 msgid "Starting fetch from Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:379
+#: Controller/FeedsController.php:391
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:384;386
+#: Controller/FeedsController.php:396;398
 msgid "Fetching the feed has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:390
+#: Controller/FeedsController.php:402
 msgid "Fetching the feed has successfuly completed."
 msgstr ""
 
-#: Controller/FeedsController.php:451
+#: Controller/FeedsController.php:463
 msgid "Fetching the feed has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:481
+#: Controller/FeedsController.php:493
 msgid "Event added."
 msgstr "Událost přidána."
 
-#: Controller/FeedsController.php:484
+#: Controller/FeedsController.php:496
 msgid "Event already up to date."
 msgstr "Událost je již aktuální."
 
-#: Controller/FeedsController.php:486
+#: Controller/FeedsController.php:498
 msgid "Event updated."
 msgstr "Událost byla aktualizována."
 
-#: Controller/FeedsController.php:490
+#: Controller/FeedsController.php:502
 msgid "Could not %s event."
 msgstr ""
 
-#: Controller/FeedsController.php:493
+#: Controller/FeedsController.php:505
 msgid "Download failed."
 msgstr "Stahování se nezdařilo."
 
-#: Controller/FeedsController.php:561
+#: Controller/FeedsController.php:597
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr ""
 
-#: Controller/FeedsController.php:600;651
+#: Controller/FeedsController.php:636;687
 msgid "Invalid feed type."
 msgstr "Neplatný kanál."
 
-#: Controller/FeedsController.php:714
+#: Controller/FeedsController.php:753
 msgid "This event is blocked by the Feed filters."
 msgstr ""
 
-#: Controller/FeedsController.php:716
+#: Controller/FeedsController.php:755
 msgid "Could not download the selected Event"
 msgstr ""
 
-#: Controller/FeedsController.php:752;756
+#: Controller/FeedsController.php:791;795
 msgid "Invalid Feed."
 msgstr "Neplatný kanál."
 
-#: Controller/FeedsController.php:777
+#: Controller/FeedsController.php:816
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: Controller/FeedsController.php:781
+#: Controller/FeedsController.php:820
 msgid "Feed not found."
 msgstr "Kanál nebyl nalezen."
 
-#: Controller/FeedsController.php:790
+#: Controller/FeedsController.php:829
 msgid "Data pulled."
 msgstr ""
 
-#: Controller/FeedsController.php:792
+#: Controller/FeedsController.php:831
 msgid "Could not pull the selected data. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:809
+#: Controller/FeedsController.php:848
 msgid "Starting feed caching."
 msgstr ""
 
-#: Controller/FeedsController.php:824
+#: Controller/FeedsController.php:863
 msgid "Caching the feeds has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:827
+#: Controller/FeedsController.php:866
 msgid "Caching the feeds has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:858
+#: Controller/FeedsController.php:900
 msgid "Invalid feed list received."
 msgstr ""
 
+#: Controller/GalaxiesController.php:92
+msgid "All clusters"
+msgstr ""
+
+#: Controller/GalaxiesController.php:135
+msgid "All namespaces"
+msgstr ""
+
+#: Controller/GalaxiesController.php:250
+msgid "Failed to parse request."
+msgstr ""
+
+#: Controller/GalaxiesController.php:253
+msgid "No clusters picked."
+msgstr ""
+
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr "Všechny dokončené úlohy byly odstraněny"
@@ -671,11 +732,23 @@ msgstr "Všechny úlohy byly odstraněny"
 msgid "Invalid object"
 msgstr "Neplatný objekt"
 
-#: Controller/ObjectReferencesController.php:187
+#: Controller/ObjectReferencesController.php:188
 msgid "Invalid object reference"
 msgstr "Neplatný odkaz na objekt"
 
-#: Controller/ObjectTemplatesController.php:88
+#: Controller/ObjectTemplatesController.php:31
+msgid "All Objects"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:99
+msgid "Invalid object template"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:103
+msgid "Invalid object template id."
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
 msgstr "Šablona objektu byla smazána"
 
@@ -696,23 +769,23 @@ msgstr ""
 msgid "Invalid template."
 msgstr "Neplatná šablona."
 
-#: Controller/ObjectsController.php:303
+#: Controller/ObjectsController.php:311
 msgid "You don't have permissions to edit objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:317;328;427
+#: Controller/ObjectsController.php:325;336;439
 msgid "Invalid object."
 msgstr ""
 
-#: Controller/ObjectsController.php:421
+#: Controller/ObjectsController.php:433
 msgid "You don't have permissions to delete objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:531;538;542
+#: Controller/ObjectsController.php:543;550;554
 msgid "Object not found or not authorised."
 msgstr ""
 
-#: Controller/ObjectsController.php:799
+#: Controller/ObjectsController.php:811
 msgid "%s objects successfully reconstructed."
 msgstr "%s objektů bylo úspěšně obnoveno."
 
@@ -776,123 +849,147 @@ msgstr "Funkci nelze uložit. Prosím opakujte akci."
 msgid "Role deleted"
 msgstr "Funkce odstraněna"
 
-#: Controller/ServersController.php:204;394
+#: Controller/ServersController.php:226;417
 msgid "The pull filter rules must be in valid JSON format."
 msgstr "Filtr pravidla musí být v platném formátu JSON."
 
-#: Controller/ServersController.php:214;404
+#: Controller/ServersController.php:236;427
 msgid "The push filter rules must be in valid JSON format."
 msgstr "Pravidla filtru musí být v platném formátu JSON."
 
-#: Controller/ServersController.php:268;434
+#: Controller/ServersController.php:291;457
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr "Tuto organizaci nelze vytvořit, uuid je již používán."
 
-#: Controller/ServersController.php:280
+#: Controller/ServersController.php:303
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format? Also, make sure the organisation's name doesn't clash with an existing one."
 msgstr "Nelze uložit novou organizaci, je uuid musí ve správném formátu? Ujistěte se, zda název organizace již neexistuje."
 
-#: Controller/ServersController.php:309;490
+#: Controller/ServersController.php:332;513
 msgid "The server has been saved"
 msgstr "Server byl uložen"
 
-#: Controller/ServersController.php:316;497
+#: Controller/ServersController.php:339;520
 msgid "The server could not be saved. Please, try again."
 msgstr "Server nelze uložit. Prosím opakujte akci."
 
-#: Controller/ServersController.php:369;565;590;598;659;1412
+#: Controller/ServersController.php:392;589;614;623;683;1360
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: Controller/ServersController.php:451
+#: Controller/ServersController.php:474
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr "Nelze uložit novou organizaci, je uuid ve správném formátu?."
 
-#: Controller/ServersController.php:572
+#: Controller/ServersController.php:596
 msgid "Server deleted"
 msgstr "Server smazán"
 
-#: Controller/ServersController.php:575
+#: Controller/ServersController.php:599
 msgid "Server was not deleted"
 msgstr "Server nebyl odstraněn"
 
-#: Controller/ServersController.php:602
+#: Controller/ServersController.php:626
 msgid "Pull setting not enabled for this server."
 msgstr "Nastavení pro stahování není na tomto serveru povoleno."
 
-#: Controller/ServersController.php:611
-msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+#: Controller/ServersController.php:659
+msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:1309
+#: Controller/ServersController.php:696
+msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
+msgstr ""
+
+#: Controller/ServersController.php:709
+msgid "Push complete. %s events pushed, %s events could not be pushed."
+msgstr ""
+
+#: Controller/ServersController.php:734
+msgid "Push queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:1257
 msgid "File not found."
 msgstr "Soubor nebyl nalezen."
 
-#: Controller/ServersController.php:1315
+#: Controller/ServersController.php:1263
 msgid "File could not be deleted."
 msgstr "Soubor nebylo možné odstranit."
 
-#: Controller/ServersController.php:1338;1354
+#: Controller/ServersController.php:1286;1302
 msgid "Upload failed."
 msgstr "Odeslání se nezdařilo."
 
-#: Controller/ServersController.php:1346
+#: Controller/ServersController.php:1294
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "Soubor již existuje. Pokud jej chcete nahradit, musíte nejdříve odstranit starý soubor."
 
-#: Controller/ShadowAttributesController.php:212
+#: Controller/ServersController.php:1748
+msgid "Starting server caching."
+msgstr ""
+
+#: Controller/ServersController.php:1763
+msgid "Caching the servers has failed."
+msgstr ""
+
+#: Controller/ServersController.php:1766
+msgid "Caching the servers has successfully completed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:211
 msgid "Moving of the file that this attachment references failed."
 msgstr "Přesun souboru, na který tato příloha odkazuje se nezdařil."
 
-#: Controller/ShadowAttributesController.php:280
+#: Controller/ShadowAttributesController.php:279
 msgid "Could not discard proposal."
 msgstr "Návrh se nepodařilo smazat."
 
-#: Controller/ShadowAttributesController.php:341
+#: Controller/ShadowAttributesController.php:340
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr "Atribut nebyl přidán: přílohy musí být přidávány pomocí tlačítka \"Přidat přílohu\""
 
-#: Controller/ShadowAttributesController.php:389;392;401
+#: Controller/ShadowAttributesController.php:388;391;400
 msgid "The lines"
 msgstr "Řádky"
 
-#: Controller/ShadowAttributesController.php:441
+#: Controller/ShadowAttributesController.php:440
 msgid "The proposal has been saved"
 msgstr "N8vrh byl uložena"
 
-#: Controller/ShadowAttributesController.php:453;763
+#: Controller/ShadowAttributesController.php:452;761
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:455
+#: Controller/ShadowAttributesController.php:454
 msgid "The proposal could not be saved. Please, try again."
 msgstr "Návrh nelze uložit. Prosím opakujte akci."
 
-#: Controller/ShadowAttributesController.php:492
+#: Controller/ShadowAttributesController.php:491
 msgid "Invalid Proposal"
 msgstr "Neplatný návrh"
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:521
 msgid "Proposal not an attachment or malware-sample"
 msgstr "Návrh není přílohou nebo vzorkem malware"
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:617
 msgid "The attachment has been uploaded"
 msgstr "Příloha byla úspěšně nahrána"
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:619
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr "Příloha byla odeslána, ale některé návrhy nemohly být vytvořeny. Naúspěšné návrhy: "
 
-#: Controller/ShadowAttributesController.php:624
+#: Controller/ShadowAttributesController.php:622
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr "Přílohu nelze uložit, kontaktujte vašeho administrátora."
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:752
 msgid "The proposed Attribute has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:763
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
@@ -924,6 +1021,86 @@ msgstr ""
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr ""
 
+#: Controller/SightingsController.php:86
+msgid "Could not add the Sighting. Reason: "
+msgstr ""
+
+#: Controller/SightingsController.php:96;99
+msgid "Sighting added"
+msgstr ""
+
+#: Controller/SightingsController.php:152
+msgid "You are not authorised to remove sightings data as you don't have permission to modify your organisation's data."
+msgstr ""
+
+#: Controller/SightingsController.php:158
+msgid "Attribute not found"
+msgstr ""
+
+#: Controller/SightingsController.php:176
+msgid "Invalid request."
+msgstr ""
+
+#: Controller/SightingsController.php:185
+msgid "Sighting added."
+msgstr ""
+
+#: Controller/SightingsController.php:187
+msgid "Sighting could not be added"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:56;177
+msgid "The tag collection has been saved"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:64;185
+msgid "The tag collection could not be added. Reason: "
+msgstr ""
+
+#: Controller/TagCollectionsController.php:85
+msgid "%s new tag collections added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:154
+msgid "Invalid Tag Collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:161
+msgid "You don't have editing rights on this Tag Collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:201;380
+msgid "Invalid tag collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:207
+msgid "Tag collection deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:215
+msgid "Tag collection could not be deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:224
+msgid "You are not allowed to delete that."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:332
+msgid "Tag(s) could not be added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:384
+msgid "Insufficient privileges to remove the tag from the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:395
+msgid "Invalid tag or tag not associated with the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:399
+msgid "Failed to remove tag from the collection."
+msgstr ""
+
 #: Controller/TagsController.php:367
 msgid "Tag deleted"
 msgstr "Značka odstraněna"
@@ -932,6 +1109,27 @@ msgstr "Značka odstraněna"
 msgid "Tag was not deleted"
 msgstr "Značka nebyla odstraněna"
 
+#: Controller/TagsController.php:580
+msgid "Favourite Tags"
+msgstr ""
+
+#: Controller/TagsController.php:586
+msgid "Tag Collections"
+msgstr ""
+
+#: Controller/TagsController.php:591
+msgid "All Tags"
+msgstr ""
+
+#: Controller/TagsController.php:601
+#: View/Taxonomies/view.ctp:2
+msgid "Taxonomy Library"
+msgstr ""
+
+#: Controller/TagsController.php:756
+msgid "Includes: "
+msgstr ""
+
 #: Controller/TemplatesController.php:408
 msgid "Event populated, "
 msgstr "Událost vytvořena, "
@@ -940,15 +1138,15 @@ msgstr "Událost vytvořena, "
 msgid "Event populated, but "
 msgstr "Událost vytvořena, ale "
 
-#: Controller/UsersController.php:42;221
+#: Controller/UsersController.php:42;247
 msgid "Invalid user or not authorised."
 msgstr "Neplatný uživatel nebo není autorizován."
 
-#: Controller/UsersController.php:54;430;657;907
+#: Controller/UsersController.php:54;456;683;929
 msgid "Invalid user"
 msgstr "Neplatný uživatel"
 
-#: Controller/UsersController.php:119;564;728
+#: Controller/UsersController.php:119;590;754
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr "Neplatná e-mailová doména. Uživatel je omezen na vytváření uživatelů pro následující domény: "
 
@@ -960,59 +1158,75 @@ msgstr "Profil byl aktualizován"
 msgid "The profile could not be updated. Please, try again."
 msgstr "Profil nelze aktualizovat. Prosím opakujte akci."
 
-#: Controller/UsersController.php:198
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
 msgid "Password Changed."
 msgstr "Heslo bylo změněno."
 
-#: Controller/UsersController.php:203
+#: Controller/UsersController.php:222
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "Nelze aktualizovat heslo. Přesvědčte se, zda splňujete minimální délku hesla a požadavky na složitost."
 
-#: Controller/UsersController.php:575
+#: Controller/UsersController.php:601
 msgid "The user could not be saved. Invalid organisation."
 msgstr "Uživatele nelze uložit. Neplatná organizace."
 
-#: Controller/UsersController.php:597
+#: Controller/UsersController.php:623
 msgid "The user has been saved."
 msgstr "Uživatel byl uložen."
 
-#: Controller/UsersController.php:606;843
+#: Controller/UsersController.php:632;865
 msgid "The user could not be saved. Please, try again."
 msgstr "Uživatele nelze uložit. Prosím opakujte akci."
 
-#: Controller/UsersController.php:835
+#: Controller/UsersController.php:857
 msgid "The user has been saved"
 msgstr "Uživatel byl uložen"
 
-#: Controller/UsersController.php:915
+#: Controller/UsersController.php:937
 msgid "User deleted"
 msgstr "Uživatel odstraněn"
 
-#: Controller/UsersController.php:919
+#: Controller/UsersController.php:941
 msgid "User was not deleted"
 msgstr "Uživatel nebyl odstraněn"
 
-#: Controller/UsersController.php:997
+#: Controller/UsersController.php:1019
 msgid "Invalid username or password, try again"
 msgstr "Neplatné uživatelské jméno nebo heslo, zkuste to znovu"
 
-#: Controller/UsersController.php:1080
+#: Controller/UsersController.php:1106
 msgid "Good-Bye"
 msgstr "Nashledanou"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1147
 msgid "New authkey generated."
 msgstr "Vytvořen nový autentizační klíč."
 
-#: Controller/UsersController.php:1230
+#: Controller/UsersController.php:1256
 msgid "You accepted the Terms and Conditions."
 msgstr "Přijali jste podmínky používání."
 
-#: Controller/UsersController.php:1419
+#: Controller/UsersController.php:1438
+msgid "Recipient email not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1443
+msgid "Recipient organisation not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1480
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr "E-maily odeslané, ale nepodařilo se doručit zprávy následujícím příjemcům: "
 
-#: Controller/UsersController.php:1421
+#: Controller/UsersController.php:1482
 msgid "E-mails sent."
 msgstr "E-maily odeslány."
 
@@ -1040,972 +1254,1040 @@ msgstr "%s odstraněn"
 msgid "%s was not deleted"
 msgstr "%s nebyla odstraněna"
 
-#: Controller/Component/BlackListComponent.php:72
+#: Controller/Component/BlackListComponent.php:75
 msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
 msgstr "Hotovo. Přidáno %d položek na blacklist. %d položek nelze uložit."
 
-#: Controller/Component/BlackListComponent.php:123
+#: Controller/Component/BlackListComponent.php:126
 msgid "Blacklist item added."
 msgstr "Položka přidána na blacklist."
 
-#: Controller/Component/BlackListComponent.php:152
+#: Controller/Component/BlackListComponent.php:155
 msgid "Invalid blacklist entry"
 msgstr "Neplatný vstup pro blacklist"
 
-#: Controller/Component/BlackListComponent.php:156
+#: Controller/Component/BlackListComponent.php:159
 msgid "Blacklist entry removed"
 msgstr "Položka blacklistu odebrána"
 
-#: Controller/Component/BlackListComponent.php:158
+#: Controller/Component/BlackListComponent.php:161
 msgid "Could not remove the blacklist entry"
 msgstr "Nelze odstranit položku blacklistu"
 
-#: Model/Attribute.php:567
+#: Model/Attribute.php:591
 msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/Attribute.php:677
+#: Model/Attribute.php:703
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Attribute.php:802
+#: Model/Attribute.php:828
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Attribute.php:921
+#: Model/Attribute.php:953
 msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:928
+#: Model/Attribute.php:960
 msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:935
+#: Model/Attribute.php:967
 msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:946
+#: Model/Attribute.php:978
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:957
+#: Model/Attribute.php:989
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:972
+#: Model/Attribute.php:996
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:1011
 msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:990
+#: Model/Attribute.php:1029
 msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:995
+#: Model/Attribute.php:1034
 msgid "Invalid composite type. The format has to be %s."
 msgstr ""
 
-#: Model/Attribute.php:1006
+#: Model/Attribute.php:1045
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr ""
 
-#: Model/Attribute.php:1014
+#: Model/Attribute.php:1053
 msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1025
+#: Model/Attribute.php:1064
 msgid "Invalid CIDR notation value found."
 msgstr ""
 
-#: Model/Attribute.php:1032;1083
+#: Model/Attribute.php:1071;1122
 msgid "IP address has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1037
+#: Model/Attribute.php:1076
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr ""
 
-#: Model/Attribute.php:1066
+#: Model/Attribute.php:1105
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1086
+#: Model/Attribute.php:1125
 msgid "Domain name has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1099
+#: Model/Attribute.php:1138
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1107
+#: Model/Attribute.php:1146
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr ""
 
-#: Model/Attribute.php:1118
+#: Model/Attribute.php:1157
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr ""
 
-#: Model/Attribute.php:1230
+#: Model/Attribute.php:1272
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr ""
 
-#: Model/Attribute.php:1236
+#: Model/Attribute.php:1278
 msgid "The value has to be a number greater or equal 0."
 msgstr ""
 
-#: Model/Attribute.php:1243
+#: Model/Attribute.php:1285
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:1923;1991
+#: Model/Attribute.php:1968;2036
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2527
+#: Model/Attribute.php:2616
 msgid "This field is mandatory."
 msgstr ""
 
-#: Model/Attribute.php:2885
+#: Model/Attribute.php:3069
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
-#: Model/Event.php:4532
+#: Model/Event.php:5392
 msgid "Issues while loading the stix file. "
 msgstr "Problémy při načítání souboru stix. "
 
-#: Model/Event.php:4534
+#: Model/Event.php:5394
 msgid "Issues with the maec library. "
 msgstr "Problémy s knihovnou maec. "
 
-#: Model/Event.php:4536
+#: Model/Event.php:5396
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "Problémy při spouštění ingest scriptu nebo neplatný vstup. "
 
-#: Model/Event.php:4539
+#: Model/Event.php:5399
 msgid "Please ask your administrator to "
 msgstr "Kontaktujte administrátora pro "
 
-#: Model/Event.php:4541
+#: Model/Event.php:5401
 msgid "Please "
 msgstr "Prosím "
 
-#: Model/Event.php:4543
+#: Model/Event.php:5403
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr "zkontrolujte, zda jsou podmínky pro STIX splněny diagnostickým nástrojem."
 
-#: Model/Event.php:4575
+#: Model/Event.php:5435
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:4584
+#: Model/Event.php:5444
 msgid "%s not set"
 msgstr "%s není nastaveno"
 
-#: Model/Server.php:114
+#: Model/Event.php:5667
+msgid "Could not add tags."
+msgstr "Nelze přidat tagy."
+
+#: Model/Galaxy.php:219;276;286;300
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
 msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
 msgstr ""
 
-#: Model/Server.php:115
+#: Model/Server.php:122
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:125
+#: Model/Server.php:132
 msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
 msgstr ""
 
-#: Model/Server.php:126
+#: Model/Server.php:133
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:135
+#: Model/Server.php:142
 msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
 msgstr ""
 
-#: Model/Server.php:137
+#: Model/Server.php:144
 msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
 msgstr ""
 
-#: Model/Server.php:143
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:151
+#: Model/Server.php:166
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:161
+#: Model/Server.php:176
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr ""
 
-#: Model/Server.php:170
+#: Model/Server.php:185
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:195
 msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
 msgstr ""
 
-#: Model/Server.php:179
+#: Model/Server.php:204
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:187
+#: Model/Server.php:212
 msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
 msgstr ""
 
-#: Model/Server.php:196
+#: Model/Server.php:221
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:198
+#: Model/Server.php:223
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:204;212;230;254;262;270;278;335;383;391;457
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
 msgid "This setting is deprecated and can be safely removed."
 msgstr ""
 
-#: Model/Server.php:220
+#: Model/Server.php:245
 msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
 msgstr ""
 
-#: Model/Server.php:238
+#: Model/Server.php:263
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:246
+#: Model/Server.php:271
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:286
+#: Model/Server.php:311
 msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:294
+#: Model/Server.php:319
 msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:302
+#: Model/Server.php:327
 msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:310
+#: Model/Server.php:335
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:318
+#: Model/Server.php:343
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:327
+#: Model/Server.php:352
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:329
+#: Model/Server.php:354
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:343
+#: Model/Server.php:368
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:351
+#: Model/Server.php:376
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:359
+#: Model/Server.php:384
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:367
+#: Model/Server.php:392
 msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
 msgstr ""
 
-#: Model/Server.php:375
+#: Model/Server.php:400
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:399
+#: Model/Server.php:424
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:407
+#: Model/Server.php:432
 msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
 msgstr ""
 
-#: Model/Server.php:416
+#: Model/Server.php:441
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:424
+#: Model/Server.php:449
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:432
+#: Model/Server.php:457
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:440
+#: Model/Server.php:465
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr ""
 
-#: Model/Server.php:449
+#: Model/Server.php:474
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:465
+#: Model/Server.php:490
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:473
+#: Model/Server.php:498
 msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
 msgstr ""
 
-#: Model/Server.php:481
+#: Model/Server.php:506
 msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
 msgstr ""
 
-#: Model/Server.php:489
+#: Model/Server.php:514
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:498
+#: Model/Server.php:523
 msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
 msgstr ""
 
-#: Model/Server.php:507
+#: Model/Server.php:532
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:516
+#: Model/Server.php:541
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:550
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:524
+#: Model/Server.php:558
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:533
+#: Model/Server.php:567
 msgid "Used on the login page, before the MISP logo"
 msgstr ""
 
-#: Model/Server.php:541
+#: Model/Server.php:575
 msgid "Used on the login page, after the MISP logo"
 msgstr ""
 
-#: Model/Server.php:549
+#: Model/Server.php:583
 msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:557
+#: Model/Server.php:591
 msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:565
+#: Model/Server.php:599
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:573
+#: Model/Server.php:607
 msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
 msgstr ""
 
-#: Model/Server.php:581
+#: Model/Server.php:615
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:589
+#: Model/Server.php:623
 msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
 msgstr ""
 
-#: Model/Server.php:597
+#: Model/Server.php:631
 msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
 msgstr ""
 
-#: Model/Server.php:605
+#: Model/Server.php:639
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:614
+#: Model/Server.php:648
 msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:623
+#: Model/Server.php:657
 msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:631
+#: Model/Server.php:665
 msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
 msgstr ""
 
-#: Model/Server.php:638
+#: Model/Server.php:672
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:645
+#: Model/Server.php:679
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:654
+#: Model/Server.php:688
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:662
+#: Model/Server.php:696
 msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
 msgstr ""
 
-#: Model/Server.php:671
+#: Model/Server.php:705
 msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
 msgstr ""
 
-#: Model/Server.php:680
+#: Model/Server.php:714
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:689
+#: Model/Server.php:723
 msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:698
+#: Model/Server.php:732
 msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:707
+#: Model/Server.php:741
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:717
+#: Model/Server.php:751
 msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
 msgstr ""
 
-#: Model/Server.php:726
+#: Model/Server.php:760
 msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
 msgstr ""
 
-#: Model/Server.php:735
+#: Model/Server.php:769
 msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
 msgstr ""
 
-#: Model/Server.php:744
+#: Model/Server.php:778
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:753
+#: Model/Server.php:787
 msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
 msgstr ""
 
-#: Model/Server.php:762
-msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/webroot/css directory and enter the name here."
+#: Model/Server.php:796
+msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
 msgstr ""
 
-#: Model/Server.php:771
+#: Model/Server.php:805
 msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
 msgstr ""
 
-#: Model/Server.php:780
+#: Model/Server.php:814
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr ""
 
-#: Model/Server.php:789
+#: Model/Server.php:823
 msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
 msgstr ""
 
-#: Model/Server.php:799
+#: Model/Server.php:833
 msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
 msgstr ""
 
-#: Model/Server.php:808
+#: Model/Server.php:842
 msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:816
+#: Model/Server.php:850
 msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:824
+#: Model/Server.php:858
 msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
 msgstr ""
 
-#: Model/Server.php:832
+#: Model/Server.php:866
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:841
+#: Model/Server.php:875
 msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
 msgstr ""
 
-#: Model/Server.php:849
+#: Model/Server.php:883
+msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
+msgstr ""
+
+#: Model/Server.php:891
 msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
 msgstr ""
 
-#: Model/Server.php:861
+#: Model/Server.php:903
 msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
 msgstr ""
 
-#: Model/Server.php:869
+#: Model/Server.php:911
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:877
+#: Model/Server.php:919
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:885
+#: Model/Server.php:927
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:893
+#: Model/Server.php:935
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:901
+#: Model/Server.php:943
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:910
+#: Model/Server.php:952
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:921
+#: Model/Server.php:963
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr ""
 
-#: Model/Server.php:929
+#: Model/Server.php:971
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:937
+#: Model/Server.php:979
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:945
+#: Model/Server.php:987
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:953
+#: Model/Server.php:995
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:965
+#: Model/Server.php:1007
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:973
+#: Model/Server.php:1015
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:981
+#: Model/Server.php:1023
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:989
+#: Model/Server.php:1031
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:997
+#: Model/Server.php:1039
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1008
+#: Model/Server.php:1050
 msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
 msgstr ""
 
-#: Model/Server.php:1017
+#: Model/Server.php:1059
 msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
 msgstr ""
 
-#: Model/Server.php:1026
+#: Model/Server.php:1068
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr ""
 
-#: Model/Server.php:1034
+#: Model/Server.php:1076
 msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 msgstr ""
 
-#: Model/Server.php:1042
+#: Model/Server.php:1084
 msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
 msgstr ""
 
-#: Model/Server.php:1051
+#: Model/Server.php:1093
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1060
+#: Model/Server.php:1102
 msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
 msgstr ""
 
-#: Model/Server.php:1069
+#: Model/Server.php:1111
 msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
 msgstr ""
 
-#: Model/Server.php:1071
+#: Model/Server.php:1113
 msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
 msgstr ""
 
-#: Model/Server.php:1081
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1089
+#: Model/Server.php:1149
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr ""
 
-#: Model/Server.php:1100
+#: Model/Server.php:1160
 msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
 msgstr ""
 
-#: Model/Server.php:1108
+#: Model/Server.php:1168
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr ""
 
-#: Model/Server.php:1116
+#: Model/Server.php:1176
 msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
 msgstr ""
 
-#: Model/Server.php:1125
-msgid "The timeout duration of sessions (in MINUTES)."
-msgstr ""
-
-#: Model/Server.php:1133
-msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
-msgstr ""
-
-#: Model/Server.php:1144
-msgid "The default policy action for the values added to the RPZ."
-msgstr ""
-
-#: Model/Server.php:1153
-msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
-msgstr ""
-
-#: Model/Server.php:1161
-msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
-msgstr ""
-
-#: Model/Server.php:1169
-msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1177
-msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
 #: Model/Server.php:1185
-msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
 msgstr ""
 
 #: Model/Server.php:1193
+msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
+msgstr ""
+
+#: Model/Server.php:1204
+msgid "The default policy action for the values added to the RPZ."
+msgstr ""
+
+#: Model/Server.php:1213
+msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
+msgstr ""
+
+#: Model/Server.php:1221
+msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
+msgstr ""
+
+#: Model/Server.php:1229
+msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1237
+msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1245
+msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1253
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1201
+#: Model/Server.php:1261
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1217
+#: Model/Server.php:1277
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:1225
+#: Model/Server.php:1285
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1233
+#: Model/Server.php:1293
 msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
 msgstr ""
 
-#: Model/Server.php:1242
+#: Model/Server.php:1302
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1251
+#: Model/Server.php:1311
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1260
+#: Model/Server.php:1320
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1269
+#: Model/Server.php:1329
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1278
+#: Model/Server.php:1338
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1287
+#: Model/Server.php:1347
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1296
+#: Model/Server.php:1356
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1304
+#: Model/Server.php:1364
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1312
+#: Model/Server.php:1372
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1320
+#: Model/Server.php:1380
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1328
+#: Model/Server.php:1388
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1336
+#: Model/Server.php:1396
 msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1344
+#: Model/Server.php:1404
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1352
+#: Model/Server.php:1412
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1360
+#: Model/Server.php:1420
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1368
+#: Model/Server.php:1428
 msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1376
+#: Model/Server.php:1436
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1384
-msgid "The URL(s) at which to access ElasticSearch - comma seperate if you want to have more than one."
+#: Model/Server.php:1444
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1392
+#: Model/Server.php:1452
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1460
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1468
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1416
+#: Model/Server.php:1476
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1424
+#: Model/Server.php:1484
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr ""
 
-#: Model/Server.php:1432
+#: Model/Server.php:1492
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:1440
+#: Model/Server.php:1500
 msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
 msgstr ""
 
-#: Model/Server.php:1449
+#: Model/Server.php:1509
 msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
 msgstr ""
 
-#: Model/Server.php:1457
+#: Model/Server.php:1517
 msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
 msgstr ""
 
-#: Model/Server.php:1465
+#: Model/Server.php:1525
 msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
 msgstr ""
 
-#: Model/Server.php:1475
+#: Model/Server.php:1535
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1484
+#: Model/Server.php:1544
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1493
+#: Model/Server.php:1553
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1502
+#: Model/Server.php:1562
 msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
 msgstr ""
 
-#: Model/Server.php:1511
+#: Model/Server.php:1571
 msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
 msgstr ""
 
-#: Model/Server.php:1520
+#: Model/Server.php:1580
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr ""
 
-#: Model/Server.php:1529
+#: Model/Server.php:1589
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1537
+#: Model/Server.php:1597
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1545
+#: Model/Server.php:1605
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1553;1665
+#: Model/Server.php:1613;1725
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:1561;1682
+#: Model/Server.php:1621;1742
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:1569
+#: Model/Server.php:1629
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1577
+#: Model/Server.php:1637
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1585
+#: Model/Server.php:1645
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1593
+#: Model/Server.php:1653
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1601
+#: Model/Server.php:1661
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:1609
+#: Model/Server.php:1669
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:1617
+#: Model/Server.php:1677
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1625
+#: Model/Server.php:1685
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:1633
+#: Model/Server.php:1693
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1641
+#: Model/Server.php:1701
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1649
+#: Model/Server.php:1709
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:1657
+#: Model/Server.php:1717
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:1673
+#: Model/Server.php:1733
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:1690
+#: Model/Server.php:1750
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:1699
+#: Model/Server.php:1759
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:1708
+#: Model/Server.php:1768
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr ""
 
-#: Model/Server.php:1717
+#: Model/Server.php:1777
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:1726
+#: Model/Server.php:1786
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:1735
+#: Model/Server.php:1795
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:1745
+#: Model/Server.php:1805
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:1754
+#: Model/Server.php:1814
 msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
 msgstr ""
 
-#: Model/Server.php:2401
+#: Model/Server.php:1947
+msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/Server.php:2054
+msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+msgstr ""
+
+#: Model/Server.php:2056
+msgid "Sorry, this is not yet implemented"
+msgstr ""
+
+#: Model/Server.php:2057
+msgid "Something went wrong while trying to pull"
+msgstr ""
+
+#: Model/Server.php:2069;2071
+msgid "Unknown issue."
+msgstr ""
+
+#: Model/Server.php:2535
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:2404
+#: Model/Server.php:2538
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:2412
+#: Model/Server.php:2546
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:2527
+#: Model/Server.php:2661
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3130
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
 msgid "Organisation logos"
 msgstr "Loga organizace"
 
-#: Model/Server.php:3131
+#: Model/Server.php:3476
 msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
 msgstr "Logo používané organizací na index událostí, zobrazení události, diskuse, návrhy, atd. Ujistěte se, že název souboru je ve formátu org.png, kde org je název organizace - malá a velká písmena."
 
-#: Model/Server.php:3133
+#: Model/Server.php:3478
 msgid "48x48 pixel .png files"
 msgstr "soubory PNG 48 x 48 pixelů"
 
-#: Model/Server.php:3136;3151
+#: Model/Server.php:3481;3496
 msgid "Filename must be in the following format: *.png"
 msgstr "Název souboru musí být v následujícím formátu: *.png"
 
-#: Model/Server.php:3140
+#: Model/Server.php:3485
 msgid "Additional image files"
 msgstr "Další obrázky"
 
-#: Model/Server.php:3141
+#: Model/Server.php:3486
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:3148
+#: Model/Server.php:3493
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:3765
+#: Model/Server.php:3665
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr ""
+
+#: Model/Server.php:4115
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:3766
+#: Model/Server.php:4116
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:3770
+#: Model/Server.php:4120
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:3771
+#: Model/Server.php:4121
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
@@ -2029,7 +2311,7 @@ msgstr ""
 
 #: View/Attributes/add.ctp:7
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Přidat atribut"
@@ -2074,7 +2356,7 @@ msgstr "Typ "
 #: View/Attributes/add.ctp:36
 #: View/Attributes/add_attachment.ctp:24
 #: View/Attributes/edit.ctp:24
-#: View/Events/add.ctp:24
+#: View/Events/add.ctp:20
 msgid "Distribution "
 msgstr "Distribuce "
 
@@ -2082,7 +2364,7 @@ msgstr "Distribuce "
 #: View/Attributes/add_attachment.ctp:33
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
-#: View/Events/add.ctp:34
+#: View/Events/add.ctp:30
 #: View/Events/edit.ctp:26
 #: View/Feeds/add.ctp:176
 #: View/Feeds/edit.ctp:172
@@ -2109,23 +2391,24 @@ msgstr "Kontextový komentář"
 msgid "for Intrusion Detection System"
 msgstr "pro systém detekce vniknutí - IDS"
 
-#: View/Attributes/add.ctp:87
+#: View/Attributes/add.ctp:91
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_mitre_attack_matrix.ctp:14;113
+#: View/Elements/view_galaxy_matrix.ctp:76;199
 #: View/Events/contact.ctp:29
 #: View/Events/edit.ctp:59
 #: View/Events/free_text_import.ctp:27
 #: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:78
+#: View/ObjectReferences/ajax/add.ctp:130
 #: View/Objects/add.ctp:147
 #: View/Objects/revise_object.ctp:85
 #: View/Organisations/admin_add.ctp:49
 #: View/Organisations/admin_edit.ctp:60
-#: View/Servers/add.ctp:126
-#: View/Servers/edit.ctp:167
-#: View/SharingGroups/add.ctp:75
+#: View/Servers/add.ctp:115
+#: View/Servers/edit.ctp:162
+#: View/SharingGroups/add.ctp:115
+#: View/TagCollections/add.ctp:21
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
 #: View/TemplateElements/ajax/template_element_add_file.ctp:67
 #: View/TemplateElements/ajax/template_element_add_text.ctp:29
@@ -2134,7 +2417,7 @@ msgstr "pro systém detekce vniknutí - IDS"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/Users/admin_add.ctp:97
 #: View/Users/admin_edit.ctp:91
-#: View/Users/admin_email.ctp:51
+#: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
 #: View/Users/change_pw.ctp:23
 #: View/Users/edit.ctp:41
@@ -2142,14 +2425,17 @@ msgstr "pro systém detekce vniknutí - IDS"
 msgid "Submit"
 msgstr "Odeslat"
 
-#: View/Attributes/add.ctp:88
+#: View/Attributes/add.ctp:92
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:62
+#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/exportSearch.ctp:32
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Elements/eventattributecreation.ctp:89
-#: View/Elements/view_mitre_attack_matrix.ctp:114
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/view_galaxy_matrix.ctp:200
 #: View/Elements/serverRuleElements/pull.ctp:70
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2158,21 +2444,18 @@ msgstr "Odeslat"
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/ajax/enrich_event.ctp:21
+#: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:15
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/exportChoice.ctp:51
 #: View/Events/ajax/importChoice.ctp:12
 #: View/Events/ajax/quick_edit.ctp:6
-#: View/Galaxies/ajax/cluster_choice.ctp:32
-#: View/Galaxies/ajax/galaxy_choice.ctp:22
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:15
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
-#: View/ObjectReferences/ajax/add.ctp:82
+#: View/ObjectReferences/ajax/add.ctp:134
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/ObjectTemplates/ajax/object_choice.ctp:10
 #: View/Objects/add.ctp:153
 #: View/Objects/revise_object.ctp:87
 #: View/Objects/ajax/delete.ctp:24
@@ -2187,11 +2470,12 @@ msgstr "Odeslat"
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
 #: View/Sightings/ajax/advanced.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
-#: View/Tags/ajax/select_tag.ctp:32
-#: View/Tags/ajax/taxonomy_choice.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:6
 #: View/TemplateElements/ajax/template_element_add_file.ctp:73
@@ -2201,6 +2485,7 @@ msgstr "Odeslat"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:35
 #: View/Templates/ajax/template_choices.ctp:15
 #: View/Users/admin_filter_user_index.ctp:107
+#: View/Users/ajax/emailConfirmTemplate.ctp:14
 #: View/Users/ajax/fetchpgpkey.ctp:24
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
@@ -2239,8 +2524,6 @@ msgstr "ID události"
 #: View/Elements/Users/userIndexTable.ctp:4
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_view.ctp:14
-#: View/Users/view.ctp:14
 msgid "Org"
 msgstr "Org"
 
@@ -2255,7 +2538,7 @@ msgid "Event date"
 msgstr "Datum události"
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Event graph"
 msgstr "Graf události"
 
@@ -2283,12 +2566,12 @@ msgstr "Označit všechny nové atributy jako pro IDS"
 
 #: View/Attributes/attribute_replace.ctp:26
 #: View/Noticelists/view.ctp:36
-#: View/Warninglists/view.ctp:54
+#: View/Warninglists/view.ctp:35
 msgid "Values"
 msgstr "Hodnoty"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:75
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:46
@@ -2322,7 +2605,7 @@ msgstr "Žádné selhané kompozity"
 msgid "disabled"
 msgstr "zakázáno"
 
-#: View/Attributes/edit.ctp:64
+#: View/Attributes/edit.ctp:68
 #: View/ShadowAttributes/add.ctp:55
 #: View/ShadowAttributes/edit.ctp:45;54
 msgid "Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this."
@@ -2330,7 +2613,7 @@ msgstr ""
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -2338,10 +2621,6 @@ msgstr ""
 msgid "Attributes"
 msgstr "Atributy"
 
-#: View/Attributes/index.ctp:7
-msgid "Results for all attributes"
-msgstr "Výsledky pro všechny atributy"
-
 #: View/Attributes/index.ctp:8
 msgid " with the value containing "
 msgstr "s hodnotou obsahující "
@@ -2354,57 +2633,67 @@ msgstr " je označeno "
 msgid " from the events "
 msgstr " od událostí "
 
-#: View/Attributes/index.ctp:12
-msgid " of category "
-msgstr " z kategorie "
+#: View/Attributes/index.ctp:11
+msgid " carrying the tag(s) "
+msgstr ""
 
-#: View/Attributes/index.ctp:13
+#: View/Attributes/index.ctp:12
 msgid " of type "
 msgstr " typu "
 
-#: View/Attributes/index.ctp:14
-msgid " created by the organisation "
-msgstr " vytvořeno organizací "
+#: View/Attributes/index.ctp:13
+msgid " of category "
+msgstr " z kategorie "
 
-#: View/Attributes/index.ctp:28;173
-#: View/Elements/eventattribute.ctp:60;258
+#: View/Attributes/index.ctp:14
+msgid " created by organisation "
+msgstr ""
+
+#: View/Attributes/index.ctp:26
+msgid "Results for all attributes"
+msgstr "Výsledky pro všechny atributy"
+
+#: View/Attributes/index.ctp:39;132
+#: View/Elements/eventattribute.ctp:60;229
 #: View/Elements/eventdiscussion.ctp:15;126
+#: View/Elements/generic_table.ctp:16
+#: View/Elements/generic_table_row.ctp:16
 #: View/Elements/Feeds/eventattribute.ctp:20;86
 #: View/Elements/Servers/eventattribute.ctp:20;86
 #: View/EventBlacklists/index.ctp:13;54
-#: View/Events/index.ctp:12;89
+#: View/Events/index.ctp:12;115
 #: View/Events/proposal_event_index.ctp:12;95
 #: View/Events/ajax/index.ctp:13;39
 #: View/Feeds/freetext_index.ctp:22;86
-#: View/Feeds/index.ctp:20;230
-#: View/Feeds/preview_index.ctp:14;82
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
 #: View/Galaxies/index.ctp:13;53
-#: View/GalaxyClusters/ajax/index.ctp:11;96
+#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:33;162
-#: View/Logs/admin_index.ctp:37;111
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
 #: View/Logs/event_index.ctp:17;61
 #: View/News/index.ctp:39
 #: View/Noticelists/index.ctp:13;83
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
-#: View/ObjectTemplates/index.ctp:13;126
+#: View/ObjectTemplates/index.ctp:13;137
 #: View/OrgBlacklists/index.ctp:13;52
-#: View/Organisations/index.ctp:42;138
+#: View/Organisations/index.ctp:42;159
 #: View/Regexp/admin_index.ctp:13;51
 #: View/Regexp/index.ctp:13;45
 #: View/Roles/admin_index.ctp:13;82
 #: View/Roles/index.ctp:13;55
-#: View/Servers/index.ctp:13;117
-#: View/Servers/preview_index.ctp:15;164
-#: View/ShadowAttributes/index.ctp:12;108
-#: View/SharingGroups/index.ctp:13;86
+#: View/Servers/index.ctp:13;156
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;63
-#: View/Taxonomies/view.ctp:53;169
+#: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:12;56
+#: View/Users/admin_index.ctp:12;86
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -2412,45 +2701,47 @@ msgstr " vytvořeno organizací "
 msgid "previous"
 msgstr "předchozí"
 
-#: View/Attributes/index.ctp:30;175
-#: View/Elements/eventattribute.ctp:62;260
+#: View/Attributes/index.ctp:41;134
+#: View/Elements/eventattribute.ctp:62;231
 #: View/Elements/eventdiscussion.ctp:17;128
+#: View/Elements/generic_table.ctp:18
+#: View/Elements/generic_table_row.ctp:18
 #: View/Elements/Feeds/eventattribute.ctp:22;88
 #: View/Elements/Servers/eventattribute.ctp:22;88
 #: View/EventBlacklists/index.ctp:15;56
-#: View/Events/index.ctp:14;91
+#: View/Events/index.ctp:14;117
 #: View/Events/proposal_event_index.ctp:14;97
 #: View/Events/ajax/index.ctp:15;41
 #: View/Feeds/freetext_index.ctp:24;88
-#: View/Feeds/index.ctp:22;232
-#: View/Feeds/preview_index.ctp:16;84
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
 #: View/Galaxies/index.ctp:15;55
-#: View/GalaxyClusters/ajax/index.ctp:13;98
+#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:35;164
-#: View/Logs/admin_index.ctp:39;113
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
 #: View/Logs/event_index.ctp:19;63
 #: View/News/index.ctp:41
 #: View/Noticelists/index.ctp:15;85
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
-#: View/ObjectTemplates/index.ctp:15;128
+#: View/ObjectTemplates/index.ctp:15;139
 #: View/OrgBlacklists/index.ctp:15;54
-#: View/Organisations/index.ctp:44;140
+#: View/Organisations/index.ctp:44;161
 #: View/Regexp/admin_index.ctp:15;53
 #: View/Regexp/index.ctp:15;47
 #: View/Roles/admin_index.ctp:15;84
 #: View/Roles/index.ctp:15;57
-#: View/Servers/index.ctp:15;119
-#: View/Servers/preview_index.ctp:17;166
-#: View/ShadowAttributes/index.ctp:14;110
-#: View/SharingGroups/index.ctp:15;88
+#: View/Servers/index.ctp:15;158
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;65
-#: View/Taxonomies/view.ctp:55;171
+#: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:14;58
+#: View/Users/admin_index.ctp:14;88
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -2458,66 +2749,144 @@ msgstr "předchozí"
 msgid "next"
 msgstr "další"
 
-#: View/Attributes/index.ctp:148
-msgid "Are you sure you want to delete this attribute?"
-msgstr "Opravdu chcete odstranit tento atribut?"
+#: View/Attributes/index.ctp:53
+#: View/Elements/eventattribute.ctp:152
+#: View/Elements/Events/eventIndexTable.ctp:37
+#: View/Elements/Feeds/eventattribute.ctp:45
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/view.ctp:117
+#: View/Feeds/preview_event.ctp:16
+#: View/Noticelists/view.ctp:43
+#: View/Pages/doc/using_the_system.ctp:164;207;318
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
+#: View/Tags/index.ctp:10
+#: View/Templates/add.ctp:12
+#: View/Templates/edit.ctp:12
+#: View/Templates/view.ctp:19
+msgid "Tags"
+msgstr ""
 
-#: View/Attributes/index.ctp:151
-msgid "Propose an edit"
-msgstr "Navrhnout úpravu"
+#: View/Attributes/index.ctp:54
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/Galaxies/index.ctp:2
+msgid "Galaxies"
+msgstr ""
 
-#: View/Attributes/index.ctp:155
-#: View/Elements/Events/eventIndexTable.ctp:82;86;229
-#: View/Elements/Users/userIndexTable.ctp:94
-#: View/Elements/dashboard/dashboard_events.ctp:4;5
-#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
-#: View/Events/proposal_event_index.ctp:45;49
-#: View/Feeds/preview_index.ctp:66
-#: View/Noticelists/index.ctp:66
-#: View/ObjectTemplates/index.ctp:104
-#: View/Organisations/index.ctp:122
-#: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/preview_index.ctp:148
-#: View/Taxonomies/index.ctp:47
-#: View/Warninglists/index.ctp:60
-msgid "View"
-msgstr "Náhled"
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:161
+msgid "Correlate"
+msgstr ""
 
-#: View/Attributes/index.ctp:166
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Events/view.ctp:314
+#: View/Feeds/preview_event.ctp:73
+#: View/Pages/doc/using_the_system.ctp:235
+#: View/Servers/preview_event.ctp:95
+msgid "Related Events"
+msgstr ""
+
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:163
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+msgid "Feed hits"
+msgstr ""
+
+#: View/Attributes/index.ctp:61
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
+msgid "Sightings"
+msgstr ""
+
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
+#: View/Tags/index.ctp:73
+msgid "Activity"
+msgstr ""
+
+#: View/Attributes/index.ctp:63
+#: View/Elements/eventattribute.ctp:168
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/healthElements/files.ctp:33
+#: View/Elements/healthElements/workers.ctp:60
+#: View/Elements/templateElements/templateRowAttribute.ctp:94
+#: View/Elements/templateElements/templateRowFile.ctp:71
+#: View/Elements/templateElements/templateRowText.ctp:28
+#: View/EventBlacklists/index.ctp:27
+#: View/Events/export.ctp:31
+#: View/Events/resolved_attributes.ctp:53
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:51
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:66
+#: View/OrgBlacklists/index.ctp:26
+#: View/Organisations/index.ctp:102
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:25
+#: View/Roles/admin_index.ctp:35
+#: View/Servers/index.ctp:37
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:27
+#: View/Templates/index.ctp:27
+#: View/Threads/index.ctp:28
+#: View/Warninglists/index.ctp:38
+#: View/Whitelists/admin_index.ctp:24
+msgid "Actions"
+msgstr ""
+
+#: View/Attributes/index.ctp:125
 #: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
 #: View/EventBlacklists/index.ctp:47
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:223
-#: View/Feeds/preview_index.ctp:74
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
 #: View/Galaxies/index.ctp:46
-#: View/GalaxyClusters/ajax/index.ctp:90
+#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:155
-#: View/Logs/admin_index.ctp:104
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
 #: View/Logs/event_index.ctp:54
 #: View/News/index.ctp:33
 #: View/Noticelists/index.ctp:76
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:66
-#: View/ObjectTemplates/index.ctp:119
+#: View/ObjectTemplates/index.ctp:130
 #: View/OrgBlacklists/index.ctp:45
-#: View/Organisations/index.ctp:131
+#: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
 #: View/Roles/admin_index.ctp:75
 #: View/Roles/index.ctp:48
-#: View/Servers/index.ctp:110
-#: View/Servers/preview_index.ctp:156
-#: View/ShadowAttributes/index.ctp:101
-#: View/SharingGroups/index.ctp:79
+#: View/Servers/index.ctp:149
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:56
-#: View/Taxonomies/view.ctp:162
+#: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:49
+#: View/Users/admin_index.ctp:79
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -2564,26 +2933,22 @@ msgid "Containing the following expressions"
 msgstr ""
 
 #: View/Attributes/search.ctp:11
-msgid "Being an attribute matching the following tags"
+msgid "Having tag or being an attribute of an event having the tag"
 msgstr ""
 
 #: View/Attributes/search.ctp:12
 msgid "Being attributes of the following event IDs, event UUIDs or attribute UUIDs"
 msgstr ""
 
-#: View/Attributes/search.ctp:13
-msgid "Being an attribute of an event matching the following tags"
-msgstr ""
-
-#: View/Attributes/search.ctp:20
+#: View/Attributes/search.ctp:15
 msgid "From the following organisation(s)"
 msgstr ""
 
-#: View/Attributes/search.ctp:36
-msgid "Only find IOCs to use in IDS"
+#: View/Attributes/search.ctp:29
+msgid "Only find IOCs flagged as to_ids"
 msgstr ""
 
-#: View/Attributes/search.ctp:40
+#: View/Attributes/search.ctp:33
 msgid "Alternate Search Result (Events)"
 msgstr ""
 
@@ -2601,26 +2966,26 @@ msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90
-#: View/Elements/galaxyQuickView.ctp:23
-#: View/Elements/side_menu.ctp:351
-#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/eventIndexTable.ctp:229
 #: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:30
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Roles/admin_index.ctp:67
-#: View/Servers/index.ctp:99
+#: View/Servers/index.ctp:138
 #: View/Tags/index.ctp:125
 msgid "Delete"
 msgstr "Odstranit"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
@@ -2634,34 +2999,36 @@ msgstr "Odstranit"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:56
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:168
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
 #: View/Events/ajax/handleSelected.ctp:17
 #: View/Events/ajax/toggle_correlation.ctp:20
 #: View/Feeds/preview_event.ctp:56
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:79
 #: View/Servers/ajax/update.ctp:11
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
 #: View/Templates/view.ctp:41
-#: View/Users/admin_view.ctp:32;37;104;114;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:27
 msgid "Yes"
 msgstr "Ano"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:21
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
@@ -2675,29 +3042,30 @@ msgstr "Ano"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:58;176
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:166
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/handleSelected.ctp:22
 #: View/Events/ajax/toggle_correlation.ctp:25
 #: View/Feeds/preview_event.ctp:61;66
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:89
 #: View/Servers/ajax/update.ctp:16
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
 #: View/Templates/view.ctp:42
-#: View/Users/admin_view.ctp:32;37;106;116;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
 msgid "No"
@@ -2706,7 +3074,6 @@ msgstr "Ne"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:5
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:5
 #: View/Attributes/ajax/attributeEditValueForm.ctp:6
 msgid "Accept change"
@@ -2715,7 +3082,6 @@ msgstr "Přijmout změnu"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:6
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
 msgid "Discard change"
@@ -2732,7 +3098,7 @@ msgstr "Neměňte aktuální nastavení"
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/view.ctp:143
+#: View/Events/view.ctp:145
 #: View/Feeds/add.ctp:167
 #: View/Feeds/edit.ctp:164
 #: View/Feeds/freetext_index.ctp:36
@@ -2754,6 +3120,50 @@ msgstr ""
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr ""
 
+#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+msgid "Tags to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+msgid "Tags to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+msgid "Clusters to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+msgid "Clusters to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr "zap."
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr "vyp."
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
 #: View/Attributes/ajax/attributeRestorationForm.ctp:5
 msgid "Attribute Restoration"
 msgstr ""
@@ -2762,6 +3172,15 @@ msgstr ""
 msgid "Are you sure you want to undelete Attribute #%s?"
 msgstr ""
 
+#: View/Attributes/ajax/exportSearch.ctp:2
+msgid "Choose the format that you wish to download the search results in"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:10;23
+#: View/Events/ajax/exportChoice.ctp:17;18;27;28
+msgid "Export as %s"
+msgstr ""
+
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
 msgid "Remove Tag"
 msgstr ""
@@ -2782,16 +3201,6 @@ msgstr "Odstranit"
 msgid "Toggle Correlation %s "
 msgstr ""
 
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "on"
-msgstr "zap."
-
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "off"
-msgstr "vyp."
-
 #: View/Attributes/ajax/toggle_correlation.ctp:11
 msgid "Re-enable the correlation for this attribute."
 msgstr ""
@@ -2804,13 +3213,21 @@ msgstr ""
 msgid "Toggle correlation for attribute"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:25
+#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Elements/ajaxTagCollectionTags.ctp:16
 #: View/Elements/ajaxTags.ctp:14
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr ""
 
+#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Pages/doc/using_the_system.ctp:303
+#: View/Templates/add.ctp:17
+#: View/Templates/edit.ctp:17
+msgid "Add tag"
+msgstr ""
+
 #: View/Elements/ajaxTags.ctp:17
 msgid "Remove tag %s"
 msgstr ""
@@ -2821,215 +3238,33 @@ msgstr ""
 msgid "Add a tag"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:71;269
+#: View/Elements/eventattribute.ctp:71;240
 #: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
 #: View/Elements/Servers/eventattribute.ctp:28;31;94;97
 msgid "view all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:117
-#: View/Pages/doc/using_the_system.ctp:86
-msgid "Add attribute"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:118
-msgid "Edit selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:119
-msgid "Tag selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:120
-msgid "Delete selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:121
-msgid "Accept selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:122
-msgid "Discard selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:123
-msgid "Sightings display for selected attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:127
-msgid "Populate using a template"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:129
-msgid "Populate using the freetext import tool"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:131
-msgid "Replace all attributes of a category/type combination within the event"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:140;159
-msgid "Show all attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:144
-msgid "Only show %s related attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:148
-msgid "Only show proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:148
-#: View/Logs/event_index.ctp:44
-msgid "Proposal"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:149
-msgid "Only show correlating attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Only show potentially false positive attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Warnings"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:152
-msgid "Include deleted attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show attribute context fields"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show context fields"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:157
-msgid "Filter on attributes value"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:159
-#: View/Events/index.ctp:41
-#: View/Servers/preview_index.ctp:42
-#: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:37
-msgid "Remove filters"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 msgid "Select all attributes/proposals on current page"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:188
-#: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/view.ctp:121
-#: View/Feeds/preview_event.ctp:16
-#: View/Noticelists/view.ctp:43
-#: View/Pages/doc/using_the_system.ctp:164;207;318
-#: View/Servers/preview_event.ctp:27
-#: View/Servers/preview_index.ctp:68
-#: View/Tags/index.ctp:10
-#: View/Templates/add.ctp:12
-#: View/Templates/edit.ctp:12
-#: View/Templates/view.ctp:19
-msgid "Tags"
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:189
-#: View/Elements/global_menu.ctp:56
-#: View/Events/view.ctp:387
-#: View/Galaxies/index.ctp:2
-msgid "Galaxies"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:191
-msgid "Correlate"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:192
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:263
-#: View/Feeds/preview_event.ctp:73
-#: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:95
-msgid "Related Events"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:193
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
-msgid "Feed hits"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:196
-#: View/Events/view.ctp:198
-msgid "Sightings"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:197
-#: View/Events/view.ctp:205
-#: View/Tags/index.ctp:73
-msgid "Activity"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:198
-#: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/healthElements/files.ctp:33
-#: View/Elements/healthElements/workers.ctp:55
-#: View/Elements/templateElements/templateRowAttribute.ctp:94
-#: View/Elements/templateElements/templateRowFile.ctp:71
-#: View/Elements/templateElements/templateRowText.ctp:28
-#: View/EventBlacklists/index.ctp:27
-#: View/Events/export.ctp:31
-#: View/Events/resolved_attributes.ctp:53
-#: View/Feeds/index.ctp:61
-#: View/Feeds/preview_index.ctp:38
-#: View/GalaxyClusters/ajax/index.ctp:51
-#: View/Noticelists/index.ctp:37
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:55
-#: View/OrgBlacklists/index.ctp:26
-#: View/Organisations/index.ctp:81
-#: View/Pages/doc/using_the_system.ctp:187;238;286;382
-#: View/Regexp/admin_index.ctp:25
-#: View/Roles/admin_index.ctp:35
-#: View/Servers/index.ctp:36
-#: View/Servers/preview_index.ctp:80
-#: View/SharingGroups/add.ctp:34;54
-#: View/SharingGroups/edit.ctp:34;62
-#: View/SharingGroups/index.ctp:30
-#: View/Sightings/ajax/list_sightings.ctp:11
-#: View/Tags/index.ctp:76
-#: View/Taxonomies/index.ctp:27
-#: View/Templates/index.ctp:27
-#: View/Threads/index.ctp:28
-#: View/Warninglists/index.ctp:38
-#: View/Whitelists/admin_index.ctp:24
-msgid "Actions"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:238
+#: View/Elements/eventattribute.ctp:209
 msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
 "a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
 "attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:242
+#: View/Elements/eventattribute.ctp:213
 msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
 msgstr ""
 
@@ -3037,6 +3272,140 @@ msgstr ""
 msgid "Create multiple attributes one per line"
 msgstr ""
 
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr ""
+
 #: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr ""
@@ -3046,14 +3415,14 @@ msgid "Deactivated user"
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:223
-#: View/Elements/Events/View/row_attribute.ctp:299
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/View/row_attribute.ctp:380
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/Feeds/edit.ctp:193
 #: View/OrgBlacklists/edit.ctp:22
 #: View/Pages/doc/using_the_system.ctp:191
-#: View/Servers/index.ctp:98
-#: View/Tags/edit.ctp:35
+#: View/Servers/index.ctp:137
+#: View/Tags/edit.ctp:36
 #: View/Templates/edit.ctp:49
 msgid "Edit"
 msgstr ""
@@ -3081,12 +3450,12 @@ msgid "Insert a link to an event - just enter the event ID between the [event][/
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:180;191
+#: View/Events/view.ctp:196;207
 #: View/Objects/orphaned_object_diagnostics.ctp:21
 #: View/Pages/doc/administration.ctp:167
 #: View/Pages/doc/using_the_system.ctp:200;279
 #: View/Posts/add.ctp:33
-#: View/ShadowAttributes/index.ctp:31
+#: View/ShadowAttributes/index.ctp:41
 msgid "Event"
 msgstr ""
 
@@ -3121,9 +3490,19 @@ msgid "Code"
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:156
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr ""
 
+#: View/Elements/flashErrorMessage.ctp:2
+msgid "Errors"
+msgstr ""
+
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Jobs/ajax/error.ctp:34
+msgid "Close"
+msgstr ""
+
 #: View/Elements/footer.ctp:5
 msgid "Keyboard shortcuts for this page"
 msgstr ""
@@ -3135,8 +3514,8 @@ msgstr ""
 #: View/Elements/footer.ctp:15
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:60
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
 msgid "GnuPG key"
 msgstr ""
 
@@ -3152,32 +3531,36 @@ msgstr ""
 msgid "View details about this galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:17
+#: View/Elements/galaxyQuickView.ctp:19
 #: View/Elements/galaxyQuickViewMini.ctp:69
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:18
+#: View/Elements/galaxyQuickView.ctp:20
 #: View/Elements/galaxyQuickViewMini.ctp:70
 msgid "View all events containing this cluster."
 msgstr ""
 
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
 #: View/Elements/galaxyQuickView.ctp:24
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:74
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 #: View/EventBlacklists/add.ctp:35
 #: View/EventBlacklists/edit.ctp:29
-#: View/Events/add.ctp:72
+#: View/Events/add.ctp:68
 #: View/Events/filter_event_index.ctp:125
 #: View/Feeds/add.ctp:198
 #: View/Feeds/import_feeds.ctp:19
@@ -3187,113 +3570,139 @@ msgstr ""
 #: View/Roles/admin_add.ctp:44
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 #: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:19
 #: View/Tags/add.ctp:35
 #: View/Users/admin_filter_user_index.ctp:62
 #: View/Whitelists/admin_add.ctp:13
 msgid "Add"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/side_menu.ctp:174;188
+#: View/Elements/generic_picker.ctp:205
+msgid "Due to the large number of options, no contextual information is provided."
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:273
+msgid "Nothing to pick"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:11
+#: View/Pages/doc/general.ctp:20
+msgid "Event Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:26
-#: View/Elements/side_menu.ctp:179;194
-#: View/Events/add.ctp:8
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
+#: View/Events/add.ctp:4
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:28
-#: View/Elements/side_menu.ctp:213
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/side_menu.ctp:218
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:30
-#: View/Elements/side_menu.ctp:206
-#: View/Servers/rest.ctp:4
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
+#: View/Servers/rest.ctp:20
 msgid "REST client"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:32
-#: View/Elements/side_menu.ctp:238
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:35
-#: View/Elements/side_menu.ctp:446
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
+#: View/Pages/doc/general.ctp:39
+msgid "Events with proposals"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:37
-#: View/Elements/side_menu.ctp:450
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
+msgid "List Tag Collections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 #: View/Tags/edit.ctp:4
 msgid "Add Tag"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:39
-#: View/Elements/side_menu.ctp:471
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:41
-#: View/Elements/side_menu.ctp:485
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:43
-#: View/Elements/side_menu.ctp:487
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:46
-#: View/Elements/side_menu.ctp:247
+#: View/Elements/global_menu.ctp:78
 #: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:48
-#: View/Elements/side_menu.ctp:253
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
+#: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
 #: View/Pages/doc/using_the_system.ctp:15;361
 msgid "Automation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:60
-#: View/Elements/side_menu.ctp:529
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:67
+#: View/Elements/global_menu.ctp:101
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:72;76
+#: View/Elements/global_menu.ctp:104;109
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -3302,7 +3711,7 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:73;77
+#: View/Elements/global_menu.ctp:114;119
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -3311,82 +3720,88 @@ msgstr ""
 msgid "Signature Whitelist"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:79
-#: View/Elements/side_menu.ctp:274
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:80
-#: View/Elements/side_menu.ctp:283
+#: View/Elements/global_menu.ctp:128
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:90
+#: View/Elements/global_menu.ctp:135
+#: View/Pages/doc/general.ctp:22;54
+msgid "Global Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:139
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:91
-#: View/Elements/side_menu.ctp:311
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:92;203
-#: View/Elements/side_menu.ctp:312
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:96
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
-#: View/Users/statistics_data.ctp:32
+#: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:100
-#: View/Elements/side_menu.ctp:325
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:102
-#: View/Elements/side_menu.ctp:552
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:104
-#: View/Elements/side_menu.ctp:331
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:106
-#: View/Elements/side_menu.ctp:332
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:109
-#: View/Elements/side_menu.ctp:334
-#: View/Events/automation.ctp:42
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
+#: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:110
-#: View/Elements/side_menu.ctp:335
-#: View/Pages/doc/general.ctp:61
-#: View/Pages/doc/user_management.ctp:54
-msgid "Terms &amp; Conditions"
+#: View/Elements/global_menu.ctp:186
+msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:111
-#: View/Elements/side_menu.ctp:336
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -3399,30 +3814,34 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:113
+#: View/Elements/global_menu.ctp:201
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:114
+#: View/Elements/global_menu.ctp:205
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:125
-#: View/Elements/side_menu.ctp:354
+#: View/Elements/global_menu.ctp:212
+#: View/Pages/doc/general.ctp:23;66
+msgid "Sync Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:127
-#: View/Elements/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:136
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/administration.ctp:8
-#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
 #: View/Pages/doc/quickstart.ctp:8
@@ -3431,95 +3850,100 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:140
-#: View/Elements/side_menu.ctp:376
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:141
-#: View/Elements/side_menu.ctp:375
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
 msgid "Add User"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:142
-#: View/Elements/side_menu.ctp:379
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:144
-#: View/Elements/side_menu.ctp:316;391
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
 msgid "List Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:146
-#: View/Elements/side_menu.ctp:383
-msgid "Add Organisation"
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:149
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:151
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-msgid "Maintenance"
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:158
-#: View/Elements/side_menu.ctp:401
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:160
-#: View/Elements/side_menu.ctp:403
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:165
-#: View/Elements/side_menu.ctp:407
+#: View/Elements/global_menu.ctp:300
+msgid "Blacklist Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
 msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:169
+#: View/Elements/global_menu.ctp:314
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/side_menu.ctp:411
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
 msgid "Manage Org Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:180
+#: View/Elements/global_menu.ctp:327
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:184
-#: View/Elements/side_menu.ctp:417
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:185
-#: View/Elements/side_menu.ctp:418
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:207;209
+#: View/Elements/global_menu.ctp:362;367
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -3540,407 +3964,8 @@ msgstr ""
 msgid "Attributes per organization"
 msgstr ""
 
-#: View/Elements/side_menu.ctp:17;78
-msgid "Populate From Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:24
-msgid "Freetext Import Result"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:31
-msgid "View Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:36;465;540
-msgid "View Correlation Graph"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:41
-msgid "View Event History"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:48
-#: View/Events/edit.ctp:8
-msgid "Edit Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:50
-msgid "Delete Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:50;267;298;351;371
-#: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Servers/index.ctp:99
-msgid "Are you sure you want to delete # %s?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:61
-msgid "Add Object"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:66
-msgid "Add Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:73
-msgid "Populate from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:86
-#: View/Events/ajax/enrich_event.ctp:2
-msgid "Enrich Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:91
-msgid "Merge attributes from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:98
-msgid "Propose Attribute"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:103
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:115
-#: View/Elements/Events/eventIndexTable.ctp:218
-msgid "Publish Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:123
-msgid "Publish (no email)"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:132
-msgid "Delegate Publishing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:143
-#: View/EventDelegations/ajax/accept_delegation.ctp:2
-msgid "Accept Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:151
-msgid "Discard Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:157
-msgid "Publish event to ZMQ"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:162
-msgid "Contact Reporter"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:169
-msgid "Download as..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:201
-msgid "Import from…"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:224
-msgid "Download results as JSON"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:228
-msgid "Download results as XML"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:232
-msgid "Download results as CSV"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:242
-#: View/Pages/doc/general.ctp:39
-msgid "Events with proposals"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:259
-msgid "List Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:261
-msgid "New Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:262
-msgid "Perform on existing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:266
-msgid "Edit Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:267
-msgid "Delete Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:273
-msgid "View Warninglist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:276
-msgid "Update Warninglists"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:282
-msgid "View Noticelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:285
-msgid "Update Noticelists"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:291
-msgid "List Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:293
-msgid "New Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:297
-msgid "Edit Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:298
-msgid "Delete Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:305
-#: View/Users/edit.ctp:4
-msgid "Edit My Profile"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:306
-#: View/Pages/doc/administration.ctp:126
-#: View/Users/admin_edit.ctp:70
-#: View/Users/change_pw.ctp:4
-msgid "Change Password"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:321;389
-msgid "View Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:328
-#: View/SharingGroups/edit.ctp:3
-msgid "Edit Sharing Group"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:329
-msgid "View Sharing Group"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:342
-msgid "Explore Remote Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:343
-msgid "Fetch This Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:343
-#: View/Feeds/preview_index.ctp:65
-#: View/Servers/preview_index.ctp:147
-msgid "Are you sure you want to fetch and save this event on your instance?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:344;347
-msgid "Explore Remote Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:350
-#: View/Servers/edit.ctp:4
-msgid "Edit Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:356
-msgid "New Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:363
-msgid "View User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:364
-msgid "Reset Password"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:365
-msgid "Edit User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:366
-msgid "Delete User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:366
-#: View/Elements/Users/userIndexTable.ctp:91
-msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:370
-#: View/Roles/admin_edit.ctp:4
-msgid "Edit Role"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:371
-msgid "Delete Role"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:385
-#: View/Organisations/admin_edit.ctp:4
-msgid "Edit Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:386
-#: View/Organisations/ajax/merge.ctp:5
-msgid "Merge Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:398
-#: View/Servers/server_settings.ctp:5
-msgid "Server Settings & Maintenance"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:406
-msgid "Blacklists Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:410
-msgid "Blacklists Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:426;433
-msgid "View Thread"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:427
-#: View/Posts/add.ctp:4
-msgid "Add Post"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:434
-#: View/Posts/edit.ctp:4
-msgid "Edit Post"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:439
-msgid "List Threads"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:440
-msgid "New Thread"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:445
-msgid "List Favourite Tags"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:455
-msgid "Edit Tag"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:461;473
-msgid "View Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:474
-msgid "Delete Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:492
-msgid "View Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:494
-#: View/Templates/edit.ctp:6
-msgid "Edit Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:502
-msgid "Add Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:503
-msgid "Import Feeds from JSON"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:504
-#: View/Feeds/compare_feeds.ctp:7
-msgid "Feed overlap analysis matrix"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:505
-msgid "Export Feed settings"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:507
-msgid "Edit Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:509
-msgid "PreviewIndex"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:511
-msgid "PreviewEvent"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:516
-msgid "View News"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:520
-#: View/News/add.ctp:6
-msgid "Add News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:522
-#: View/News/edit.ctp:6
-msgid "Edit News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:533
-msgid "Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:533
-msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:534
-msgid "Force Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:534
-msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:538;546
-msgid "View Galaxy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:539
-msgid "View Cluster"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:556
-msgid "Update Objects"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:561
-msgid "View Object Template"
-msgstr ""
-
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:84
+#: View/Layouts/default.ctp:87
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -3975,8 +4000,11 @@ msgid "Display"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Jobs/index.ctp:62
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
 #: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr ""
 
@@ -3989,12 +4017,12 @@ msgstr ""
 msgid "Toggle fullscreen"
 msgstr ""
 
-#: View/Elements/view_mitre_attack_matrix.ctp:27
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all events on current page"
 msgstr ""
 
@@ -4034,35 +4062,58 @@ msgstr ""
 msgid "#Posts"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:167
-msgid " correlation(s)"
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/dashboard/dashboard_events.ctp:4;5
+#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
+#: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/preview_index.ctp:174
+#: View/Taxonomies/index.ctp:47
+#: View/Warninglists/index.ctp:60
+msgid "View"
+msgstr "Náhled"
+
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:177;182
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:187
+#: View/Elements/Events/eventIndexTable.ctp:190
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:207
-#: View/Jobs/index.ctp:15;63
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-msgid "All"
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:218
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:12
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
 msgid "Are you sure this event is complete and everyone should be informed?"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:219
+#: View/Elements/Events/eventIndexTable.ctp:222
 msgid "Not published"
 msgstr ""
 
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr ""
+
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid "Show "
 msgstr ""
@@ -4072,51 +4123,66 @@ msgid " more..."
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:295
+#: View/Events/view.ctp:346
 msgid "Collapse…"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:262
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr ""
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:343
 msgid "Restore attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:263;303
+#: View/Elements/Events/View/row_attribute.ctp:344;384
 msgid "Permanently delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Propose enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Propose enrichment through Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:279
+#: View/Elements/Events/View/row_attribute.ctp:360
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:280
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:290;295
+#: View/Elements/Events/View/row_attribute.ctp:371;376
 msgid "Add enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:295
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Add enrichment via Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:307
+#: View/Elements/Events/View/row_attribute.ctp:388
 msgid "Soft-delete attribute"
 msgstr ""
 
@@ -4138,24 +4204,36 @@ msgid "Expand or Collapse"
 msgstr ""
 
 #: View/Elements/Events/View/row_object.ctp:69
-msgid "Meta-category: "
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
 msgstr ""
 
 #: View/Elements/Events/View/row_object.ctp:70
+msgid "Meta-category: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:71
 #: View/Elements/Feeds/View/row_object.ctp:21
 msgid "Description: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Events/View/row_object.ctp:72
 #: View/Elements/Feeds/View/row_object.ctp:22
 msgid "Template: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Soft delete object"
 msgstr ""
 
@@ -4196,6 +4274,7 @@ msgstr ""
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
 #: View/Sightings/ajax/advanced.ctp:10
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 msgid "Add sighting"
 msgstr ""
 
@@ -4204,7 +4283,6 @@ msgid "Mark as false-positive"
 msgstr ""
 
 #: View/Elements/Events/View/sighting_field.ctp:14
-#: View/Events/view.ctp:203
 msgid "Advanced sightings"
 msgstr ""
 
@@ -4232,7 +4310,7 @@ msgstr ""
 
 #: View/Elements/Feeds/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object.ctp:20
-#: View/ObjectTemplates/view.ctp:19
+#: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:23
 msgid "Meta-category"
 msgstr ""
@@ -4247,7 +4325,7 @@ msgid "all"
 msgstr ""
 
 #: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/view.ctp:126
+#: View/Events/view.ctp:131
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
 #: View/Servers/preview_event.ctp:36
 #: View/Sightings/ajax/list_sightings.ctp:5
@@ -4273,12 +4351,13 @@ msgstr ""
 #: View/Elements/Servers/View/row_attribute.ctp:93
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/healthElements/files.ctp:61
-#: View/Elements/healthElements/workers.ctp:61;62;63
-#: View/Events/automation.ctp:403;410;417;438;445
+#: View/Elements/healthElements/workers.ctp:66;67;68
+#: View/Events/automation.ctp:234;241;248;269;276
 #: View/Events/export.ctp:68;88
-#: View/Taxonomies/view.ctp:96;107;152
-#: View/Users/admin_view.ctp:83;92;122
-#: View/Users/view.ctp:62
+#: View/Events/legacy_automation.ctp:403;410;417;438;445
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
 msgid "N/A"
 msgstr ""
 
@@ -4287,23 +4366,24 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
 #: View/Galaxies/view.ctp:14
-#: View/ObjectTemplates/view.ctp:11
+#: View/ObjectTemplates/view.ctp:4
 #: View/Objects/revise_object.ctp:19
 #: View/Organisations/ajax/merge.ctp:57;64
 #: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/view.ctp:9
-#: View/SharingGroups/add.ctp:11;31;51
-#: View/SharingGroups/edit.ctp:11;31;59
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
 #: View/SharingGroups/view.ctp:42;67
 #: View/Templates/view.ctp:9
 #: View/Users/statistics_orgs.ctp:31
-#: View/Warninglists/view.ctp:9
+#: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr ""
 
 #: View/Elements/Servers/View/row_object.ctp:21
 #: View/Elements/healthElements/files.ctp:8
-#: View/Elements/healthElements/settings_tab.ctp:16
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:10
 #: View/Elements/templateElements/populateTemplateDescription.ctp:12
 #: View/Elements/templateElements/populateTemplateFile.ctp:10
@@ -4311,19 +4391,19 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:27
 #: View/Galaxies/view.ctp:20
-#: View/ObjectTemplates/view.ctp:21
+#: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:16;94
-#: View/Organisations/view.ctp:32;89;90
+#: View/Organisations/view.ctp:15;58;59
 #: View/Pages/doc/administration.ctp:48;241
-#: View/Pages/doc/categories_and_types.ctp:50;67
+#: View/Pages/doc/categories_and_types.ctp:44;61
 #: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
 #: View/Servers/preview_event.ctp:65
-#: View/SharingGroups/add.ctp:15
-#: View/SharingGroups/edit.ctp:15
-#: View/SharingGroups/index.ctp:28
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
 #: View/Taxonomies/view.ctp:14
 #: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:14
+#: View/Warninglists/view.ctp:11
 msgid "Description"
 msgstr ""
 
@@ -4342,11 +4422,17 @@ msgstr ""
 msgid "Referenced by"
 msgstr ""
 
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
+
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:2
+#: View/Roles/view.ctp:24
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_view.ctp:19
-#: View/Users/view.ctp:19
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
 msgstr ""
 
@@ -4357,7 +4443,7 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:17
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:54
+#: View/ShadowAttributes/index.ctp:64
 msgid "Created"
 msgstr ""
 
@@ -4369,6 +4455,11 @@ msgstr ""
 msgid "Create new credentials and inform user"
 msgstr ""
 
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Elements/dashboard/dashboard_events.ctp:2
 msgid "Changes since last visit"
 msgstr ""
@@ -4397,6 +4488,417 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr ""
+
 #: View/Elements/healthElements/diagnostics.ctp:5
 msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
 msgstr ""
@@ -4421,11 +4923,10 @@ msgstr ""
 msgid "Outdated version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:26;156;170;195
-#: View/Elements/healthElements/workers.ctp:18;71
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
+#: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
-#: View/Users/admin_view.ctp:81
 msgid "OK"
 msgstr ""
 
@@ -4445,131 +4946,135 @@ msgstr ""
 msgid "Current branch…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Pull the latest MISP version from github"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Update MISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "Writeable Directories and files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:67
+#: View/Elements/healthElements/diagnostics.ctp:65
 msgid "The following directories and files have to be writeable for MISP to function properly. Make sure that the apache user has write privileges for the directories below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:68
+#: View/Elements/healthElements/diagnostics.ctp:66
 msgid "Directories"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:75
+#: View/Elements/healthElements/diagnostics.ctp:73
 msgid "Directory "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:83
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Writeable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:90;104
+#: View/Elements/healthElements/diagnostics.ctp:88;102
 msgid "File "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:97
+#: View/Elements/healthElements/diagnostics.ctp:95
 msgid "Readable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:112
+#: View/Elements/healthElements/diagnostics.ctp:110
 msgid "PHP Settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:115;127
+#: View/Elements/healthElements/diagnostics.ctp:113;125
 msgid "Up to date"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:121
-#: View/Elements/healthElements/workers.ctp:78;80
-#: View/Organisations/view.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:119
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
 msgid "Unknown"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:123
+#: View/Elements/healthElements/diagnostics.ctp:121
 msgid "Issues determining version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:130;139
+#: View/Elements/healthElements/diagnostics.ctp:128;137
 msgid "Update highly recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:133;142
+#: View/Elements/healthElements/diagnostics.ctp:131;140
 msgid "Version unsupported, update ASAP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:146
+#: View/Elements/healthElements/diagnostics.ctp:144
 msgid "PHP ini path"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:147
+#: View/Elements/healthElements/diagnostics.ctp:145
 msgid "PHP Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:147;148
+#: View/Elements/healthElements/diagnostics.ctp:145;146
 msgid "recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:148
+#: View/Elements/healthElements/diagnostics.ctp:146
 msgid "PHP CLI Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:149
+#: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
 msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:156
+#: View/Elements/healthElements/diagnostics.ctp:155
 #: View/Events/filter_event_index.ctp:32;190
 #: View/Pages/doc/using_the_system.ctp:66;171
 msgid "Low"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:160
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP Extensions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:170
+#: View/Elements/healthElements/diagnostics.ctp:169
 msgid "Not loaded"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:175
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:183
+#: View/Elements/healthElements/diagnostics.ctp:182
 msgid "Advanced attachment handler"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:184
+#: View/Elements/healthElements/diagnostics.ctp:183
 msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PyMISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:201
+#: View/Elements/healthElements/diagnostics.ctp:200
 msgid "STIX and Cybox libraries"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:202
+#: View/Elements/healthElements/diagnostics.ctp:201
 msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:203
+#: View/Elements/healthElements/diagnostics.ctp:202
 msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
 msgstr ""
 
@@ -4806,72 +5311,35 @@ msgid "Permissions"
 msgstr ""
 
 #: View/Elements/healthElements/files.ctp:73
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
 #: View/Roles/admin_index.ctp:67
-#: View/SharingGroups/index.ctp:68
+#: View/SharingGroups/index.ctp:87
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:5
 msgid "Good, but there are some optional settings that are incorrect / not set."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:6
 msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
-msgid "Overall health"
+msgid "Test"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:17
-msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:26
-msgid " settings incorrectly or not set"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:27
-msgid " incorrect settings."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:33
-msgid "Critical issues revealed by the diagnostics"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:34
-msgid " issues detected."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:35
-msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:9
-msgid "Toggle subgroup"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:13
-#: View/Pages/doc/administration.ctp:45
-msgid "Priority"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:14
-#: View/Pages/doc/administration.ctp:46
-msgid "Setting"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:15
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
 #: View/Events/filter_event_index.ctp:134
 #: View/Events/resolved_attributes.ctp:45
 #: View/Events/show_i_o_c_results.ctp:13
@@ -4886,45 +5354,75 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: View/Elements/healthElements/settings_tab.ctp:17
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:3;15;27;36
-#: View/Events/index.ctp:30;58
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
-#: View/Users/admin_index.ctp:28
-msgid "Modify filters"
-msgstr ""
-
-#: View/Elements/healthElements/tabs.ctp:3
+#: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:28
-#: View/Pages/doc/administration.ctp:38
-msgid "Diagnostics"
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:37
-#: View/Pages/doc/administration.ctp:39
-msgid "Workers"
+#: View/Elements/healthElements/tabs.ctp:34
+#: View/Pages/doc/administration.ctp:38
+msgid "Diagnostics"
 msgstr ""
 
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:48
+#: View/Elements/healthElements/tabs.ctp:50;65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:5
-msgid "Warning"
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:5
@@ -4932,82 +5430,90 @@ msgid "MISP cannot access your /proc directory to check the status of the worker
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:10
-msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgid "Note:"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "You have set the \"manage_workers\" variable to \"false\", therefore worker controls have been disabled."
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:15
+msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:20
 msgid "Worker started with the correct user, but the current status is unknown."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:24
+#: View/Elements/healthElements/workers.ctp:29
 msgid "There are issues with the worker(s), but at least one healthy worker is monitoring the queue."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:30
+#: View/Elements/healthElements/workers.ctp:35
 msgid "Worker type: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:32
+#: View/Elements/healthElements/workers.ctp:37
 msgid "Jobs in the queue: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:40
+#: View/Elements/healthElements/workers.ctp:45
 msgid "Queue status: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:51
+#: View/Elements/healthElements/workers.ctp:56
 msgid "Worker PID"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:52
+#: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
-#: View/Users/admin_view.ctp:7
-#: View/Users/view.ctp:2
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
 msgid "User"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:53
+#: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:54
+#: View/Elements/healthElements/workers.ctp:59
 msgid "Information"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:64
+#: View/Elements/healthElements/workers.ctp:69
 msgid "Worker not running!"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:72
+#: View/Elements/healthElements/workers.ctp:77
 msgid "The worker appears to be healthy."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:75
+#: View/Elements/healthElements/workers.ctp:80
 msgid "The worker was started with a user other than the apache user. MISP cannot check whether the worker is alive or not."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:81
+#: View/Elements/healthElements/workers.ctp:86
 msgid "Cannot check whether the worker is alive or dead."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:85
+#: View/Elements/healthElements/workers.ctp:90
 msgid "Dead"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:86
+#: View/Elements/healthElements/workers.ctp:91
 msgid "The Worker appears to be dead."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:100
+#: View/Elements/healthElements/workers.ctp:106
 msgid "Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:111
+#: View/Elements/healthElements/workers.ctp:119
 msgid "Start a worker"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:119
+#: View/Elements/healthElements/workers.ctp:130
 msgid "Restart all workers"
 msgstr ""
 
@@ -5138,16 +5644,16 @@ msgstr ""
 #: View/Objects/revise_object.ctp:45
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
-#: View/Pages/doc/categories_and_types.ctp:66
+#: View/Pages/doc/categories_and_types.ctp:60
 #: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
-#: View/ShadowAttributes/index.ctp:36;51
-#: View/SharingGroups/add.ctp:30
-#: View/SharingGroups/edit.ctp:30
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
 #: View/Sightings/ajax/list_sightings.ctp:7
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:35
-#: View/Warninglists/view.ctp:24
+#: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr ""
 
@@ -5186,7 +5692,7 @@ msgid "Template Name"
 msgstr ""
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:60
+#: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr ""
@@ -5206,7 +5712,7 @@ msgid "s"
 msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
-#: View/ObjectReferences/ajax/add.ctp:60
+#: View/ObjectReferences/ajax/add.ctp:86
 #: View/Objects/revise_object.ctp:43
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
@@ -5220,9 +5726,9 @@ msgstr ""
 #: View/Feeds/freetext_index.ctp:31
 #: View/Objects/add.ctp:95
 #: View/Objects/revise_object.ctp:44
-#: View/Pages/doc/categories_and_types.ctp:17;23;37;43;49
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
 #: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
-#: View/ShadowAttributes/index.ctp:48
+#: View/ShadowAttributes/index.ctp:58
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_add_file.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
@@ -5232,7 +5738,7 @@ msgid "Category"
 msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
-#: View/Pages/doc/categories_and_types.ctp:63
+#: View/Pages/doc/categories_and_types.ctp:57
 #: View/Pages/doc/using_the_system.ctp:109
 #: View/Pages/doc/md/categories_and_types.ctp:33
 msgid "Types"
@@ -5461,45 +5967,33 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
-#: View/Events/add.ctp:3
-msgid "The event created %s, but not synchronised to other MISP instances until it is published."
-msgstr ""
-
-#: View/Events/add.ctp:3
-msgid "will be restricted to your organisation"
-msgstr ""
-
-#: View/Events/add.ctp:3
-msgid "will be visible to the organisations having an account on this platform"
-msgstr ""
-
-#: View/Events/add.ctp:48
+#: View/Events/add.ctp:44
 #: View/Events/edit.ctp:35
 msgid "Threat Level "
 msgstr ""
 
-#: View/Events/add.ctp:52
+#: View/Events/add.ctp:48
 #: View/Events/edit.ctp:38
 msgid "Analysis "
 msgstr ""
 
-#: View/Events/add.ctp:56
+#: View/Events/add.ctp:52
 #: View/Events/edit.ctp:43
-#: View/ShadowAttributes/index.ctp:42
+#: View/ShadowAttributes/index.ctp:52
 msgid "Event Info"
 msgstr ""
 
-#: View/Events/add.ctp:60
+#: View/Events/add.ctp:56
 #: View/Events/edit.ctp:47
 msgid "Quick Event Description or Tracking Info"
 msgstr ""
 
-#: View/Events/add.ctp:63
+#: View/Events/add.ctp:59
 #: View/Events/edit.ctp:50
 msgid "Extends event"
 msgstr ""
 
-#: View/Events/add.ctp:66
+#: View/Events/add.ctp:62
 #: View/Events/edit.ctp:53
 msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr ""
@@ -5510,7 +6004,8 @@ msgstr ""
 
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
-#: View/Events/upload_stix.ctp:22
+#: View/Events/upload_analysis_file.ctp:22
+#: View/Events/upload_stix.ctp:29
 msgid "Upload"
 msgstr ""
 
@@ -5548,7 +6043,7 @@ msgid "Details"
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:89
+#: View/Jobs/index.ctp:124
 msgid "Failed"
 msgstr ""
 
@@ -5561,781 +6056,677 @@ msgid "Event with this UUID already exists."
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr ""
 
 #: View/Events/automation.ctp:3
-msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
-"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
-"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgid "Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.\n"
+"    To to make this functionality available for automated tools an authentication key is used."
 msgstr ""
 
 #: View/Events/automation.ctp:6
-msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgid "Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP."
 msgstr ""
 
-#: View/Events/automation.ctp:7
+#: View/Events/automation.ctp:9
+#: View/Events/legacy_automation.ctp:7
 msgid "Your current key is: <code>%s</code>.\n"
 "    You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:8
+#: View/Events/automation.ctp:10
+#: View/Events/legacy_automation.ctp:8
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:10
-msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
-msgstr ""
-
-#: View/Events/automation.ctp:11
-msgid "Please use the use the following header"
-msgstr ""
-
-#: View/Events/automation.ctp:12
-msgid "Authorization"
-msgstr ""
-
-#: View/Events/automation.ctp:13
-msgid "XML Export"
-msgstr ""
-
 #: View/Events/automation.ctp:14
-msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+#: View/Logs/admin_index.ctp:20;21
+msgid "Search"
 msgstr ""
 
-#: View/Events/automation.ctp:15;47;76
-msgid "You can configure your tools to automatically download the following file"
+#: View/Events/automation.ctp:16
+#: View/Events/legacy_automation.ctp:264
+msgid "It is possible to search the database for attributes based on a list of criteria."
 msgstr ""
 
 #: View/Events/automation.ctp:17
-msgid "If you only want to fetch a specific event append the eventid number"
+#: View/Events/legacy_automation.ctp:265
+msgid "To return an event or a list of events in a desired format, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:19;144
-msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+#: View/Events/automation.ctp:18
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
 msgstr ""
 
-#: View/Events/automation.ctp:26
-msgid "The xml download also accepts two additional the following optional parameters in the URL"
+#: View/Events/automation.ctp:21
+msgid "Set the return format of the search (Currently supported: json, xml, openioc, suricata, snort - more formats are being moved to restSearch with the goal being that all searches happen through this API). Can be passed as the first parameter after restSearch or via the JSON payload."
 msgstr ""
 
-#: View/Events/automation.ctp:29;52;85
-msgid "Restrict the download to a single event"
+#: View/Events/automation.ctp:22
+msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
 msgstr ""
 
-#: View/Events/automation.ctp:30
-msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+#: View/Events/automation.ctp:23
+msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
 msgstr ""
 
-#: View/Events/automation.ctp:31;54;87;112;134
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:24
+#: View/Events/legacy_automation.ctp:268;297
+msgid "Search for the given value in the attributes' value field."
 msgstr ""
 
-#: View/Events/automation.ctp:37;64;91;117;140;203;254;279
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:38;65;92;118;141;204;255;280
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:39;119;142;205;256;281;306
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:41;70;97;122;259;290
-msgid "The keywords false or null should be used for optional empty parameters in the URL."
-msgstr ""
-
-#: View/Events/automation.ctp:43
-msgid "Also check out the %s to read about the REST API."
-msgstr ""
-
-#: View/Events/automation.ctp:45
-msgid "CSV Export"
-msgstr ""
-
-#: View/Events/automation.ctp:46
-msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
-msgstr ""
-
-#: View/Events/automation.ctp:49
-msgid "You can specify additional flags for CSV exports as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:53
-msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
-msgstr ""
-
-#: View/Events/automation.ctp:58
-msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:61;270;299
-msgid "The attribute category, any valid MISP attribute category is accepted."
-msgstr ""
-
-#: View/Events/automation.ctp:62;199;269;298
+#: View/Events/automation.ctp:25
+#: View/Events/legacy_automation.ctp:62;199;269;298
 msgid "The attribute type, any valid MISP attribute type is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:63
-msgid "Include the event data with each attribute."
+#: View/Events/automation.ctp:26
+#: View/Events/legacy_automation.ctp:61;270;299
+msgid "The attribute category, any valid MISP attribute category is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:66
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+#: View/Events/automation.ctp:27
+#: View/Events/legacy_automation.ctp:271;300
+msgid "Search by the creator organisation by supplying the organisation identifier."
 msgstr ""
 
-#: View/Events/automation.ctp:67
-msgid "The CSV created when this setting is set to true will not contain the header row.\n"
-"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:71
-msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:74
-msgid "NIDS rules export"
-msgstr ""
-
-#: View/Events/automation.ctp:75
-msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:81
-msgid "The full API syntax is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:84
-msgid "The export format, can be \"suricata\" or \"snort\""
-msgstr ""
-
-#: View/Events/automation.ctp:86
-msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
-msgstr ""
-
-#: View/Events/automation.ctp:93
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:94
-msgid "Restrict the export to only use the given types."
-msgstr ""
-
-#: View/Events/automation.ctp:95;120;174;206;257
-msgid "All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:96
-msgid "All tags will be included even if not exportable."
-msgstr ""
-
-#: View/Events/automation.ctp:98
-msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
-msgstr ""
-
-#: View/Events/automation.ctp:100
-msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
-msgstr ""
-
-#: View/Events/automation.ctp:102
-msgid "Hash database export"
-msgstr ""
-
-#: View/Events/automation.ctp:103
-msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:104;188
-msgid "You can configure your tools to automatically download the following files"
-msgstr ""
-
-#: View/Events/automation.ctp:109
-msgid "The API's full format is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:111
-msgid "The export format, can be \"md5\" or \"sha1\""
-msgstr ""
-
-#: View/Events/automation.ctp:123
-msgid "For example, to only show sha1 values from events tagged tag1, use"
-msgstr ""
-
-#: View/Events/automation.ctp:126
-msgid "STIX export"
-msgstr ""
-
-#: View/Events/automation.ctp:127
-msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
-msgstr ""
-
-#: View/Events/automation.ctp:129
-msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:132;171
-msgid "The event's ID"
-msgstr ""
-
-#: View/Events/automation.ctp:133
-msgid "Encode attachments where applicable"
-msgstr ""
-
-#: View/Events/automation.ctp:151
-msgid "Various ways to narrow down the search results of the STIX export"
-msgstr ""
-
-#: View/Events/automation.ctp:152
-msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
-msgstr ""
-
-#: View/Events/automation.ctp:154
-msgid "To export the same events using a POST request use"
-msgstr ""
-
-#: View/Events/automation.ctp:156
-msgid "Together with this JSON object in the POST message"
-msgstr ""
-
-#: View/Events/automation.ctp:158
-msgid "XML is automagically assumed when using the stix export"
-msgstr ""
-
-#: View/Events/automation.ctp:160
-msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
-msgstr ""
-
-#: View/Events/automation.ctp:163
-msgid "RPZ export"
-msgstr ""
-
-#: View/Events/automation.ctp:164
-msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
-msgstr ""
-
-#: View/Events/automation.ctp:165
-msgid "It is possible to further restrict the exported values using the following filters"
-msgstr ""
-
-#: View/Events/automation.ctp:167
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
-"        "
-msgstr ""
-
-#: View/Events/automation.ctp:170
-msgid "Use semicolons instead (the search will automatically search for colons instead)"
-msgstr ""
-
-#: View/Events/automation.ctp:172
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
-msgstr ""
-
-#: View/Events/automation.ctp:173
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
-msgstr ""
-
-#: View/Events/automation.ctp:176
-msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:180
-msgid "To override the above values, either use the url parameters as described below"
-msgstr ""
-
-#: View/Events/automation.ctp:182
-msgid "or POST an XML or JSON object with the above listed options"
-msgstr ""
-
-#: View/Events/automation.ctp:186
-msgid "Text export"
-msgstr ""
-
-#: View/Events/automation.ctp:187
-msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:194
-msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
-msgstr ""
-
-#: View/Events/automation.ctp:197
-msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
-msgstr ""
-
-#: View/Events/automation.ctp:200
+#: View/Events/automation.ctp:28
+#: View/Events/legacy_automation.ctp:200
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'."
 msgstr ""
 
-#: View/Events/automation.ctp:201
-msgid "Only export the attributes of the given event ID"
+#: View/Events/automation.ctp:29
+#: View/Events/legacy_automation.ctp:278
+msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
 msgstr ""
 
-#: View/Events/automation.ctp:202
-msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+#: View/Events/automation.ctp:30;151
+#: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:207
-msgid "Include not published Events."
+#: View/Events/automation.ctp:31;152
+#: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:208;275
-msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:32
+#: View/Events/legacy_automation.ctp:282;307
+msgid "The events that should be included / excluded from the search"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:33
+#: View/Events/legacy_automation.ctp:283;308
+msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
+msgstr ""
+
+#: View/Events/automation.ctp:34
+#: View/Events/legacy_automation.ctp:284
+msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
+msgstr ""
+
+#: View/Events/automation.ctp:35
+#: View/Events/legacy_automation.ctp:285;309
+msgid "Restrict the results by uuid."
+msgstr ""
+
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:37
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:38
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:39
+#: View/Events/legacy_automation.ctp:288;311
+msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
+msgstr ""
+
+#: View/Events/automation.ctp:40
+#: View/Events/legacy_automation.ctp:289;313
+msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
+msgstr ""
+
+#: View/Events/automation.ctp:41
+#: View/Events/legacy_automation.ctp:314
+msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
+msgstr ""
+
+#: View/Events/automation.ctp:42
+#: View/Events/legacy_automation.ctp:315
+msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
+msgstr ""
+
+#: View/Events/automation.ctp:43
+#: View/Events/legacy_automation.ctp:316
+msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:44
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:45
+msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
+msgstr ""
+
+#: View/Events/automation.ctp:46
+msgid "Filter on the event's info field."
+msgstr ""
+
+#: View/Events/automation.ctp:47
+msgid "Search for a full or a substring (delimited by % for substrings) in the event info, event tags, attribute tags, attribute values or attribute comment fields."
+msgstr ""
+
+#: View/Events/automation.ctp:48
+msgid "CSV only, select the fields that you wish to include in the CSV export. By setting event level fields additionally, includeContext is not required to get event metadata."
+msgstr ""
+
+#: View/Events/automation.ctp:49
+msgid "CSV only, add additional event level data to the export. The additional fields can be added via requested_attributes too with more granularity."
+msgstr ""
+
+#: View/Events/automation.ctp:79
+msgid "CSV specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:81
+msgid "Limit the list of fields to be returned in the CSV."
+msgstr ""
+
+#: View/Events/automation.ctp:82
+msgid "Include the event level meta-data with each attribute."
+msgstr ""
+
+#: View/Events/automation.ctp:83
+msgid "The CSV created when this setting is set to true will not contain the header row."
+msgstr ""
+
+#: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
+msgid "RPZ specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:95
+#: View/Events/legacy_automation.ctp:164
+msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
+msgstr ""
+
+#: View/Events/automation.ctp:98
+#: View/Events/legacy_automation.ctp:176
+msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
+msgstr ""
+
+#: View/Events/automation.ctp:102
+#: View/Events/legacy_automation.ctp:180
+msgid "To override the above values, either use the url parameters as described below"
+msgstr ""
+
+#: View/Events/automation.ctp:104
+#: View/Events/legacy_automation.ctp:182
+msgid "or POST an XML or JSON object with the above listed options"
+msgstr ""
+
+#: View/Events/automation.ctp:108
+#: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:109
+#: View/Events/legacy_automation.ctp:212
 msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
 msgstr ""
 
-#: View/Events/automation.ctp:213
+#: View/Events/automation.ctp:110
+#: View/Events/legacy_automation.ctp:213
 msgid "You can configure your tools to automatically download a file one of the Bro types."
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:116
+#: View/Events/legacy_automation.ctp:219
 msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
 msgstr ""
 
-#: View/Events/automation.ctp:222
+#: View/Events/automation.ctp:119
+#: View/Events/legacy_automation.ctp:222
 msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
 msgstr ""
 
-#: View/Events/automation.ctp:240
+#: View/Events/automation.ctp:137
+#: View/Events/legacy_automation.ctp:240
 msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
 msgstr ""
 
-#: View/Events/automation.ctp:242
+#: View/Events/automation.ctp:139
+#: View/Events/legacy_automation.ctp:242
 msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:249;301
+#: View/Events/automation.ctp:146
+#: View/Events/legacy_automation.ctp:249;301
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
 "    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
 "    Use semicolons instead (the search will automatically search for colons instead)."
 msgstr ""
 
-#: View/Events/automation.ctp:252
+#: View/Events/automation.ctp:149
+#: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:150
+#: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:154
+#: View/Events/legacy_automation.ctp:95;120;174;206;257
+msgid "All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/automation.ctp:156
+#: View/Events/legacy_automation.ctp:41;70;97;122;259;290
+msgid "The keywords false or null should be used for optional empty parameters in the URL."
+msgstr ""
+
+#: View/Events/automation.ctp:157
+#: View/Events/legacy_automation.ctp:260
 msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
 msgstr ""
 
-#: View/Events/automation.ctp:263
-msgid "Searches with JSON/XML/OpenIOC results"
-msgstr ""
-
-#: View/Events/automation.ctp:264
-msgid "It is possible to search the database for attributes based on a list of criteria."
-msgstr ""
-
-#: View/Events/automation.ctp:265
-msgid "To return an event or a list of events in a desired format, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:267
-msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
-msgstr ""
-
-#: View/Events/automation.ctp:268;297
-msgid "Search for the given value in the attributes' value field."
-msgstr ""
-
-#: View/Events/automation.ctp:271;300
-msgid "Search by the creator organisation by supplying the organisation identifier."
-msgstr ""
-
-#: View/Events/automation.ctp:272
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
-msgstr ""
-
-#: View/Events/automation.ctp:278
-msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
-msgstr ""
-
-#: View/Events/automation.ctp:282;307
-msgid "The events that should be included / excluded from the search"
-msgstr ""
-
-#: View/Events/automation.ctp:283;308
-msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
-msgstr ""
-
-#: View/Events/automation.ctp:284
-msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
-msgstr ""
-
-#: View/Events/automation.ctp:285;309
-msgid "Restrict the results by uuid."
-msgstr ""
-
-#: View/Events/automation.ctp:286;310
-msgid "Restrict the results by the last publish timestamp (newer than)."
-msgstr ""
-
-#: View/Events/automation.ctp:287
-msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
-msgstr ""
-
-#: View/Events/automation.ctp:288;311
-msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
-msgstr ""
-
-#: View/Events/automation.ctp:289;313
-msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
-msgstr ""
-
-#: View/Events/automation.ctp:291
-msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
-msgstr ""
-
-#: View/Events/automation.ctp:294;320;349
-msgid "POST message payload (json)"
-msgstr ""
-
-#: View/Events/automation.ctp:296
-msgid "To just return a list of attributes, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:304
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
-msgstr ""
-
-#: View/Events/automation.ctp:305
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
-msgstr ""
-
-#: View/Events/automation.ctp:312
-msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
-msgstr ""
-
-#: View/Events/automation.ctp:314
-msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
-msgstr ""
-
-#: View/Events/automation.ctp:315
-msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
-msgstr ""
-
-#: View/Events/automation.ctp:316
-msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
-msgstr ""
-
-#: View/Events/automation.ctp:317
-msgid "Only return attributes from events that have received a modification after the given timestamp."
-msgstr ""
-
-#: View/Events/automation.ctp:322
-msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
-msgstr ""
-
-#: View/Events/automation.ctp:324
-msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
-"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:327
-msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
-msgstr ""
-
-#: View/Events/automation.ctp:329
+#: View/Events/automation.ctp:160
+#: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:330
+#: View/Events/automation.ctp:161
+#: View/Events/legacy_automation.ctp:330
 msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:332
+#: View/Events/automation.ctp:163
+#: View/Events/legacy_automation.ctp:332
 msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
 "    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
 "    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:168
+#: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:169
+#: View/Events/legacy_automation.ctp:338
 msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:340
+#: View/Events/automation.ctp:171
+#: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:341
+#: View/Events/automation.ctp:172
+#: View/Events/legacy_automation.ctp:341
 msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
 msgstr ""
 
-#: View/Events/automation.ctp:342
+#: View/Events/automation.ctp:173
+#: View/Events/legacy_automation.ctp:342
 msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
 msgstr ""
 
-#: View/Events/automation.ctp:343
+#: View/Events/automation.ctp:174
+#: View/Events/legacy_automation.ctp:343
 msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
 msgstr ""
 
-#: View/Events/automation.ctp:345
+#: View/Events/automation.ctp:176
+#: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:353
+#: View/Events/automation.ctp:180
+#: View/Events/legacy_automation.ctp:294;320;349
+msgid "POST message payload (json)"
+msgstr ""
+
+#: View/Events/automation.ctp:184
+#: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:354
+#: View/Events/automation.ctp:185
+#: View/Events/legacy_automation.ctp:354
 msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
 msgstr ""
 
-#: View/Events/automation.ctp:355
+#: View/Events/automation.ctp:186
+#: View/Events/legacy_automation.ctp:355
 msgid "If set, it will return all samples from events that have a match for the hash provided above."
 msgstr ""
 
-#: View/Events/automation.ctp:356
+#: View/Events/automation.ctp:187
+#: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:357
+#: View/Events/automation.ctp:188
+#: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:359
+#: View/Events/automation.ctp:190
+#: View/Events/legacy_automation.ctp:359
 msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
 msgstr ""
 
-#: View/Events/automation.ctp:360
+#: View/Events/automation.ctp:191
+#: View/Events/legacy_automation.ctp:360
 msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
 msgstr ""
 
-#: View/Events/automation.ctp:361
+#: View/Events/automation.ctp:192
+#: View/Events/legacy_automation.ctp:361
 msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
 msgstr ""
 
-#: View/Events/automation.ctp:362
+#: View/Events/automation.ctp:193
+#: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:371
+#: View/Events/automation.ctp:202
+#: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:372
+#: View/Events/automation.ctp:203
+#: View/Events/legacy_automation.ctp:372
 msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
 msgstr ""
 
-#: View/Events/automation.ctp:373
+#: View/Events/automation.ctp:204
+#: View/Events/legacy_automation.ctp:373
 msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:374
+#: View/Events/automation.ctp:205
+#: View/Events/legacy_automation.ctp:374
 msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
 msgstr ""
 
-#: View/Events/automation.ctp:375
+#: View/Events/automation.ctp:206
+#: View/Events/legacy_automation.ctp:375
 msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 msgstr ""
 
-#: View/Events/automation.ctp:376
+#: View/Events/automation.ctp:207
+#: View/Events/legacy_automation.ctp:376
 msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
 msgstr ""
 
-#: View/Events/automation.ctp:377
+#: View/Events/automation.ctp:208
+#: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:378
+#: View/Events/automation.ctp:209
+#: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:379
+#: View/Events/automation.ctp:210
+#: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr ""
 
-#: View/Events/automation.ctp:380
+#: View/Events/automation.ctp:211
+#: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:381
+#: View/Events/automation.ctp:212
+#: View/Events/legacy_automation.ctp:381
 msgid "You can add or remove an existing tag from an event in the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:384
+#: View/Events/automation.ctp:215
+#: View/Events/legacy_automation.ctp:384
 msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
 msgstr ""
 
-#: View/Events/automation.ctp:386
+#: View/Events/automation.ctp:217
+#: View/Events/legacy_automation.ctp:386
 msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:388
+#: View/Events/automation.ctp:219
+#: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:389
+#: View/Events/automation.ctp:220
+#: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr ""
 
-#: View/Events/automation.ctp:393
+#: View/Events/automation.ctp:224
+#: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:394
+#: View/Events/automation.ctp:225
+#: View/Events/legacy_automation.ctp:394
 #: View/Pages/doc/using_the_system.ctp:445
-#: View/SharingGroups/add.ctp:52
-#: View/SharingGroups/edit.ctp:60
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
 msgid "URL"
 msgstr ""
 
-#: View/Events/automation.ctp:395
+#: View/Events/automation.ctp:226
+#: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:396
+#: View/Events/automation.ctp:227
+#: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:397
-#: View/Servers/rest.ctp:53
+#: View/Events/automation.ctp:228
+#: View/Events/legacy_automation.ctp:397
+#: View/Servers/rest.ctp:115
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:402
+#: View/Events/automation.ctp:233
+#: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:404;424;425;431;432
+#: View/Events/automation.ctp:235;255;256;262;263
+#: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:409
+#: View/Events/automation.ctp:240
+#: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:411;418
+#: View/Events/automation.ctp:242;249
+#: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:416
+#: View/Events/automation.ctp:247
+#: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:423
+#: View/Events/automation.ctp:254
+#: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:430
+#: View/Events/automation.ctp:261
+#: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:437
+#: View/Events/automation.ctp:268
+#: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:439;446
+#: View/Events/automation.ctp:270;277
+#: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
 #: View/Pages/doc/using_the_system.ctp:254
 msgid "Message"
 msgstr ""
 
-#: View/Events/automation.ctp:444
+#: View/Events/automation.ctp:275
+#: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:449
+#: View/Events/automation.ctp:280
+#: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:454
+#: View/Events/automation.ctp:285
+#: View/Events/legacy_automation.ctp:454
 msgid "None of the above fields are mandatory, but at least one of them has to be provided."
 msgstr ""
 
-#: View/Events/automation.ctp:456
+#: View/Events/automation.ctp:287
+#: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:457
+#: View/Events/automation.ctp:288
+#: View/Events/legacy_automation.ctp:457
 msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
 msgstr ""
 
-#: View/Events/automation.ctp:461
+#: View/Events/automation.ctp:292
+#: View/Events/legacy_automation.ctp:461
 msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
 "    An example for a valid lookup"
 msgstr ""
 
-#: View/Events/automation.ctp:472
+#: View/Events/automation.ctp:303
+#: View/Events/legacy_automation.ctp:472
 msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
 msgstr ""
 
-#: View/Events/automation.ctp:473
+#: View/Events/automation.ctp:304
+#: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:474
+#: View/Events/automation.ctp:305
+#: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:475
+#: View/Events/automation.ctp:306
+#: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:476
+#: View/Events/automation.ctp:307
+#: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:477
+#: View/Events/automation.ctp:308
+#: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:478
+#: View/Events/automation.ctp:309
+#: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:479
+#: View/Events/automation.ctp:310
+#: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:480
+#: View/Events/automation.ctp:311
+#: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:481
+#: View/Events/automation.ctp:312
+#: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:482
+#: View/Events/automation.ctp:313
+#: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:483
+#: View/Events/automation.ctp:314
+#: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:484
+#: View/Events/automation.ctp:315
+#: View/Events/legacy_automation.ctp:484
 msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:485
+#: View/Events/automation.ctp:316
+#: View/Events/legacy_automation.ctp:485
 msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
+#: View/Events/automation.ctp:319
+msgid "Freetext Import API"
+msgstr ""
+
+#: View/Events/automation.ctp:321
+msgid "The freetext import tool is also exposed to the API."
+msgstr ""
+
+#: View/Events/automation.ctp:322
+msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
+msgstr ""
+
+#: View/Events/automation.ctp:323
+msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:324
+msgid "The contents of the POST body should be the text to be parsed."
+msgstr ""
+
 #: View/Events/contact.ctp:8
 msgid "Contact organization reporting event "
 msgstr ""
@@ -6529,7 +6920,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:9;101
+#: View/Jobs/index.ctp:9;136
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr ""
@@ -6553,7 +6944,7 @@ msgid "All communities"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:53
+#: View/Feeds/index.ctp:103
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -6605,47 +6996,378 @@ msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/Organisations/view.ctp:97;98
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:33
 msgid "Events"
 msgstr ""
 
-#: View/Events/index.ctp:30
-msgid "Filter events"
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
 msgstr ""
 
-#: View/Events/index.ctp:31
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr ""
 
-#: View/Events/index.ctp:44
-msgid "Quickfilter"
+#: View/Events/index.ctp:73
+msgid "My events only"
 msgstr ""
 
-#: View/Events/index.ctp:44
-#: View/Organisations/index.ctp:59
-#: View/Servers/preview_index.ctp:45
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr ""
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr ""
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr ""
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
 msgid "Filter"
 msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My events only"
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
 msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My Events"
+#: View/Events/legacy_automation.ctp:3
+msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
+"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
 msgstr ""
 
-#: View/Events/index.ctp:72
-msgid "My organisation's events only"
+#: View/Events/legacy_automation.ctp:6
+msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
-#: View/Events/index.ctp:72
-msgid "Org Events"
+#: View/Events/legacy_automation.ctp:10
+msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:11
+msgid "Please use the use the following header"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:12
+msgid "Authorization"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:13
+msgid "XML Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:14
+msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:15;47;76
+msgid "You can configure your tools to automatically download the following file"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:17
+msgid "If you only want to fetch a specific event append the eventid number"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:19;144
+msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:26
+msgid "The xml download also accepts two additional the following optional parameters in the URL"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:29;52;85
+msgid "Restrict the download to a single event"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:30
+msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:31;54;87;112;134
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:43
+msgid "Also check out the %s to read about the REST API."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:45
+msgid "CSV Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:46
+msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:49
+msgid "You can specify additional flags for CSV exports as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:53
+msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:58
+msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:63
+msgid "Include the event data with each attribute."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:66
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:67
+msgid "The CSV created when this setting is set to true will not contain the header row.\n"
+"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:71
+msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:74
+msgid "NIDS rules export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:75
+msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:81
+msgid "The full API syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:84
+msgid "The export format, can be \"suricata\" or \"snort\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:86
+msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:93
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:94
+msgid "Restrict the export to only use the given types."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:96
+msgid "All tags will be included even if not exportable."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:98
+msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:100
+msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:102
+msgid "Hash database export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:103
+msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:104;188
+msgid "You can configure your tools to automatically download the following files"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:109
+msgid "The API's full format is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:111
+msgid "The export format, can be \"md5\" or \"sha1\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:123
+msgid "For example, to only show sha1 values from events tagged tag1, use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:126
+msgid "STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:127
+msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:129
+msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:132;171
+msgid "The event's ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:133
+msgid "Encode attachments where applicable"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:151
+msgid "Various ways to narrow down the search results of the STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:152
+msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:154
+msgid "To export the same events using a POST request use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:156
+msgid "Together with this JSON object in the POST message"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:158
+msgid "XML is automagically assumed when using the stix export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:160
+msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:163
+msgid "RPZ export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:165
+msgid "It is possible to further restrict the exported values using the following filters"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:167
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
+"        "
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:170
+msgid "Use semicolons instead (the search will automatically search for colons instead)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:172
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:173
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:186
+msgid "Text export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:187
+msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:194
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:197
+msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:201
+msgid "Only export the attributes of the given event ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:202
+msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:207
+msgid "Include not published Events."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:208;275
+msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:263
+msgid "Searches with JSON/XML/OpenIOC results"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:267
+msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:272
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:291
+msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:296
+msgid "To just return a list of attributes, use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:304
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:305
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:312
+msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:322
+msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:324
+msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
+"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:327
+msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
 msgstr ""
 
 #: View/Events/merge.ctp:4
@@ -6671,19 +7393,19 @@ msgid "Proposals"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:93
+#: View/Events/view.ctp:106
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:113
-#: View/Jobs/index.ctp:65
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
 #: View/Logs/admin_search.ctp:6
 #: View/Pages/doc/administration.ctp:87;104;116;181;195
 #: View/Pages/doc/using_the_system.ctp:166
-#: View/Users/admin_view.ctp:24
-#: View/Users/view.ctp:9
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
 msgid "Email"
 msgstr ""
 
@@ -6761,11 +7483,8 @@ msgid "Successfully added attributes"
 msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Events/view.ctp:56
 #: View/Feeds/preview_event.ctp:11
 #: View/Galaxies/view.ctp:18
-#: View/ObjectTemplates/view.ctp:15
-#: View/Organisations/view.ctp:54
 #: View/Organisations/ajax/merge.ctp:58
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
@@ -6788,6 +7507,14 @@ msgstr ""
 msgid "Visualisation"
 msgstr ""
 
+#: View/Events/upload_analysis_file.ctp:6
+msgid "Import analysis file"
+msgstr ""
+
+#: View/Events/upload_analysis_file.ctp:61
+msgid "Create Objects"
+msgstr ""
+
 #: View/Events/upload_stix.ctp:6
 msgid "Import %s file"
 msgstr ""
@@ -6796,193 +7523,186 @@ msgstr ""
 msgid "%s file"
 msgstr ""
 
-#: View/Events/view.ctp:49
-msgid "Extended view"
+#: View/Events/upload_stix.ctp:24
+msgid "Include the original imported file as attachment"
 msgstr ""
 
-#: View/Events/view.ctp:51
+#: View/Events/view.ctp:53
 #: View/Servers/preview_event.ctp:12
 #: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Event ID"
 msgstr ""
 
-#: View/Events/view.ctp:63
+#: View/Events/view.ctp:57
 msgid "Source Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:68
+#: View/Events/view.ctp:66
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:83
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
 msgid "Owner org"
 msgstr ""
 
-#: View/Events/view.ctp:131
+#: View/Events/view.ctp:135
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
 #: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
 msgstr ""
 
-#: View/Events/view.ctp:139
+#: View/Events/view.ctp:140
 #: View/Feeds/preview_event.ctp:37
 #: View/Pages/doc/using_the_system.ctp:70;177;210
 #: View/Servers/preview_event.ctp:48
 msgid "Analysis"
 msgstr ""
 
-#: View/Events/view.ctp:159
+#: View/Events/view.ctp:161
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr ""
 
-#: View/Events/view.ctp:165;167
+#: View/Events/view.ctp:165
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:169
+#: View/Events/view.ctp:173
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:171
+#: View/Events/view.ctp:177
+msgid "First recorded change"
+msgstr ""
+
+#: View/Events/view.ctp:181
 msgid "Last change"
 msgstr ""
 
-#: View/Events/view.ctp:176
+#: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:210
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:194
-msgid "Currently in "
+#: View/Events/view.ctp:217
+msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:202
-msgid "- restricted to own organisation only."
+#: View/Events/view.ctp:217
+msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:203
-msgid "Advanced Sightings"
-msgstr ""
-
-#: View/Events/view.ctp:219
-msgid "you"
-msgstr ""
-
-#: View/Events/view.ctp:220
-msgid " has"
-msgstr ""
-
-#: View/Events/view.ctp:223
-msgid "You have"
-msgstr ""
-
-#: View/Events/view.ctp:226
+#: View/Events/view.ctp:265
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:227
-msgid "%s requested that %s take over this event."
-msgstr ""
-
-#: View/Events/view.ctp:227
+#: View/Events/view.ctp:277
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:232
-msgid "Correlation"
-msgstr ""
-
-#: View/Events/view.ctp:238;247
-#: View/Users/admin_view.ctp:125
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:238
-msgid "enable"
-msgstr ""
-
-#: View/Events/view.ctp:242;249
-#: View/ObjectTemplates/index.ctp:32
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
 #: View/Taxonomies/view.ctp:24
-#: View/Warninglists/view.ctp:38
 msgid "Enabled"
 msgstr ""
 
-#: View/Events/view.ctp:242
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr ""
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:277
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr ""
+
+#: View/Events/view.ctp:328
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:335
+#: View/Events/view.ctp:386;415
 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."
+#: View/Events/view.ctp:387;416
+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
+#: View/Events/view.ctp:424
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Discussion"
 msgstr ""
 
@@ -7018,16 +7738,24 @@ msgstr ""
 msgid " Event #"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:7
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:6
 msgid "Publish Event%s"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:8
+msgid "Unpublish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:20
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
-#: View/Feeds/index.ctp:54
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Feeds/index.ctp:104
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -7037,10 +7765,6 @@ msgstr ""
 msgid "Choose the format that you wish to download the event in"
 msgstr ""
 
-#: View/Events/ajax/exportChoice.ctp:17;18;27;28
-msgid "Export as %s"
-msgstr ""
-
 #: View/Events/ajax/importChoice.ctp:2
 msgid "Choose the format that you would like to use for the import"
 msgstr ""
@@ -7211,7 +7935,7 @@ msgstr ""
 
 #: View/Feeds/add.ctp:156
 #: View/Feeds/edit.ctp:153
-#: View/Feeds/index.ctp:55
+#: View/Feeds/index.ctp:105
 msgid "Delta Merge"
 msgstr ""
 
@@ -7252,16 +7976,16 @@ msgstr ""
 
 #: View/Feeds/add.ctp:196
 #: View/Feeds/edit.ctp:191
-#: View/Servers/add.ctp:113
-#: View/Servers/edit.ctp:152;158
+#: View/Servers/add.ctp:102
+#: View/Servers/edit.ctp:147;153
 msgid "Modify"
 msgstr ""
 
-#: View/Feeds/compare_feeds.ctp:58
+#: View/Feeds/compare_feeds.ctp:66
 msgid "None or less than 1% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
-#: View/Feeds/compare_feeds.ctp:59
+#: View/Feeds/compare_feeds.ctp:67
 msgid "%s\\% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
@@ -7282,53 +8006,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr ""
 
 #: View/Feeds/edit.ctp:207
-#: View/Servers/add.ctp:143
-#: View/Servers/edit.ctp:186
+#: View/Servers/add.ctp:132
+#: View/Servers/edit.ctp:181
 msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
 msgstr ""
 
 #: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:185
+#: View/Servers/add.ctp:133
+#: View/Servers/edit.ctp:180
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
 #: View/Feeds/edit.ctp:209
-#: View/Servers/add.ctp:145
-#: View/Servers/edit.ctp:187
+#: View/Servers/add.ctp:134
+#: View/Servers/edit.ctp:182
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:146
-#: View/Servers/edit.ctp:188
+#: View/Servers/add.ctp:135
+#: View/Servers/edit.ctp:183
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
 #: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:189
+#: View/Servers/add.ctp:136
+#: View/Servers/edit.ctp:184
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:212
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:185
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:191
+#: View/Servers/edit.ctp:186
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:192
+#: View/Servers/edit.ctp:187
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority."
 msgstr ""
 
 #: View/Feeds/edit.ctp:215
-#: View/Servers/add.ctp:151
-#: View/Servers/edit.ctp:194
+#: View/Servers/add.ctp:140
+#: View/Servers/edit.ctp:189
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -7380,130 +8104,104 @@ msgstr ""
 msgid "Fetch and store all feed data"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
+#: View/Feeds/index.ctp:33
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
-msgid "Enable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:28
+#: View/Feeds/index.ctp:39
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:28
-msgid "Disable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:29
+#: View/Feeds/index.ctp:45
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:29
-msgid "Enable Caching for Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:51
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:30
-msgid "Disable Caching for  Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
-msgid "Default feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:61
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:31
+#: View/Feeds/index.ctp:66
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:32
+#: View/Feeds/index.ctp:71
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:32
-msgid "All Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:33
+#: View/Feeds/index.ctp:76
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:33
-msgid "Enabled Feeds"
+#: View/Feeds/index.ctp:95
+msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:48
+#: View/Feeds/index.ctp:96
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:98
 msgid "Feed Format"
 msgstr ""
 
-#: View/Feeds/index.ctp:50
-#: View/Jobs/index.ctp:76
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr ""
 
-#: View/Feeds/index.ctp:56
+#: View/Feeds/index.ctp:106
 msgid "Override IDS"
 msgstr ""
 
-#: View/Feeds/index.ctp:60
+#: View/Feeds/index.ctp:110
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:108
-#: View/Servers/index.ctp:73;74
+#: View/Feeds/index.ctp:158
+#: View/Servers/index.ctp:74;75
 msgid "Rules"
 msgstr ""
 
-#: View/Feeds/index.ctp:135
+#: View/Feeds/index.ctp:185
 msgid "Error: Invalid event!"
 msgstr ""
 
-#: View/Feeds/index.ctp:140
+#: View/Feeds/index.ctp:190
 msgid "Fixed event %s"
 msgstr ""
 
-#: View/Feeds/index.ctp:143
+#: View/Feeds/index.ctp:193
 msgid "New fixed event"
 msgstr ""
 
-#: View/Feeds/index.ctp:195
+#: View/Feeds/index.ctp:245
+#: View/Servers/index.ctp:94
 msgid "Age: "
 msgstr ""
 
-#: View/Feeds/index.ctp:197
+#: View/Feeds/index.ctp:247
+#: View/Servers/index.ctp:102
 msgid "Not cached"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:210
+#: View/Feeds/index.ctp:260
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 msgid "Are you sure you want to permanently remove the feed (%s)?"
 msgstr ""
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:267
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -7525,46 +8223,30 @@ msgid "Namespace"
 msgstr ""
 
 #: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:17
+#: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:19
+#: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:2
-msgid "Select Cluster"
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:11
-msgid "search clusters…"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "Galaxy Cluster Deletion"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:28
-msgid "Back to Galaxy Selection"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies."
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:2
-msgid "Select Cluster Source"
+#: View/GalaxyClusters/ajax/index.ctp:82
+msgid "Delete galaxy cluster"
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All clusters"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All Galaxies"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:2
-msgid "Select Galaxy Namespace Source"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All namespaces"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All Namespaces"
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
 msgstr ""
 
 #: View/Jobs/index.ctp:12
@@ -7579,37 +8261,37 @@ msgstr ""
 msgid "Completed."
 msgstr ""
 
-#: View/Jobs/index.ctp:63
+#: View/Jobs/index.ctp:68;98
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:74;99
 msgid "Show default queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:99
 #: View/Roles/admin_index.ctp:22
 #: View/Roles/index.ctp:22
 msgid "Default"
 msgstr ""
 
-#: View/Jobs/index.ctp:65
-msgid "Show email queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
-msgid "Show cache queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:101
 msgid "Cache"
 msgstr ""
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:127
 msgid "No worker active"
 msgstr ""
 
-#: View/Jobs/index.ctp:124
+#: View/Jobs/index.ctp:159
 msgid "View stacktrace"
 msgstr ""
 
@@ -7629,10 +8311,6 @@ msgstr ""
 msgid "No error data found. Generally job error data is purged from Redis after 24 hours, however, you can still view the errors in the log files in \"/app/tmp/logs\"."
 msgstr ""
 
-#: View/Jobs/ajax/error.ctp:34
-msgid "Close"
-msgstr ""
-
 #: View/Logs/admin_index.ctp:2
 #: View/Logs/event_index.ctp:6
 msgid "Logs"
@@ -7674,22 +8352,20 @@ msgstr ""
 msgid "from IP"
 msgstr ""
 
-#: View/Logs/admin_index.ctp:20;21
-msgid "Search"
-msgstr ""
-
-#: View/Logs/admin_index.ctp:59
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr ""
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:50
-#: View/ObjectTemplates/view.ctp:13
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/Templates/view.ctp:33
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
 msgstr ""
 
@@ -7775,12 +8451,12 @@ msgstr ""
 msgid "Target UUID"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:53
+#: View/ObjectReferences/ajax/add.ctp:54
 #: View/Objects/orphaned_object_diagnostics.ctp:38
 msgid "Object"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:68
+#: View/ObjectReferences/ajax/add.ctp:120
 msgid "Target Details"
 msgstr ""
 
@@ -7801,7 +8477,7 @@ msgid " The Attribute will be permanently deleted and unrecoverable. Also, this
 msgstr ""
 
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:24
-#: View/Pages/doc/categories_and_types.ctp:46
+#: View/Pages/doc/categories_and_types.ctp:40
 #: View/Pages/doc/md/categories_and_types.ctp:23
 msgid "Categories"
 msgstr ""
@@ -7822,43 +8498,35 @@ msgstr ""
 msgid "Object Template index"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:54
-#: View/ObjectTemplates/view.ctp:23
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:107
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:108
+#: View/ObjectTemplates/index.ctp:119
 msgid "Are you sure you want to delete template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:7
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/ObjectTemplates/view.ctp:33
 msgid " Object Template"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:9
-msgid "Object Template ID"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:2
-msgid "Select Object Category"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All meta-categories"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All Objects"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:50
-msgid "Back to categories"
-msgstr ""
-
 #: View/Objects/add.ctp:6
 msgid " Object"
 msgstr ""
@@ -7935,15 +8603,6 @@ msgstr ""
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:49
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/ajax/merge.ctp:65
-#: View/SharingGroups/add.ctp:32
-#: View/SharingGroups/edit.ctp:32
-msgid "UUID"
-msgstr ""
-
 #: View/Objects/ajax/delete.ctp:6
 msgid "Object Deletion"
 msgstr ""
@@ -7965,6 +8624,7 @@ msgid "Simply paste a list of all the organisation UUIDs that you wish to block
 msgstr ""
 
 #: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr ""
 
@@ -8089,9 +8749,9 @@ msgstr ""
 msgid "Click here"
 msgstr ""
 
-#: View/Organisations/index.ctp:5
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:51
+#: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr ""
@@ -8100,7 +8760,7 @@ msgstr ""
 msgid ", both local and remote"
 msgstr ""
 
-#: View/Organisations/index.ctp:9
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr ""
@@ -8109,7 +8769,7 @@ msgstr ""
 msgid " on other instances"
 msgstr ""
 
-#: View/Organisations/index.ctp:13
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr ""
@@ -8126,55 +8786,52 @@ msgstr ""
 msgid "View all"
 msgstr ""
 
-#: View/Organisations/index.ctp:65
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:30
 msgid "Logo"
 msgstr ""
 
-#: View/Organisations/index.ctp:76
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr ""
 
-#: View/Organisations/index.ctp:117
+#: View/Organisations/index.ctp:138
 #: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 ""
 
-#: View/Organisations/view.ctp:3
-msgid "Organisation "
-msgstr ""
-
-#: View/Organisations/view.ctp:7
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:4
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/Users/admin_view.ctp:9
-#: View/Users/view.ctp:4
-#: View/Warninglists/view.ctp:4
-msgid "Id"
-msgstr ""
-
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:12
 #: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr ""
 
-#: View/Organisations/view.ctp:26
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:40
-msgid "E-mail domain restrictions"
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
 msgstr ""
 
-#: View/Organisations/view.ctp:93;94
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr ""
+
+#: View/Organisations/view.ctp:62;63
 msgid "Members"
 msgstr ""
 
@@ -8187,7 +8844,6 @@ msgid "Available Organisations"
 msgstr ""
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
 msgid "Added Organisations"
 msgstr ""
 
@@ -8252,6 +8908,14 @@ msgstr ""
 msgid "Events need to have no validation issues"
 msgstr ""
 
+#: View/Pages/administration.ctp:15
+msgid "Recorrelate attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:16
+msgid "Recorrelate proposals"
+msgstr ""
+
 #: View/Pages/administration.ctp:18
 msgid "Verify Certificates"
 msgstr ""
@@ -8268,6 +8932,10 @@ msgstr ""
 msgid "Hotfix 2.3.57: Increase the max length of the organization field when adding a new server connection."
 msgstr ""
 
+#: View/Pages/administration.ctp:20
+msgid "Convert log fields to text"
+msgstr ""
+
 #: View/Pages/administration.ctp:20
 msgid "Hotfix 2.3.78: Some of the log fields that were varchar(255) ended up truncating the data. This function will change them to \"text\""
 msgstr ""
@@ -8280,18 +8948,34 @@ msgstr ""
 msgid "Hotfix 2.3.107: it was previously possible to get duplicate attribute UUIDs in the database, this script will remove all duplicates and ensure that duplicates will not be entered into the database in the future."
 msgstr ""
 
+#: View/Pages/administration.ctp:22
+msgid "Remove duplicate events (with the same UUID)"
+msgstr ""
+
 #: View/Pages/administration.ctp:22
 msgid "Hotfix 2.3.115: In some rare situations it could occur that a duplicate of an event was created on an instance, with the exact same uuid. This action will remove any such duplicates and make sure that this cannot happen again."
 msgstr ""
 
+#: View/Pages/administration.ctp:23
+msgid "Prune orphaned attributes"
+msgstr ""
+
 #: View/Pages/administration.ctp:23
 msgid "In some rare occasions it can happen that you end up with some attributes in your database that do not belong to an event - for example during a race condition between an event insert and a delete. This tool will collect and delete any such orphaned attributes. If you ever run into an issue where you cannot add an attribute with a specific valid value, this is probably the reason."
 msgstr ""
 
+#: View/Pages/administration.ctp:24
+msgid "Clean regex table of potentially malicious entries"
+msgstr ""
+
 #: View/Pages/administration.ctp:24
 msgid "Hotfix 2.3.160: Prior to this version it was possible for a user/admin with Regex permission to create a malicious regular expression that could be used to execute arbitrary code. Since this version it is no longer possible to input such expressions, but already existing malicious entries still have to be cleaned using this tool."
 msgstr ""
 
+#: View/Pages/administration.ctp:25
+msgid "Remove URL type attribute sanitisation"
+msgstr ""
+
 #: View/Pages/administration.ctp:25
 msgid "Hotfix 2.3.173: Sanitised URLs can cause issues with the NIDS exports and as of this version attributes will be modified on entry to correct this. To correct existing entries, run this script."
 msgstr ""
@@ -8345,7 +9029,6 @@ msgid "If the migration of your data from 2.4 is not complete this will lead to
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:3
-#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:3
 #: View/Pages/doc/general.ctp:3
 #: View/Pages/doc/quickstart.ctp:3;14
@@ -8355,7 +9038,6 @@ msgid "Quick Start"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:4
-#: View/Pages/doc/categories_and_types.ctp:4
 #: View/Pages/doc/concepts.ctp:4
 #: View/Pages/doc/general.ctp:4;14
 #: View/Pages/doc/quickstart.ctp:4
@@ -8365,7 +9047,6 @@ msgid "General Layout"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:5
-#: View/Pages/doc/categories_and_types.ctp:5
 #: View/Pages/doc/concepts.ctp:5;14
 #: View/Pages/doc/general.ctp:5
 #: View/Pages/doc/quickstart.ctp:5
@@ -8375,7 +9056,6 @@ msgid "General Concepts"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:6
-#: View/Pages/doc/categories_and_types.ctp:6
 #: View/Pages/doc/concepts.ctp:6
 #: View/Pages/doc/general.ctp:6
 #: View/Pages/doc/quickstart.ctp:6
@@ -8385,7 +9065,6 @@ msgid "User Management and Global actions"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:7
-#: View/Pages/doc/categories_and_types.ctp:7
 #: View/Pages/doc/concepts.ctp:7
 #: View/Pages/doc/general.ctp:7
 #: View/Pages/doc/quickstart.ctp:7
@@ -8428,7 +9107,7 @@ msgid "FAQ"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:22
-#: View/Pages/doc/categories_and_types.ctp:9
+#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:9
 #: View/Pages/doc/general.ctp:9
 #: View/Pages/doc/quickstart.ctp:9
@@ -8486,6 +9165,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
+#: View/Servers/edit.ctp:82
 msgid "Misc settings"
 msgstr ""
 
@@ -8704,8 +9384,8 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_view.ctp:40
-#: View/Users/view.ctp:34
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
 msgid "Authkey"
 msgstr ""
 
@@ -8758,8 +9438,8 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_view.ctp:29
-#: View/Users/view.ctp:24
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr ""
 
@@ -8780,8 +9460,6 @@ msgid "Shows the currently assigned NIDS ID."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:109;125
-#: View/Users/admin_view.ctp:100
-#: View/Users/view.ctp:55
 msgid "Termsaccepted"
 msgstr ""
 
@@ -8790,7 +9468,7 @@ msgid "This flag indicates whether the user has accepted the terms of use or not
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:110
-#: View/Users/admin_view.ctp:120
+#: View/Users/admin_view.ctp:84
 msgid "Newsread"
 msgstr ""
 
@@ -8852,7 +9530,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:133;184;197
 #: View/Pages/doc/using_the_system.ctp:269
-#: View/Taxonomies/view.ctp:78
+#: View/Taxonomies/view.ctp:89
 msgid "Action"
 msgstr ""
 
@@ -9329,16 +10007,16 @@ msgstr ""
 msgid "This will create a new password hash using the currently set salt."
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:13
+#: View/Pages/doc/categories_and_types.ctp:7
 msgid "Attribute Categories and Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:14
+#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/md/categories_and_types.ctp:1
 msgid "Attribute Categories vs. Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:80
+#: View/Pages/doc/categories_and_types.ctp:74
 msgid "Click here to get the .md version for gitbook generation."
 msgstr ""
 
@@ -9347,7 +10025,7 @@ msgid "Admins and Site Admins"
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:16
-msgid "There are two types of admins in MISP: Admins (also refered to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
+msgid "There are two types of admins in MISP: Admins (also referred to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:17
@@ -9478,10 +10156,6 @@ msgstr ""
 msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:20
-msgid "Event Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:20
 msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
 msgstr ""
@@ -9490,18 +10164,10 @@ msgstr ""
 msgid "Input filters alter what and how data can be entered into this instance. Apart from the basic validation of attribute entry by type, it is possible for the site administrators to define regular expression replacements and blacklists for certain values in addition to blocking certain values from being exportable. Users can view these replacement and blacklist rules here whilst administrator can alter them."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:22;54
-msgid "Global Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:22
 msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:23;66
-msgid "Sync Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:23
 msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
 msgstr ""
@@ -9627,6 +10293,11 @@ msgstr ""
 msgid "A link to this user guide."
 msgstr ""
 
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr ""
+
 #: View/Pages/doc/general.ctp:61
 msgid "View the terms &amp; conditions again."
 msgstr ""
@@ -9892,7 +10563,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:47
+#: View/Users/statistics_data.ctp:53
 msgid "Activity Heatmap"
 msgstr ""
 
@@ -10814,12 +11485,6 @@ msgstr ""
 msgid "As described earlier, users with tagging rights can arbitrarily tag events using tags chosen from a pool of available options. If you have tagging privileges and would like to create a new tag, navigate to Event Actions - Add Tag. You'll be presented with the following form"
 msgstr ""
 
-#: View/Pages/doc/using_the_system.ctp:303
-#: View/Templates/add.ctp:17
-#: View/Templates/edit.ctp:17
-msgid "Add tag"
-msgstr ""
-
 #: View/Pages/doc/using_the_system.ctp:303
 msgid "Enter a name for the tag and click on the color field to be able to pick a colour for it."
 msgstr ""
@@ -11149,8 +11814,8 @@ msgid "Make sure that you enter the authentication key that you have been given
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:397
-#: View/Servers/add.ctp:7
-#: View/Servers/edit.ctp:7
+#: View/Servers/add.ctp:8
+#: View/Servers/edit.ctp:8
 msgid "Base URL"
 msgstr ""
 
@@ -11251,7 +11916,7 @@ msgid "Clicking the delete button will delete the link to the instance."
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:418
-#: View/Servers/index.ctp:92
+#: View/Servers/index.ctp:128
 msgid "Push all"
 msgstr ""
 
@@ -11260,7 +11925,7 @@ msgid " By clicking this button, all events that are eligible to be pushed on th
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:419
-#: View/Servers/index.ctp:89
+#: View/Servers/index.ctp:125
 msgid "Pull all"
 msgstr ""
 
@@ -11414,7 +12079,7 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
-#: View/Roles/view.ctp:14
+#: View/Roles/view.ctp:5
 msgid "Permission level"
 msgstr ""
 
@@ -11422,136 +12087,155 @@ msgstr ""
 msgid "Add Server"
 msgstr ""
 
-#: View/Servers/add.ctp:10
-#: View/Servers/edit.ctp:10
+#: View/Servers/add.ctp:6
+#: View/Servers/edit.ctp:6
+msgid "Instance identification"
+msgstr ""
+
+#: View/Servers/add.ctp:11
+#: View/Servers/edit.ctp:11
 msgid "Instance name"
 msgstr ""
 
-#: View/Servers/add.ctp:16
+#: View/Servers/add.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change."
 msgstr ""
 
-#: View/Servers/add.ctp:19
-#: View/Servers/edit.ctp:19
+#: View/Servers/add.ctp:20
+#: View/Servers/edit.ctp:20
 msgid "Internal instance"
 msgstr ""
 
-#: View/Servers/add.ctp:29
+#: View/Servers/add.ctp:30
+#: View/Servers/edit.ctp:31
+msgid "Instance ownership and credentials"
+msgstr ""
+
+#: View/Servers/add.ctp:31
+#: View/Servers/edit.ctp:32
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr ""
 
-#: View/Servers/add.ctp:35
+#: View/Servers/add.ctp:37
 msgid "Remote Sync Organisation Type"
 msgstr ""
 
-#: View/Servers/add.ctp:40
-#: View/Servers/edit.ctp:37
+#: View/Servers/add.ctp:42
+#: View/Servers/edit.ctp:43
 msgid "External Organisation"
 msgstr ""
 
-#: View/Servers/add.ctp:46
-#: View/Servers/edit.ctp:48
-msgid "Local Organisation"
+#: View/Servers/add.ctp:48
+msgid "Owner of remote instance"
 msgstr ""
 
-#: View/Servers/add.ctp:52
-#: View/Servers/edit.ctp:59
+#: View/Servers/add.ctp:54
+#: View/Servers/edit.ctp:65
 msgid "Remote Organisation's Name"
 msgstr ""
 
-#: View/Servers/add.ctp:56
-#: View/Servers/edit.ctp:63
+#: View/Servers/add.ctp:58
+#: View/Servers/edit.ctp:69
 msgid "Remote Organisation's Uuid"
 msgstr ""
 
-#: View/Servers/add.ctp:97
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:78
+msgid "Enabled synchronisation methods"
+msgstr ""
+
+#: View/Servers/add.ctp:86
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:103
+#: View/Servers/add.ctp:92
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:108
-#: View/Servers/edit.ctp:147
+#: View/Servers/add.ctp:97
+#: View/Servers/edit.ctp:142
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:109;115
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:98;104
+#: View/Servers/edit.ctp:143;149
 msgid "Events with the following tags allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:110;116
-#: View/Servers/edit.ctp:149;155
+#: View/Servers/add.ctp:99;105
+#: View/Servers/edit.ctp:144;150
 msgid "Events with the following tags blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:111;117
-#: View/Servers/edit.ctp:150;156
+#: View/Servers/add.ctp:100;106
+#: View/Servers/edit.ctp:145;151
 msgid "Events with the following organisations allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:112;118
-#: View/Servers/edit.ctp:151;157
+#: View/Servers/add.ctp:101;107
+#: View/Servers/edit.ctp:146;152
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:114
-#: View/Servers/edit.ctp:153
+#: View/Servers/add.ctp:103
+#: View/Servers/edit.ctp:148
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:142
-#: View/Servers/edit.ctp:184
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:179
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:148
+#: View/Servers/add.ctp:137
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:149
+#: View/Servers/add.ctp:138
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:150
+#: View/Servers/add.ctp:139
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr ""
 
-#: View/Servers/edit.ctp:16
+#: View/Servers/edit.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change. This also requires that the current instance's host organisation and the remote sync organisation are the same."
 msgstr ""
 
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:37
 msgid "Organisation Type"
 msgstr ""
 
-#: View/Servers/edit.ctp:69
+#: View/Servers/edit.ctp:54
+msgid "Local Organisation"
+msgstr ""
+
+#: View/Servers/edit.ctp:75
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:104
+#: View/Servers/edit.ctp:99
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:112;134
+#: View/Servers/edit.ctp:107;129
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:113;135
+#: View/Servers/edit.ctp:108;130
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:126
+#: View/Servers/edit.ctp:121
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:193
+#: View/Servers/edit.ctp:188
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:250;254
+#: View/Servers/edit.ctp:245;249
 msgid "Not set."
 msgstr ""
 
@@ -11564,7 +12248,7 @@ msgid "Example:"
 msgstr ""
 
 #: View/Servers/filter_event_index.ctp:21
-msgid "Apply filters to the remote instance"
+msgid "Apply filters to the remote instance's index"
 msgstr ""
 
 #: View/Servers/index.ctp:2
@@ -11575,34 +12259,38 @@ msgstr ""
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:30
+#: View/Servers/index.ctp:31
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Internal instance that ignores distribution level degradation *WARNING: Only use this setting if you have several internal instances and the sync link is to an internal extension of the current MISP community*"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:86
+#: View/Servers/index.ctp:122
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:88
+#: View/Servers/index.ctp:124
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
+#: View/Servers/index.ctp:131
+msgid "Cache instance"
+msgstr ""
+
 #: View/Servers/preview_event.ctp:7
 msgid "You are currently viewing an event on the remote instance %s "
 msgstr ""
@@ -11619,15 +12307,15 @@ msgstr ""
 msgid "You are currently viewing the event index of the remote instance %s"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "published"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:147
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr ""
 
@@ -11671,19 +12359,23 @@ msgstr ""
 msgid "No succeeded pushes"
 msgstr ""
 
-#: View/Servers/rest.ctp:7;17
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:54
+#: View/Servers/rest.ctp:116
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:55
+#: View/Servers/rest.ctp:117
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:56
+#: View/Servers/rest.ctp:118
 msgid "Headers"
 msgstr ""
 
@@ -11703,6 +12395,10 @@ msgstr ""
 msgid "Available Instances"
 msgstr ""
 
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
+msgid "Added Instances"
+msgstr ""
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 msgid "Add servers to sharing group"
 msgstr ""
@@ -11750,39 +12446,31 @@ msgstr ""
 msgid "IDS Signature?"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:21
-msgid "Only list proposals of my organisation"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:21
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:26
-msgid "List all proposals"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:26
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:33
+#: View/ShadowAttributes/index.ctp:43
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:39
+#: View/ShadowAttributes/index.ctp:49
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:45
+#: View/ShadowAttributes/index.ctp:55
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:71
+#: View/ShadowAttributes/index.ctp:81
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:73
+#: View/ShadowAttributes/index.ctp:83
 msgid "New Attribute"
 msgstr ""
 
@@ -11810,166 +12498,166 @@ msgstr ""
 msgid "New Sharing Group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
-msgid "General tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
 msgid "General"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
 msgid "Organisations tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
-msgid "MISP instances tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
 msgid "MISP Instances"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
-msgid "Sharing group summary"
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:12
-#: View/SharingGroups/edit.ctp:12
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
 msgid "Example: Multinational sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:13
-#: View/SharingGroups/edit.ctp:13
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
 msgid "Releasable to"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:14
-#: View/SharingGroups/edit.ctp:14
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
 msgid "Example: Community1, Organisation1, Organisation2"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:16
-#: View/SharingGroups/edit.ctp:16
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
 msgid "A description of the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:18
-#: View/SharingGroups/edit.ctp:18
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
 msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:19
-#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
 msgid "Make the sharing group selectable (active)"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:21;38;59
-#: View/SharingGroups/edit.ctp:21;38;67
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
 msgid "Next page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation(s) to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisations to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:33
-#: View/SharingGroups/edit.ctp:33
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
 #: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:37;58;74
-#: View/SharingGroups/edit.ctp:37;66;82
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
 msgid "Previous page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:42
-#: View/SharingGroups/edit.ctp:50
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
 msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:43
-#: View/SharingGroups/edit.ctp:51
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
 msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:47
-#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:53
-#: View/SharingGroups/edit.ctp:61
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
 #: View/SharingGroups/view.ctp:69
 msgid "All orgs"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:63
+#: View/SharingGroups/add.ctp:103
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:64
+#: View/SharingGroups/add.ctp:104
 msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/add.ctp:105
 msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/add.ctp:106
 msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:67
-#: View/SharingGroups/edit.ctp:75
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
 msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:75
-#: View/SharingGroups/edit.ctp:83
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
 msgid "Submit and create sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:95
+#: View/SharingGroups/add.ctp:135
 msgid "Local instance"
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:71
+#: View/SharingGroups/edit.ctp:111
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
 "                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
 "                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:74
+#: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
@@ -11977,23 +12665,15 @@ msgstr ""
 msgid "Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:20
-msgid "View only active sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:20
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:21
-msgid "View only passive sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:21
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:61
+#: View/SharingGroups/index.ctp:80
 msgid "Distribution List"
 msgstr ""
 
@@ -12037,6 +12717,18 @@ msgstr ""
 msgid "Delete sighting"
 msgstr ""
 
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
+msgid "Add Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
+msgstr ""
+
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
 msgid "Remove Sighting"
 msgstr ""
@@ -12049,6 +12741,26 @@ msgstr ""
 msgid "Remove sighting"
 msgstr ""
 
+#: View/TagCollections/add.ctp:8
+msgid "Edit Tag Collection"
+msgstr ""
+
+#: View/TagCollections/add.ctp:16
+msgid "Visible to all orgs"
+msgstr ""
+
+#: View/TagCollections/import.ctp:4
+msgid "Paste tag collection data"
+msgstr ""
+
+#: View/TagCollections/import.ctp:5
+msgid "Paste a MISP tag collection JSON below to add tag collections."
+msgstr ""
+
+#: View/TagCollections/import.ctp:10
+msgid "Tag collection JSON"
+msgstr ""
+
 #: View/Tags/add.ctp:12
 #: View/Tags/edit.ctp:12
 msgid "Restrict tagging to org"
@@ -12059,6 +12771,10 @@ msgstr ""
 msgid "Restrict tagging to user"
 msgstr ""
 
+#: View/Tags/edit.ctp:31
+msgid "Unselectable Tag"
+msgstr ""
+
 #: View/Tags/index.ctp:10
 msgid "Your Favourite Tags"
 msgstr ""
@@ -12091,57 +12807,6 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:2
-msgid "Select Tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:16
-#: View/Tags/ajax/taxonomy_choice.ctp:4
-msgid "search tags…"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:25
-msgid "Attach tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Return to taxonomy selection"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Select Taxonomy"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Back to Taxonomy Selection"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:2
-msgid "Select Tag Source"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:10
-msgid "Favourite Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:14
-msgid "Custom Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:17
-msgid "All Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:21
-#: View/Taxonomies/view.ctp:2
-msgid "Taxonomy Library"
-msgstr ""
-
 #: View/Tasks/index.ctp:4
 msgid "Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks."
 msgstr ""
@@ -12179,7 +12844,8 @@ msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:41
-#: View/Taxonomies/view.ctp:29;143
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr ""
 
@@ -12189,7 +12855,8 @@ msgid "Are you sure you want to disable this taxonomy library?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:31;147
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr ""
 
@@ -12206,19 +12873,27 @@ msgstr ""
 msgid "Create and/or update selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:116
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
 msgid "Hidden"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:125
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:142
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:147
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr ""
 
@@ -12246,6 +12921,30 @@ msgstr ""
 msgid "Create / update all taxonomy entries as tags"
 msgstr ""
 
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
 #: View/TemplateElements/ajax/ajaxIndex.ctp:2
 msgid "Template Elements"
 msgstr ""
@@ -12498,6 +13197,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
 msgid "Terms accepted"
 msgstr ""
 
@@ -12564,15 +13265,19 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: View/Users/admin_email.ctp:36
+#: View/Users/admin_email.ctp:19
+msgid "All users of the same organisation"
+msgstr ""
+
+#: View/Users/admin_email.ctp:39
 msgid "Enter a custom message"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "New user registration"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "Password reset"
 msgstr ""
 
@@ -12596,10 +13301,6 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: View/Users/admin_index.ctp:40
-msgid "Filter user index"
-msgstr ""
-
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr ""
@@ -12612,42 +13313,48 @@ msgstr ""
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr ""
 
-#: View/Users/admin_view.ctp:35
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
 msgid "Contactalert"
 msgstr ""
 
-#: View/Users/admin_view.ctp:46
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/admin_view.ctp:44
 msgid "Invited By"
 msgstr ""
 
-#: View/Users/admin_view.ctp:51
-msgid "Org admin"
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:74
-#: View/Users/view.ctp:67
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr ""
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:80
-#: View/Users/view.ctp:73
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
 msgid "GnuPG status"
 msgstr ""
 
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:83
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
 msgid "SMIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:95
-msgid "Nids Sid"
-msgstr ""
-
-#: View/Users/admin_view.ctp:110
-msgid "Password change"
-msgstr ""
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr ""
@@ -12680,37 +13387,37 @@ msgid "Proposals active"
 msgstr ""
 
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:34
+#: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
 msgstr ""
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:39
+#: View/Users/statistics_data.ctp:45
 msgid "Discussion posts"
 msgstr ""
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:48
+#: View/Users/statistics_data.ctp:54
 msgid "A heatmap showing user activity for each day during this month and the 4 months that preceded it. Use the buttons below to only show the heatmap of a specific organisation."
 msgstr ""
 
 #: View/Users/statistics.ctp:60
-#: View/Users/statistics_data.ctp:65
+#: View/Users/statistics_data.ctp:71
 msgid "Go left"
 msgstr ""
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:71
+#: View/Users/statistics_data.ctp:77
 msgid "Go right"
 msgstr ""
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:118
+#: View/Users/statistics_data.ctp:124
 msgid "The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings."
 msgstr ""
 
 #: View/Users/statistics.ctp:117
-#: View/Users/statistics_data.ctp:122
+#: View/Users/statistics_data.ctp:128
 msgid "The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer."
 msgstr ""
 
@@ -12718,6 +13425,18 @@ msgstr ""
 msgid "A heatmap showing the usage of ATT&CK Tactic."
 msgstr ""
 
+#: View/Users/statistics_data.ctp:32
+msgid "Users with PGP keys"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:36
+msgid "Local Organisations"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:38
+msgid "Average Users / Org"
+msgstr ""
+
 #: View/Users/statistics_orgs.ctp:17
 msgid "Organisation list"
 msgstr ""
@@ -12786,12 +13505,12 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
-#: View/Users/view.ctp:45
-msgid "Request API access"
+#: View/Users/ajax/emailConfirmTemplate.ctp:2
+msgid "Confirm sending"
 msgstr ""
 
-#: View/Users/view.ctp:50
-msgid "NIDS Start SID"
+#: View/Users/ajax/emailConfirmTemplate.ctp:4
+msgid "You are about to send a mail to %s recipient(s)?"
 msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:2
@@ -12854,7 +13573,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:29
+#: View/Warninglists/view.ctp:14;16
 msgid "Accepted attribute types"
 msgstr ""
 
@@ -12930,6 +13649,7 @@ msgstr ""
 #: Model/Attribute.php:validation for field uuid
 #: Model/Event.php:validation for field uuid;validation for field extends_uuid
 #: Model/EventBlacklist.php:validation for field event_uuid
+#: Model/MispObject.php:validation for field uuid
 #: Model/OrgBlacklist.php:validation for field org_uuid
 #: Model/Organisation.php:validation for field uuid
 #: Model/ShadowAttribute.php:validation for field uuid
@@ -12938,6 +13658,7 @@ msgid "Please provide a valid UUID"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/MispObject.php:validation for field uuid
 msgid "The UUID provided is not unique"
 msgstr ""
 
@@ -12957,6 +13678,7 @@ msgstr ""
 #: Model/ServerTag.php:validation for field server_id;validation for field tag_id
 #: Model/SharingGroup.php:validation for field name
 #: Model/Tag.php:validation for field name;validation for field colour
+#: Model/TagCollection.php:validation for field name
 #: Model/TemplateElementAttribute.php:validation for field name;validation for field description
 #: Model/ThreatLevel.php:validation for field name;validation for field description;validation for field form_description
 #: Model/User.php:validation for field org_id;validation for field authkey
@@ -13056,6 +13778,7 @@ msgid "This field is required."
 msgstr ""
 
 #: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
 #: Model/Whitelist.php:validation for field name
 msgid "A similar name already exists."
 msgstr ""
diff --git a/app/Locale/dan/LC_MESSAGES/default.po b/app/Locale/dan/LC_MESSAGES/default.po
index c5fd854e7..45953f6b8 100644
--- a/app/Locale/dan/LC_MESSAGES/default.po
+++ b/app/Locale/dan/LC_MESSAGES/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-01-22 21:22\n"
+"PO-Revision-Date: 2019-03-06 02:04\n"
 "Last-Translator: SteveClement <steve@localhost.lu>\n"
 "Language-Team: Danish\n"
 "MIME-Version: 1.0\n"
@@ -15,272 +15,285 @@ msgstr ""
 "Language: da_DK\n"
 
 #: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:149;153;157
+#: Controller/AttributesController.php:125;129;133
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1001;1348;1352;1356;1385;1800;1876;1880;1884;2102;2166;2248;2903;5264;5429;5433;5442
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
 #: Controller/PostsController.php:56
+#: Model/Galaxy.php:292
 msgid "Invalid event"
 msgstr "Ugyldigt event"
 
-#: Controller/AppController.php:607
+#: Console/Command/ServerShell.php:49
+#: Controller/ServersController.php:632
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+msgstr ""
+
+#: Console/Command/ServerShell.php:51
+msgid "ERROR: %s"
+msgstr ""
+
+#: Controller/AppController.php:383
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr ""
+
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
+msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+msgstr "Denne autentifikationsnøgle er ikke godkendt til eksport. Kontakt din administrator."
+
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
+msgid "You have to be logged in to do that."
+msgstr "Du skal være logget ind for at gøre det."
+
+#: Controller/AppController.php:627
+msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
+msgstr ""
+
+#: Controller/AppController.php:752
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Udført. attribute_count genereret på ny til "
 
-#: Controller/AppController.php:726
-#: Controller/AttributesController.php:2668
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
 #: Controller/ShadowAttributesController.php:1276
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "Job sat i kø. Du kan se forløbet, hvis du går til visning af aktive jobs (Administration -> Job)."
 
-#: Controller/AttributesController.php:140;1392
+#: Controller/AttributesController.php:116;1403
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "Intet begivenheds-ID sat."
 
-#: Controller/AttributesController.php:143
+#: Controller/AttributesController.php:119
 msgid "You don't have permissions to create attributes"
 msgstr "Du har ikke tilladelse til at oprette attributter"
 
-#: Controller/AttributesController.php:163;489;666
+#: Controller/AttributesController.php:139;488;668
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1684;1705;1739
-#: Controller/ObjectsController.php:442
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
 msgid "You do not have permission to do that."
 msgstr "Du har ikke rettighed til at gøre dette."
 
-#: Controller/AttributesController.php:414;864;869;873;1072;1152;2684;2698;2731;2753;2762;3309;3313;3409;3413
-#: Controller/ShadowAttributesController.php:824;1067;1091;1124;1134
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
 #: Controller/TagsController.php:491
 msgid "Invalid attribute"
 msgstr "Ugyldig Attribut"
 
-#: Controller/AttributesController.php:424
-#: Controller/ShadowAttributesController.php:500
+#: Controller/AttributesController.php:421
+#: Controller/ShadowAttributesController.php:499
 msgid "You do not have the permission to view this event."
 msgstr "Du har ikke rettighed til at se denne begivenhed."
 
-#: Controller/AttributesController.php:472
+#: Controller/AttributesController.php:468
 msgid "Attribute not an attachment or malware-sample"
 msgstr "Attribut er ikke en vedhæftning eller malware-eksempel"
 
-#: Controller/AttributesController.php:504;677
-#: Controller/ShadowAttributesController.php:548
-msgid "PHP says file was not uploaded. Are you attacking me?"
-msgstr "PHP siger, at filen ikke blev uploaded. Angriber du mig?"
-
-#: Controller/AttributesController.php:680
-#: Controller/ShadowAttributesController.php:551;561
-msgid "There was a problem to upload the file."
-msgstr "Der var et problem ifm. fil-uploaden."
-
-#: Controller/AttributesController.php:824
-msgid "The ThreatConnect data has been imported."
-msgstr "ThreatConnect-dataene blev importeret."
-
-#: Controller/AttributesController.php:827
-msgid "%s entries imported."
-msgstr "%s poster importeret."
-
-#: Controller/AttributesController.php:831
-msgid "%s entries could not be imported."
-msgstr "%s poster kunne ikke importeres."
-
-#: Controller/AttributesController.php:881;924;926
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "Ugyldig attribut."
-
-#: Controller/AttributesController.php:920
-msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
-msgstr "Attribut kunne ikke gemmes: Attribut i forespørgslen er ikke nyere end den lokale kopi."
-
-#: Controller/AttributesController.php:936;1401
-#: Controller/EventsController.php:4635;4648;5213;5227
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
 msgid "Invalid Event."
 msgstr "Ugyldig begivenhed."
 
-#: Controller/AttributesController.php:953
+#: Controller/AttributesController.php:503;679
+#: Controller/ShadowAttributesController.php:546
+msgid "PHP says file was not uploaded. Are you attacking me?"
+msgstr "PHP siger, at filen ikke blev uploaded. Angriber du mig?"
+
+#: Controller/AttributesController.php:682
+#: Controller/ShadowAttributesController.php:549;559
+msgid "There was a problem to upload the file."
+msgstr "Der var et problem ifm. fil-uploaden."
+
+#: Controller/AttributesController.php:826
+msgid "The ThreatConnect data has been imported."
+msgstr "ThreatConnect-dataene blev importeret."
+
+#: Controller/AttributesController.php:829
+msgid "%s entries imported."
+msgstr "%s poster importeret."
+
+#: Controller/AttributesController.php:833
+msgid "%s entries could not be imported."
+msgstr "%s poster kunne ikke importeres."
+
+#: Controller/AttributesController.php:883;931;933
+#: Controller/ShadowAttributesController.php:829
+msgid "Invalid attribute."
+msgstr "Ugyldig attribut."
+
+#: Controller/AttributesController.php:927
+msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
+msgstr "Attribut kunne ikke gemmes: Attribut i forespørgslen er ikke nyere end den lokale kopi."
+
+#: Controller/AttributesController.php:960
 msgid "The attribute has been saved"
 msgstr "Attributten er gemt"
 
-#: Controller/AttributesController.php:985
+#: Controller/AttributesController.php:995
 msgid "The attribute could not be saved. Please, try again."
 msgstr "Attributten kunne ikke gemmes. Forsøg igen."
 
-#: Controller/AttributesController.php:1076
+#: Controller/AttributesController.php:1087
 msgid "Invalid event id."
 msgstr "Ugyldigt event id."
 
-#: Controller/AttributesController.php:1106
-#: Controller/EventsController.php:2023
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
+#: Controller/ShadowAttributesController.php:729
 msgid "Invalid input."
 msgstr "Ugyldigt input."
 
-#: Controller/AttributesController.php:1111
+#: Controller/AttributesController.php:1122
 msgid "Invalid field."
 msgstr "Ugyldigt felt."
 
-#: Controller/AttributesController.php:1156
+#: Controller/AttributesController.php:1167
 msgid "Invalid attribute id."
 msgstr "Ugyldigt attribut id."
 
-#: Controller/AttributesController.php:1231;1241
+#: Controller/AttributesController.php:1242;1252
 msgid "Attribute deleted"
 msgstr "Attribut slettet"
 
-#: Controller/AttributesController.php:1236;1238
+#: Controller/AttributesController.php:1247;1249
 msgid "Attribute was not deleted"
 msgstr "Attributten blev ikke slettet"
 
-#: Controller/AttributesController.php:1263;3155
-#: Controller/ShadowAttributesController.php:864
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
 msgid "Invalid Attribute"
 msgstr "Ugyldig Attribut"
 
-#: Controller/AttributesController.php:1290
+#: Controller/AttributesController.php:1301
 msgid "Could not restore the attribute"
 msgstr "Kunne ikke gendanne attributten"
 
-#: Controller/AttributesController.php:1311;1318;1322
+#: Controller/AttributesController.php:1322;1329;1333
 msgid "Attribute not found or not authorised."
 msgstr "Attributten ikke fundet eller ikke autoriseret."
 
-#: Controller/AttributesController.php:1372
+#: Controller/AttributesController.php:1383
 msgid "This function is only accessible via POST requests."
 msgstr "Denne funktion er kun tilgængelig via POST-forespørgsler."
 
-#: Controller/AttributesController.php:1427
+#: Controller/AttributesController.php:1438
 msgid "No matching attributes found."
 msgstr "Ingen matchende attributter fundet."
 
-#: Controller/AttributesController.php:1461
+#: Controller/AttributesController.php:1472
 msgid "This method can only be accessed via AJAX."
 msgstr "Denne metode kan kun tilgås via AJAX."
 
-#: Controller/AttributesController.php:1472
+#: Controller/AttributesController.php:1482
 msgid "You are not authorized to edit this event."
 msgstr "Du er ikke autoriseret til at redigere denne begivenhed."
 
-#: Controller/AttributesController.php:1537
+#: Controller/AttributesController.php:1580
 msgid "No event ID provided."
 msgstr "Intet begivenheds-ID givet."
 
-#: Controller/AttributesController.php:1640
-msgid "Invalid tag"
-msgstr "Ugyldigt tag"
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
+msgid "Synonyms: "
+msgstr ""
 
-#: Controller/AttributesController.php:2107;2282;2391;2441;2524;2610
-#: Controller/EventsController.php:2484;2600;2662;2720;3079;3301;3993;4011
-msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
-msgstr "Denne autentifikationsnøgle er ikke godkendt til eksport. Kontakt din administrator."
-
-#: Controller/AttributesController.php:2112;2277;2384
-#: Controller/EventsController.php:3084
+#: Controller/AttributesController.php:1997;2104
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr "Du er ikke autoriseret. Send Authorization-headeren med din auth-nøgle sammen med en Accept-header for application/xml."
 
-#: Controller/AttributesController.php:2123
-msgid "Content type and parameter mismatch. Expecting JSON."
-msgstr "Indholdstype og parameter uoverensstemmelse. Forventer JSON."
-
-#: Controller/AttributesController.php:2128
-msgid "Content type and parameter mismatch. Expecting XML."
-msgstr "Indholdstype og parameter uoverensstemmelse. Forventer XML."
-
-#: Controller/AttributesController.php:2132;2290
+#: Controller/AttributesController.php:2010
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
 msgstr "Angiv enten søgeordene i URL'en eller POST et JSON-array/XML-fil (hvori rodelementet er \"request\" og angiv de korrekte headers for accept og indholdstype)."
 
-#: Controller/AttributesController.php:2310
+#: Controller/AttributesController.php:2030
 msgid "You don't have access to that event."
 msgstr "Du har ikke adgang til den begivenhed."
 
-#: Controller/AttributesController.php:2373
+#: Controller/AttributesController.php:2093
 msgid "No matches."
 msgstr "Der er ingen matches."
 
-#: Controller/AttributesController.php:2395;2404
+#: Controller/AttributesController.php:2115;2124
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Ugyldig attribut eller manglende rettigheder til at se den."
 
-#: Controller/AttributesController.php:2445;2528;2614
-#: Controller/EventsController.php:2488;2605;2667;2724;3305;3997;4015
-msgid "You have to be logged in to do that."
-msgstr "Du skal være logget ind for at gøre det."
-
-#: Controller/AttributesController.php:2472
+#: Controller/AttributesController.php:2192
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
 msgstr "Angiv enten søgeordene i URL'en eller POST et JSON-array/XML-fil (hvori rodelementet er \"request\" og angiv de korrekte headers jf. indholdstypen)."
 
-#: Controller/AttributesController.php:2536
+#: Controller/AttributesController.php:2256
 msgid "Invalid event ID format."
 msgstr "Ugyldig event ID format."
 
-#: Controller/AttributesController.php:2645
+#: Controller/AttributesController.php:2365
 #: Controller/ShadowAttributesController.php:1254
 msgid "All done. "
 msgstr "Afsluttet. "
 
-#: Controller/AttributesController.php:2677;2724
+#: Controller/AttributesController.php:2397;2444
 #: Controller/ShadowAttributesController.php:1062
 msgid "Invalid field requested."
 msgstr "Forespørgsel på ugyldigt felt."
 
-#: Controller/AttributesController.php:2680;2727
+#: Controller/AttributesController.php:2400;2447
 msgid "This function can only be accessed via AJAX."
 msgstr "Denne funktion kan kun tilgås via AJAX."
 
-#: Controller/AttributesController.php:2792;2800
-#: Controller/EventsController.php:3689;3967
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "Begivenhed ikke fundet eller du har ikke rettighed til at oprette attributter"
 
-#: Controller/AttributesController.php:2821
+#: Controller/AttributesController.php:2541
 msgid "This action can only be accessed via AJAX."
 msgstr "Denne handling kan kun tilgås via AJAX."
 
-#: Controller/AttributesController.php:2830;3081;3095;3106
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
 msgid "You are not authorised to do that."
 msgstr "Du har ikke rettigheder til at gøre dette."
 
-#: Controller/AttributesController.php:2935
-#: Controller/EventsController.php:4431
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
 msgid "This functionality requires API key access."
 msgstr "Denne funktionalitet kræver API-nøgle adgang."
 
-#: Controller/AttributesController.php:2943
+#: Controller/AttributesController.php:2663
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr "Denne handling er kun til API'et. Se automatiseringssiden for oplysninger om, hvordan den benyttes."
 
-#: Controller/AttributesController.php:2955
+#: Controller/AttributesController.php:2675
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "Ingen hash eller begivenheds-ID modtaget. Mindst én af to skal angives."
 
-#: Controller/AttributesController.php:3116
+#: Controller/AttributesController.php:2836
 msgid "Invalid script."
 msgstr "Ugyldigt script."
 
-#: Controller/AttributesController.php:3181
+#: Controller/AttributesController.php:2901
 msgid "No valid enrichment options found for this attribute."
 msgstr "Ingen gyldige berigelsesmuligheder fundet for denne attribut."
 
-#: Controller/AttributesController.php:3245
+#: Controller/AttributesController.php:2964
 msgid "Invalid type requested."
 msgstr "Ugyldig type forespurgt."
 
-#: Controller/AttributesController.php:3476
-#: Controller/EventsController.php:5209
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "Deaktivering af korrelation er ikke tilladt på denne instans."
 
-#: Controller/AttributesController.php:3480;3495
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3243;3258
+#: Controller/ShadowAttributesController.php:677
 msgid "Invalid Attribute."
 msgstr "Ugyldig Attribut."
 
-#: Controller/AttributesController.php:3483;3498
-#: Controller/EventsController.php:5216;5230
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
 msgid "You don't have permission to do that."
 msgstr "Du har ikke rettighed til at gøre dette."
 
@@ -288,254 +301,286 @@ msgstr "Du har ikke rettighed til at gøre dette."
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "Begivenhedssortlistning er ikke pt. aktiveret på denne instans."
 
-#: Controller/EventsController.php:804
+#: Controller/EventsController.php:848
 msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
 msgstr "Intet x509-certifikat eller GnuPG-nøgle sat for din profil. For at modtage e-mails, indsæt dit offentlige certifikat eller GnuPG-nøgle i din profil."
 
-#: Controller/EventsController.php:806
+#: Controller/EventsController.php:850
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "Ingen GnuPG nøgle tilknyttet din profil. For at modtage emails, skal du indsætte din offentlige nøgle under din profil."
 
-#: Controller/EventsController.php:812
+#: Controller/EventsController.php:856
 msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
 msgstr "Intet x509 certifikat eller GnuPG nøgle på din profil. For at modtage emails, indsæt dit offentlige certifikat eller GnuPG nøgle på din profil."
 
-#: Controller/EventsController.php:814
+#: Controller/EventsController.php:858
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr "Ingen GnuPG nøgle tilknyttet din profil. For at modtage emails, skal du indsætte din offentlige nøgle under din profil."
 
-#: Controller/EventsController.php:1527
+#: Controller/EventsController.php:1559
+msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
+msgstr ""
+
+#: Controller/EventsController.php:1769
 msgid "You don't have permissions to create events"
 msgstr "Du har ikke rettigheder til at oprette objekter"
 
-#: Controller/EventsController.php:1533
+#: Controller/EventsController.php:1775
 msgid "No valid event data received."
 msgstr "Ingen valide event data modtaget."
 
-#: Controller/EventsController.php:1569
+#: Controller/EventsController.php:1811
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "Ugyldig delings gruppe eller manglende rettigheder (Sync bruger findes ikke i delings gruppen)."
 
-#: Controller/EventsController.php:1573;1577
+#: Controller/EventsController.php:1815;1819
 msgid "Invalid Sharing Group or not authorised."
 msgstr "Ugyldig Delings Gruppe, eller manglende autorisation."
 
-#: Controller/EventsController.php:1601
+#: Controller/EventsController.php:1843
 msgid "Event blocked by local blacklist."
 msgstr "Event blev blokkeret af lokal blacklist."
 
-#: Controller/EventsController.php:1614;1693;1955
+#: Controller/EventsController.php:1856;1933;2197
 msgid "The event has been saved"
 msgstr "Event er gemt"
 
-#: Controller/EventsController.php:1622
+#: Controller/EventsController.php:1864
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "Event eksisterer allerede. Hvis du vil opdatere den, brug URL'en i location headeren."
 
-#: Controller/EventsController.php:1633
+#: Controller/EventsController.php:1870
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "En blacklist post blokerer din oprettelse af events. Venligst kontakt administratoren af denne MISP instans"
 
-#: Controller/EventsController.php:1635;1958
+#: Controller/EventsController.php:1872;2200
 msgid "The event could not be saved. Please, try again."
 msgstr "Event kunne ikke gemmes. Prøv venligst igen."
 
-#: Controller/EventsController.php:1719
+#: Controller/EventsController.php:1912
+msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
+msgstr ""
+
+#: Controller/EventsController.php:1959
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "Du kan kun uploade MISP XML eller MISP JSON filer."
 
-#: Controller/EventsController.php:1720
+#: Controller/EventsController.php:1960
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "Fil upload mislykkedes eller filtypenavnet ikke som forventet (.xml / .json)."
 
-#: Controller/EventsController.php:1768
+#: Controller/EventsController.php:2009
 msgid "STIX document imported, event's created: "
 msgstr "STIX dokument importeret, event's oprettet: "
 
-#: Controller/EventsController.php:1771
+#: Controller/EventsController.php:2012
 msgid "STIX document imported."
 msgstr "STIX dokument importeret."
 
-#: Controller/EventsController.php:1774
+#: Controller/EventsController.php:2015
 msgid "Could not import STIX document: "
 msgstr "Kunne ikke importerer STIX dokument: "
 
-#: Controller/EventsController.php:1781
+#: Controller/EventsController.php:2022
 msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
 msgstr "Fil upload mislykkedes. Sørg for at den STIX fil du vælger til upload ikke overstiger den maksimale filstørrelse for "
 
-#: Controller/EventsController.php:1805;1890
+#: Controller/EventsController.php:2046;2131
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "Du har ikke tilladelse til at udføre dette. Overvej venligst at bruge funktionen 'foreslå attribut' funktionen."
 
-#: Controller/EventsController.php:1813
+#: Controller/EventsController.php:2054
 msgid "Invalid event ID entered."
 msgstr "Ugyldig event ID indtastet."
 
-#: Controller/EventsController.php:1818
+#: Controller/EventsController.php:2059
 msgid "You are not authorised to read the selected event."
 msgstr "Du har ikke rettigheder til at læse den valgte event."
 
-#: Controller/EventsController.php:2109;2172
+#: Controller/EventsController.php:2349;2387;2450
 msgid "You don't have the permission to do that."
 msgstr "Du har ikke tilladelse til at udføre dette."
 
-#: Controller/EventsController.php:2259
+#: Controller/EventsController.php:2358
+msgid "Event unpublished."
+msgstr ""
+
+#: Controller/EventsController.php:2537
 msgid "Email sent to the reporter."
 msgstr "Email sendt til personen der har rapporteret."
 
-#: Controller/EventsController.php:2261
+#: Controller/EventsController.php:2539
 msgid "Sending of email failed"
 msgstr "Udsendelse af email fejlede"
 
-#: Controller/EventsController.php:2397
+#: Controller/EventsController.php:2678
 msgid "This feature is currently disabled"
 msgstr "Denne funktion er for øjeblikket deaktiveret"
 
-#: Controller/EventsController.php:2439;4025
+#: Controller/EventsController.php:2720;3986
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
 msgstr "Angiv enten søgeordene i URL'en eller POST en XML-fil (hvori rodelementet er \"request\")."
 
-#: Controller/EventsController.php:2475
+#: Controller/EventsController.php:2756
 msgid "Invalid Event ID."
 msgstr "Ugyldigt event ID."
 
-#: Controller/EventsController.php:2522
+#: Controller/EventsController.php:2803
 msgid "No events found that match the passed parameters."
 msgstr "Ingen events fundet der matcher de tilførte parametre."
 
-#: Controller/EventsController.php:2547
+#: Controller/EventsController.php:2828
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
 msgstr "Enten angiv søgeordene i url'en, eller POST en XML fil med parametrene. Tilladte filtre: id (event ID), tags (liste af tags), fra (fra-dato i YYYY-MM-DD format), til (til-dato i YYYY-MM-DD format), sidste (events med et publiceret-tidsstempel nyere end. Tilladte værdier er i tid + enhed format såsom 6d (6 dage), 2w (2 uger) osv)"
 
-#: Controller/EventsController.php:2622;2684
+#: Controller/EventsController.php:2903
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
 msgstr "Enten angiv søgeordene i url'en, eller POST en JSON eller XML fil med filter parametrene."
 
-#: Controller/EventsController.php:2641
-#: Model/Attribute.php:1927
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
 msgid "Invalid hash type."
 msgstr "Ugyldig hash type."
 
-#: Controller/EventsController.php:2871
+#: Controller/EventsController.php:3025
 msgid "Filename not allowed."
 msgstr "Filnavnet ikke tilladt."
 
-#: Controller/EventsController.php:2892
+#: Controller/EventsController.php:3045
 msgid "Problem with writing the ioc file. Please report to administrator."
 msgstr "Problemer med at skrive IOC filen. Rapporter venligst dette til administratoren."
 
-#: Controller/EventsController.php:2986
+#: Controller/EventsController.php:3139
 msgid "This is not a valid MISP XML file."
 msgstr "Dette er ikke en valid MISP XML fil."
 
-#: Controller/EventsController.php:3101
-msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type)."
-msgstr "Angiv enten søgeordene i URL'en eller POST et JSON-array/XML-fil (hvori rodelementet er \"request\" og angiv de korrekte headers jf. indholdstypen)."
-
-#: Controller/EventsController.php:3294
+#: Controller/EventsController.php:3291
 msgid "Not yet implemented"
 msgstr "Endnu ikke implementeret"
 
-#: Controller/EventsController.php:3312;3316
+#: Controller/EventsController.php:3309;3313
 msgid "Invalid event or not authorised."
 msgstr "Ugyldig event eller manglende rettigheder."
 
-#: Controller/EventsController.php:3336;3406
+#: Controller/EventsController.php:3333;3403
 msgid "You don't have the privileges to access this."
 msgstr "Du har ikke de korrekte rettigheder til at tilgå dette."
 
-#: Controller/EventsController.php:3920
-msgid "Could not add tags."
-msgstr "Kunne ikke tilføje tags."
+#: Controller/EventsController.php:3610
+#: Controller/TagCollectionsController.php:307
+msgid "Invalid Tag."
+msgstr ""
 
-#: Controller/EventsController.php:3971;5055
-#: Controller/ObjectsController.php:46;140;144;438
+#: Controller/EventsController.php:3626
+#: Controller/TagCollectionsController.php:323
+msgid "Tag is already attached to this event."
+msgstr ""
+
+#: Controller/EventsController.php:3637;3643
+#: Controller/TagCollectionsController.php:330
+msgid "Tag(s) added."
+msgstr ""
+
+#: Controller/EventsController.php:3639
+msgid "Tag could not be added."
+msgstr ""
+
+#: Controller/EventsController.php:3645
+#: Controller/TagCollectionsController.php:338
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
 msgid "Invalid event."
 msgstr "Ugyldigt event."
 
-#: Controller/EventsController.php:4085;4115;4131
+#: Controller/EventsController.php:3918
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
+msgstr ""
+
+#: Controller/EventsController.php:4049;4079;4095
 msgid "You do not have the permission to do that."
 msgstr "Du har ikke de nødvendige rettigheder til at udfører dette."
 
-#: Controller/EventsController.php:4196;4334
+#: Controller/EventsController.php:4160;4300
 msgid "Invalid ID"
 msgstr "Ugyldig ID"
 
-#: Controller/EventsController.php:4200;4338
+#: Controller/EventsController.php:4164;4304
 msgid "Event not found or you are not authorised to view it."
 msgstr "Event ikke fundet, eller du har ikke rettigheder til at se det."
 
-#: Controller/EventsController.php:4434;4441
+#: Controller/EventsController.php:4405;4412
 msgid "Please POST the samples as described on the automation page."
 msgstr "Venligt POST prøverne som beskrevet på automatisering-siden."
 
-#: Controller/EventsController.php:4470
+#: Controller/EventsController.php:4441
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr "Ingen prøver modtaget, eller prøver ikke i det korrekte format. Venligst se API-dokumentationen på automatisering-siden."
 
-#: Controller/EventsController.php:4478
+#: Controller/EventsController.php:4449
 msgid "Event not found"
 msgstr "Event blev ikke fundet"
 
-#: Controller/EventsController.php:4501
+#: Controller/EventsController.php:4472
 msgid "Event not found."
 msgstr "Event blev ikke fundet."
 
-#: Controller/EventsController.php:4511
+#: Controller/EventsController.php:4482
 msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
 msgstr "Distributions niveau 5 understøttes ikke, når du uploader en sample uden at indtaste et event ID. Distributions niveau 5 er beregnet til at overtage distributions niveauet for en eksisterende event."
 
-#: Controller/EventsController.php:4536
+#: Controller/EventsController.php:4507
 msgid "The creation of a new event with the supplied information has failed."
 msgstr "Oprettelsen af ​​en ny event med de leverede oplysninger mislykkedes."
 
-#: Controller/EventsController.php:4671;4693;4722;4747;4772;4802;4823
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
 msgid "Invalid type."
 msgstr "Ugyldig type."
 
-#: Controller/EventsController.php:4866
+#: Controller/EventsController.php:4906
 msgid "Invalid method."
 msgstr "Ugyldig metode."
 
-#: Controller/EventsController.php:4946
+#: Controller/EventsController.php:4989
 msgid "%s services are not enabled."
 msgstr "%s tjenester er ikke aktiveret."
 
-#: Controller/EventsController.php:4950
+#: Controller/EventsController.php:4993
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "Attribut ikke fundet, eller du har ikke rettigheder til at se den."
 
-#: Controller/EventsController.php:4956
+#: Controller/EventsController.php:4999
 msgid "No valid %s options found for this attribute."
 msgstr "Ingen valide %s muligheder fundet for denne attribut."
 
-#: Controller/EventsController.php:4973
+#: Controller/EventsController.php:5016
 msgid "no valid %s options found for this attribute."
 msgstr "ingen valide %s-optioner fundet for denne attribut."
 
-#: Controller/EventsController.php:4995
+#: Controller/EventsController.php:5038
 msgid "%s service not reachable."
 msgstr "%s service er ikke tilgængelig."
 
-#: Controller/EventsController.php:5007
+#: Controller/EventsController.php:5050
 msgid ": Enriched via the %s"
 msgstr ": Beriget via %s"
 
-#: Controller/EventsController.php:5136
+#: Controller/EventsController.php:5184
 msgid "Import service not reachable."
 msgstr "Import service er ikke tilgængelig."
 
-#: Controller/EventsController.php:5303
+#: Controller/EventsController.php:5351
 msgid "Invalid ID."
 msgstr "Ugyldigt ID."
 
-#: Controller/EventsController.php:5351
-#: Controller/ShadowAttributesController.php:312;317;534
+#: Controller/EventsController.php:5399
+#: Controller/ShadowAttributesController.php:311;316;532
 msgid "Invalid Event"
 msgstr "Ugyldigt Event"
 
-#: Controller/EventsController.php:5369
+#: Controller/EventsController.php:5420
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "Berigelses-job lagt i kø til behandling i baggrunden. Kom tilbage senere for at se resultatet."
 
@@ -543,122 +588,138 @@ msgstr "Berigelses-job lagt i kø til behandling i baggrunden. Kom tilbage sener
 msgid "You don't have the required privileges to do that."
 msgstr "Du har ikke de nødvendige rettigheder til at udføre dette."
 
-#: Controller/FeedsController.php:193;291
+#: Controller/FeedsController.php:205;303
 msgid "Feed added."
 msgstr "Feed tilføjet."
 
-#: Controller/FeedsController.php:201
+#: Controller/FeedsController.php:213
 msgid "Feed could not be added. Invalid field: %s"
 msgstr "Feed kunne ikke tilføjes. ugyldig felt: %s"
 
-#: Controller/FeedsController.php:226;326;348;470;502;682
+#: Controller/FeedsController.php:238;338;360;482;517;721
 msgid "Invalid feed."
 msgstr "Ugyldigt Feed."
 
-#: Controller/FeedsController.php:299
+#: Controller/FeedsController.php:311
 msgid "Feed could not be updated. Invalid fields: %s"
 msgstr "Feed kunne ikke opdateres. ugyldig felt: %s"
 
-#: Controller/FeedsController.php:322
+#: Controller/FeedsController.php:334
 msgid "This action requires a post request."
 msgstr "Denne handling kræver en Post anmodning."
 
-#: Controller/FeedsController.php:355;474
+#: Controller/FeedsController.php:367;486
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "Feed er på nuværende tidspunkt ikke aktiveret. Sørg for at aktivere det."
 
-#: Controller/FeedsController.php:368;434
+#: Controller/FeedsController.php:380;446
 msgid "Starting fetch from Feed."
 msgstr "Start hentning a Feed."
 
-#: Controller/FeedsController.php:379
+#: Controller/FeedsController.php:391
 msgid "Pull queued for background execution."
 msgstr "Pull i lagt i kø til behandling i baggrunden."
 
-#: Controller/FeedsController.php:384;386
+#: Controller/FeedsController.php:396;398
 msgid "Fetching the feed has failed."
 msgstr "Hentning af feed mislykkedes."
 
-#: Controller/FeedsController.php:390
+#: Controller/FeedsController.php:402
 msgid "Fetching the feed has successfuly completed."
 msgstr "Hentning af feed blev successfuldt afsluttet."
 
-#: Controller/FeedsController.php:451
+#: Controller/FeedsController.php:463
 msgid "Fetching the feed has successfully completed."
 msgstr "Hentning af feed blev successfuldt afsluttet."
 
-#: Controller/FeedsController.php:481
+#: Controller/FeedsController.php:493
 msgid "Event added."
 msgstr "Event tilføjet."
 
-#: Controller/FeedsController.php:484
+#: Controller/FeedsController.php:496
 msgid "Event already up to date."
 msgstr "Event allerede seneste."
 
-#: Controller/FeedsController.php:486
+#: Controller/FeedsController.php:498
 msgid "Event updated."
 msgstr "Event opdateret."
 
-#: Controller/FeedsController.php:490
+#: Controller/FeedsController.php:502
 msgid "Could not %s event."
 msgstr "Kunne ikke %s event."
 
-#: Controller/FeedsController.php:493
+#: Controller/FeedsController.php:505
 msgid "Download failed."
 msgstr "Download mislykkedes."
 
-#: Controller/FeedsController.php:561
+#: Controller/FeedsController.php:597
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "Feed kunne ikke hentes. Der blev returneret følgende HTTP fejl kode: "
 
-#: Controller/FeedsController.php:600;651
+#: Controller/FeedsController.php:636;687
 msgid "Invalid feed type."
 msgstr "Ugyldigt feed type."
 
-#: Controller/FeedsController.php:714
+#: Controller/FeedsController.php:753
 msgid "This event is blocked by the Feed filters."
 msgstr "Denne event er blokeret af Feed filteret."
 
-#: Controller/FeedsController.php:716
+#: Controller/FeedsController.php:755
 msgid "Could not download the selected Event"
 msgstr "Kunne ikke hente den valgte Event"
 
-#: Controller/FeedsController.php:752;756
+#: Controller/FeedsController.php:791;795
 msgid "Invalid Feed."
 msgstr "Ugyldigt Feed."
 
-#: Controller/FeedsController.php:777
+#: Controller/FeedsController.php:816
 msgid "Only POST requests are allowed."
 msgstr "Kun POST forespørgsler er tilladt."
 
-#: Controller/FeedsController.php:781
+#: Controller/FeedsController.php:820
 msgid "Feed not found."
 msgstr "Feed ikke fundet."
 
-#: Controller/FeedsController.php:790
+#: Controller/FeedsController.php:829
 msgid "Data pulled."
 msgstr "Data hentet."
 
-#: Controller/FeedsController.php:792
+#: Controller/FeedsController.php:831
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "Kunne ikke hente valgte data. Årsag: %s"
 
-#: Controller/FeedsController.php:809
+#: Controller/FeedsController.php:848
 msgid "Starting feed caching."
 msgstr "Påbegynder feed caching."
 
-#: Controller/FeedsController.php:824
+#: Controller/FeedsController.php:863
 msgid "Caching the feeds has failed."
 msgstr "Caching af feeds er fejlet."
 
-#: Controller/FeedsController.php:827
+#: Controller/FeedsController.php:866
 msgid "Caching the feeds has successfully completed."
 msgstr "Caching af feeds er afsluttet med success."
 
-#: Controller/FeedsController.php:858
+#: Controller/FeedsController.php:900
 msgid "Invalid feed list received."
 msgstr "Ugyldig feed liste modtaget."
 
+#: Controller/GalaxiesController.php:92
+msgid "All clusters"
+msgstr "Alle clusters"
+
+#: Controller/GalaxiesController.php:135
+msgid "All namespaces"
+msgstr "Alle namespaces"
+
+#: Controller/GalaxiesController.php:250
+msgid "Failed to parse request."
+msgstr ""
+
+#: Controller/GalaxiesController.php:253
+msgid "No clusters picked."
+msgstr ""
+
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr "Alle færdige jobs er blevet slettet"
@@ -671,11 +732,23 @@ msgstr "Alle jobs er slettet"
 msgid "Invalid object"
 msgstr "Ugyldig objekt"
 
-#: Controller/ObjectReferencesController.php:187
+#: Controller/ObjectReferencesController.php:188
 msgid "Invalid object reference"
 msgstr "Ugyldig objekt reference"
 
-#: Controller/ObjectTemplatesController.php:88
+#: Controller/ObjectTemplatesController.php:31
+msgid "All Objects"
+msgstr "Alle objekter"
+
+#: Controller/ObjectTemplatesController.php:99
+msgid "Invalid object template"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:103
+msgid "Invalid object template id."
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
 msgstr "ObjektTemplate slettet"
 
@@ -696,23 +769,23 @@ msgstr "Du har ikke rettigheder til at oprette objekter."
 msgid "Invalid template."
 msgstr "Ugyldig skabelon."
 
-#: Controller/ObjectsController.php:303
+#: Controller/ObjectsController.php:311
 msgid "You don't have permissions to edit objects."
 msgstr "Du har ikke rettigheder til at redigere objekter."
 
-#: Controller/ObjectsController.php:317;328;427
+#: Controller/ObjectsController.php:325;336;439
 msgid "Invalid object."
 msgstr "Ugyldigt objekt."
 
-#: Controller/ObjectsController.php:421
+#: Controller/ObjectsController.php:433
 msgid "You don't have permissions to delete objects."
 msgstr "Du har ikke rettigheder til at slette objekter."
 
-#: Controller/ObjectsController.php:531;538;542
+#: Controller/ObjectsController.php:543;550;554
 msgid "Object not found or not authorised."
 msgstr "Objektet ikke fundet eller manglende autorisation."
 
-#: Controller/ObjectsController.php:799
+#: Controller/ObjectsController.php:811
 msgid "%s objects successfully reconstructed."
 msgstr "%s objekter er rekonstrueret med success."
 
@@ -776,123 +849,147 @@ msgstr "Rollen kunne ikke gemmes. Forsøg venligst igen."
 msgid "Role deleted"
 msgstr "Rolle slettet"
 
-#: Controller/ServersController.php:204;394
+#: Controller/ServersController.php:226;417
 msgid "The pull filter rules must be in valid JSON format."
 msgstr "Pull filter reglen skal være i et valid JSON format."
 
-#: Controller/ServersController.php:214;404
+#: Controller/ServersController.php:236;427
 msgid "The push filter rules must be in valid JSON format."
 msgstr "Push filter reglen skal være i et valid JSON format."
 
-#: Controller/ServersController.php:268;434
+#: Controller/ServersController.php:291;457
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr "Kunne ikke oprette organisation, da UUID allerede er i anvendelse."
 
-#: Controller/ServersController.php:280
+#: Controller/ServersController.php:303
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format? Also, make sure the organisation's name doesn't clash with an existing one."
 msgstr "Kunne ikke gemme den nye organisation, er du sikker på at uuid er i det korrekte format? Sørg også for organisationens navn ikke eksisterer i forvejen."
 
-#: Controller/ServersController.php:309;490
+#: Controller/ServersController.php:332;513
 msgid "The server has been saved"
 msgstr "Serveren er gemt"
 
-#: Controller/ServersController.php:316;497
+#: Controller/ServersController.php:339;520
 msgid "The server could not be saved. Please, try again."
 msgstr "Serveren kunne ikke gemmes. Venligst forsøg igen."
 
-#: Controller/ServersController.php:369;565;590;598;659;1412
+#: Controller/ServersController.php:392;589;614;623;683;1360
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
-#: Controller/ServersController.php:451
+#: Controller/ServersController.php:474
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr "Den nye organisation kunne ikke gemmes. Har du sikret dig at UUID er i et korrekt format?."
 
-#: Controller/ServersController.php:572
+#: Controller/ServersController.php:596
 msgid "Server deleted"
 msgstr "Server slettet"
 
-#: Controller/ServersController.php:575
+#: Controller/ServersController.php:599
 msgid "Server was not deleted"
 msgstr "Serveren blev ikke slettet"
 
-#: Controller/ServersController.php:602
+#: Controller/ServersController.php:626
 msgid "Pull setting not enabled for this server."
 msgstr "Pull indstillingen ikke aktiveret på denne server."
 
-#: Controller/ServersController.php:611
-msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
-msgstr "Ingen autorisation. Dette skyldes enten en ugyldig auth-nøgle, eller fordi synkroniserings brugeren ikke har godkendelses rettigheder aktiveret på den eksterne server. En anden grund kan være en forkert synkroniserings indstilling."
+#: Controller/ServersController.php:659
+msgid "Pull queued for background execution. Job ID: %s"
+msgstr ""
 
-#: Controller/ServersController.php:1309
+#: Controller/ServersController.php:696
+msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
+msgstr ""
+
+#: Controller/ServersController.php:709
+msgid "Push complete. %s events pushed, %s events could not be pushed."
+msgstr ""
+
+#: Controller/ServersController.php:734
+msgid "Push queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:1257
 msgid "File not found."
 msgstr "Filen blev ikke fundet."
 
-#: Controller/ServersController.php:1315
+#: Controller/ServersController.php:1263
 msgid "File could not be deleted."
 msgstr "Filen kunne ikke slettes."
 
-#: Controller/ServersController.php:1338;1354
+#: Controller/ServersController.php:1286;1302
 msgid "Upload failed."
 msgstr "Upload fejlet."
 
-#: Controller/ServersController.php:1346
+#: Controller/ServersController.php:1294
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "Filen eksisterer allerede. Såfremt du ønsker at erstatte den, skal den gamle fil først fjernes."
 
-#: Controller/ShadowAttributesController.php:212
+#: Controller/ServersController.php:1748
+msgid "Starting server caching."
+msgstr ""
+
+#: Controller/ServersController.php:1763
+msgid "Caching the servers has failed."
+msgstr ""
+
+#: Controller/ServersController.php:1766
+msgid "Caching the servers has successfully completed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:211
 msgid "Moving of the file that this attachment references failed."
 msgstr "Flytning af filen som denne vedhæftelse refererer mislykkedes."
 
-#: Controller/ShadowAttributesController.php:280
+#: Controller/ShadowAttributesController.php:279
 msgid "Could not discard proposal."
 msgstr "Kunne ikke slette forslag."
 
-#: Controller/ShadowAttributesController.php:341
+#: Controller/ShadowAttributesController.php:340
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr "Attributten blev ikke tilføjet: Vedhæftelse sker via 'Tilføj vedhæftelse' knappen"
 
-#: Controller/ShadowAttributesController.php:389;392;401
+#: Controller/ShadowAttributesController.php:388;391;400
 msgid "The lines"
 msgstr "Linjerne"
 
-#: Controller/ShadowAttributesController.php:441
+#: Controller/ShadowAttributesController.php:440
 msgid "The proposal has been saved"
 msgstr "Forslaget er gemt"
 
-#: Controller/ShadowAttributesController.php:453;763
+#: Controller/ShadowAttributesController.php:452;761
 msgid "Could not save the proposal. Errors: %s"
 msgstr "Kunne ikke gemme forslaget. Fejl: %s"
 
-#: Controller/ShadowAttributesController.php:455
+#: Controller/ShadowAttributesController.php:454
 msgid "The proposal could not be saved. Please, try again."
 msgstr "Forslaget kunne ikke gemmes. Prøv venligst igen."
 
-#: Controller/ShadowAttributesController.php:492
+#: Controller/ShadowAttributesController.php:491
 msgid "Invalid Proposal"
 msgstr "Forslaget er ugyldigt"
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:521
 msgid "Proposal not an attachment or malware-sample"
 msgstr "Forslaget er ikke en vedhæftelse eller malware-sample"
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:617
 msgid "The attachment has been uploaded"
 msgstr "Vedhæftelse er uploaded"
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:619
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr "Den vedhæftede fil er blevet uploadet, men nogle af forslagene kunne ikke oprettes. De fejlede forslag er: "
 
-#: Controller/ShadowAttributesController.php:624
+#: Controller/ShadowAttributesController.php:622
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr "Vedhæftelse kunne ikke gemmes, kontakt din administrator."
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:752
 msgid "The proposed Attribute has been saved"
 msgstr "Den foreslåede attribut blev gemt"
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:763
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr "ShadowAttribute kunne ikke gemmes. Prøv igen."
 
@@ -924,6 +1021,86 @@ msgstr "Delings gruppe slettet"
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr "Delings gruppen kunne ikke slettes. Sørg for at der ikke er nogle events, attributter eller tråde, der tilhører denne delings gruppe."
 
+#: Controller/SightingsController.php:86
+msgid "Could not add the Sighting. Reason: "
+msgstr ""
+
+#: Controller/SightingsController.php:96;99
+msgid "Sighting added"
+msgstr ""
+
+#: Controller/SightingsController.php:152
+msgid "You are not authorised to remove sightings data as you don't have permission to modify your organisation's data."
+msgstr ""
+
+#: Controller/SightingsController.php:158
+msgid "Attribute not found"
+msgstr ""
+
+#: Controller/SightingsController.php:176
+msgid "Invalid request."
+msgstr ""
+
+#: Controller/SightingsController.php:185
+msgid "Sighting added."
+msgstr ""
+
+#: Controller/SightingsController.php:187
+msgid "Sighting could not be added"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:56;177
+msgid "The tag collection has been saved"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:64;185
+msgid "The tag collection could not be added. Reason: "
+msgstr ""
+
+#: Controller/TagCollectionsController.php:85
+msgid "%s new tag collections added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:154
+msgid "Invalid Tag Collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:161
+msgid "You don't have editing rights on this Tag Collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:201;380
+msgid "Invalid tag collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:207
+msgid "Tag collection deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:215
+msgid "Tag collection could not be deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:224
+msgid "You are not allowed to delete that."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:332
+msgid "Tag(s) could not be added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:384
+msgid "Insufficient privileges to remove the tag from the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:395
+msgid "Invalid tag or tag not associated with the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:399
+msgid "Failed to remove tag from the collection."
+msgstr ""
+
 #: Controller/TagsController.php:367
 msgid "Tag deleted"
 msgstr "Tag slettet"
@@ -932,6 +1109,27 @@ msgstr "Tag slettet"
 msgid "Tag was not deleted"
 msgstr "Tag blev ikke slettet"
 
+#: Controller/TagsController.php:580
+msgid "Favourite Tags"
+msgstr "Favorit Tags"
+
+#: Controller/TagsController.php:586
+msgid "Tag Collections"
+msgstr ""
+
+#: Controller/TagsController.php:591
+msgid "All Tags"
+msgstr "Alle Tags"
+
+#: Controller/TagsController.php:601
+#: View/Taxonomies/view.ctp:2
+msgid "Taxonomy Library"
+msgstr "Taksonomi bibliotek"
+
+#: Controller/TagsController.php:756
+msgid "Includes: "
+msgstr ""
+
 #: Controller/TemplatesController.php:408
 msgid "Event populated, "
 msgstr "Event udfyldt, "
@@ -940,15 +1138,15 @@ msgstr "Event udfyldt, "
 msgid "Event populated, but "
 msgstr "Event er udfyldt men, "
 
-#: Controller/UsersController.php:42;221
+#: Controller/UsersController.php:42;247
 msgid "Invalid user or not authorised."
 msgstr "Ukendt bruger eller manglende autorisation."
 
-#: Controller/UsersController.php:54;430;657;907
+#: Controller/UsersController.php:54;456;683;929
 msgid "Invalid user"
 msgstr "Ukendt bruger"
 
-#: Controller/UsersController.php:119;564;728
+#: Controller/UsersController.php:119;590;754
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr "Ugyldigt e-mail-domæne. Din bruger er begrænset til kun at oprette brugere for følgende domæne(r): "
 
@@ -960,59 +1158,75 @@ msgstr "Profilen blev opdateret"
 msgid "The profile could not be updated. Please, try again."
 msgstr "Profilen kunne ikke opdateres. Venligst prøv igen."
 
-#: Controller/UsersController.php:198
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
 msgid "Password Changed."
 msgstr "Kodeord ændret."
 
-#: Controller/UsersController.php:203
+#: Controller/UsersController.php:222
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "Kodeordet kunne ikke opdateres. Du skal sikre dig at minimums kravet for længde eller kompleksitet efterleves."
 
-#: Controller/UsersController.php:575
+#: Controller/UsersController.php:601
 msgid "The user could not be saved. Invalid organisation."
 msgstr "Brugeren kunne ikke gemmes. Ugyldig organisation."
 
-#: Controller/UsersController.php:597
+#: Controller/UsersController.php:623
 msgid "The user has been saved."
 msgstr "Brugeren er gemt."
 
-#: Controller/UsersController.php:606;843
+#: Controller/UsersController.php:632;865
 msgid "The user could not be saved. Please, try again."
 msgstr "Brugeren kunne ikke gemmes. Venligst prøv igen."
 
-#: Controller/UsersController.php:835
+#: Controller/UsersController.php:857
 msgid "The user has been saved"
 msgstr "Brugeren er gemt"
 
-#: Controller/UsersController.php:915
+#: Controller/UsersController.php:937
 msgid "User deleted"
 msgstr "Brugeren slettet"
 
-#: Controller/UsersController.php:919
+#: Controller/UsersController.php:941
 msgid "User was not deleted"
 msgstr "Brugeren blev ikke slettet"
 
-#: Controller/UsersController.php:997
+#: Controller/UsersController.php:1019
 msgid "Invalid username or password, try again"
 msgstr "Ukendt brugernavn eller kodeord, prøv igen"
 
-#: Controller/UsersController.php:1080
+#: Controller/UsersController.php:1106
 msgid "Good-Bye"
 msgstr "Farvel og tak for kaffe"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1147
 msgid "New authkey generated."
 msgstr "Ny autentifikations nøgle genereret."
 
-#: Controller/UsersController.php:1230
+#: Controller/UsersController.php:1256
 msgid "You accepted the Terms and Conditions."
 msgstr "Du har accepteret vilkår og betingelserne."
 
-#: Controller/UsersController.php:1419
+#: Controller/UsersController.php:1438
+msgid "Recipient email not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1443
+msgid "Recipient organisation not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1480
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr "E-mails sendt, men blev ikke leveret til følgende modtagere: "
 
-#: Controller/UsersController.php:1421
+#: Controller/UsersController.php:1482
 msgid "E-mails sent."
 msgstr "E-Mails sendt."
 
@@ -1040,972 +1254,1040 @@ msgstr "%s slettet"
 msgid "%s was not deleted"
 msgstr "%s blev ikke slettet"
 
-#: Controller/Component/BlackListComponent.php:72
+#: Controller/Component/BlackListComponent.php:75
 msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
 msgstr "Færdig. Tilføjet %d nye poster til blacklist. %d poster kunne ikke gemmes."
 
-#: Controller/Component/BlackListComponent.php:123
+#: Controller/Component/BlackListComponent.php:126
 msgid "Blacklist item added."
 msgstr "Blacklist item tilføjet."
 
-#: Controller/Component/BlackListComponent.php:152
+#: Controller/Component/BlackListComponent.php:155
 msgid "Invalid blacklist entry"
 msgstr "Ukendt blacklist post"
 
-#: Controller/Component/BlackListComponent.php:156
+#: Controller/Component/BlackListComponent.php:159
 msgid "Blacklist entry removed"
 msgstr "Blacklist post fjernet"
 
-#: Controller/Component/BlackListComponent.php:158
+#: Controller/Component/BlackListComponent.php:161
 msgid "Could not remove the blacklist entry"
 msgstr "Kunne ikke fjerne blacklist post"
 
-#: Model/Attribute.php:567
+#: Model/Attribute.php:591
 msgid "Composite type, but value not explodable"
 msgstr "Sammensat type, men værdien kan ikke deles"
 
-#: Model/Attribute.php:677
+#: Model/Attribute.php:703
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr "Sletning af filvedhæftning fejlede. Rapporter venligst dette til administratoren."
 
-#: Model/Attribute.php:802
+#: Model/Attribute.php:828
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr "Den indtastede streng er for langt og vil blive afkortet. Overvej at tilføje dataene som en vedhæftet fil i stedet"
 
-#: Model/Attribute.php:921
+#: Model/Attribute.php:953
 msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "Checksum har en ugyldig længde eller format (forventet: %s hexadecimale tegn). Venligst dobbeltcheck værdien eller Vælg typen \"andre\"."
 
-#: Model/Attribute.php:928
+#: Model/Attribute.php:960
 msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "Checksum har en ugyldig længde eller format (forventet: mindst 35 hexadecimale tegn). Venligst dobbeltcheck værdien eller Vælg typen \"andre\"."
 
-#: Model/Attribute.php:935
+#: Model/Attribute.php:967
 msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr "Input ikke stemmer overens med det forventede sha1 format (forventet: 40 hexidecimale tegn). Husk på, at MISP i øjeblikket kun understøtter SHA1 til PEhashes. Hvis du ønsker at få support for andre hash-typer, så opret en ticket på github om det på https://github.com/MISP/MISP!"
 
-#: Model/Attribute.php:946
+#: Model/Attribute.php:978
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr "Ugyldig SSDeep hash. Formatet skal være blokstørrelse:hash:hash"
 
-#: Model/Attribute.php:957
+#: Model/Attribute.php:989
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr "Ugyldigt impfuzzy format. Formatet skal være imports:hash:hash"
 
-#: Model/Attribute.php:972
+#: Model/Attribute.php:996
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:1011
 msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr "Input ikke stemmer overens med det forventede filnavn|sha1 format (forventet: filnavn|40 hexidecimale tegn). Husk på, at MISP i øjeblikket kun understøtter SHA1 til PEhashes. Hvis du ønsker at få support for andre hash-typer, så opret en ticket på github om det på https://github.com/MISP/MISP!"
 
-#: Model/Attribute.php:990
+#: Model/Attribute.php:1029
 msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "Checksum har en ugyldig længde eller format (forventet: %s hexadecimale tegn). Venligst dobbeltcheck værdien eller Vælg typen \"andre\"."
 
-#: Model/Attribute.php:995
+#: Model/Attribute.php:1034
 msgid "Invalid composite type. The format has to be %s."
 msgstr "Ygyldig komposit type. Formatet skal være: %s."
 
-#: Model/Attribute.php:1006
+#: Model/Attribute.php:1045
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr "Ugyldig SSDeep hash (forventet: blokstørrelse:hash:hash)."
 
-#: Model/Attribute.php:1014
+#: Model/Attribute.php:1053
 msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "Checksum har en ugyldig længde eller format (forventet: filnavn|mindst 35 hexadecimale tegn). Venligst dobbeltcheck værdien eller Vælg typen \"andre\"."
 
-#: Model/Attribute.php:1025
+#: Model/Attribute.php:1064
 msgid "Invalid CIDR notation value found."
 msgstr "Ugyldig CIDR notation værdi fundet."
 
-#: Model/Attribute.php:1032;1083
+#: Model/Attribute.php:1071;1122
 msgid "IP address has an invalid format."
 msgstr "IP adresse anvender et forkert format."
 
-#: Model/Attribute.php:1037
+#: Model/Attribute.php:1076
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr "Port numre skal være et positivt tal mellem 1 og 65535."
 
-#: Model/Attribute.php:1066
+#: Model/Attribute.php:1105
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr " navn er i et ugyldig format. Venligst kontroller værdien eller vælg typen \"andet\"."
 
-#: Model/Attribute.php:1086
+#: Model/Attribute.php:1125
 msgid "Domain name has an invalid format."
 msgstr "Domænenavnet har et ukorrekt format."
 
-#: Model/Attribute.php:1099
+#: Model/Attribute.php:1138
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr "E-mail adressen er i et ugyldig format. Venligst kontroller at feltet er korrekt eller vælg typen \"andet\"."
 
-#: Model/Attribute.php:1107
+#: Model/Attribute.php:1146
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr "Ugyldigt format. Forventet: CVE-xxxx-xxxx..."
 
-#: Model/Attribute.php:1118
+#: Model/Attribute.php:1157
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr "Ugyldigt format. Kun værdier der er kortere end 256 karakterer og som ikke indeholder forward og backward slashes er tilladt."
 
-#: Model/Attribute.php:1230
+#: Model/Attribute.php:1272
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr "Datetime skal være i ISO 8601 format."
 
-#: Model/Attribute.php:1236
+#: Model/Attribute.php:1278
 msgid "The value has to be a number greater or equal 0."
 msgstr "Værdien skal være et nummer der er større end eller lig med 0."
 
-#: Model/Attribute.php:1243
+#: Model/Attribute.php:1285
 msgid "The value has to be a number between 0 and 10."
 msgstr "Værdien skal være mellem 0 og 10."
 
-#: Model/Attribute.php:1923;1991
+#: Model/Attribute.php:1968;2036
 msgid "Could not read user."
 msgstr "Brugeren kunne ikke læses."
 
-#: Model/Attribute.php:2527
+#: Model/Attribute.php:2616
 msgid "This field is mandatory."
 msgstr "Feltet er obligatorisk."
 
-#: Model/Attribute.php:2885
+#: Model/Attribute.php:3069
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr "Noget gik galt. Modtog et ikke-numerisk event ID under forsøget på at skabe et zip arkiv af en uploadet malware-sample."
 
-#: Model/Event.php:4532
+#: Model/Event.php:5392
 msgid "Issues while loading the stix file. "
 msgstr "Problemer, under indlæsningen af STIX filen. "
 
-#: Model/Event.php:4534
+#: Model/Event.php:5394
 msgid "Issues with the maec library. "
 msgstr "Problemer med MAEC biblioteket. "
 
-#: Model/Event.php:4536
+#: Model/Event.php:5396
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "Der var problemer med at udføre indtagelsen, eller ugyldigt input. "
 
-#: Model/Event.php:4539
+#: Model/Event.php:5399
 msgid "Please ask your administrator to "
 msgstr "Kontakt din administrator for "
 
-#: Model/Event.php:4541
+#: Model/Event.php:5401
 msgid "Please "
 msgstr "Venligst "
 
-#: Model/Event.php:4543
+#: Model/Event.php:5403
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr "check om alle afhængigheder for STIX er opfyldt via diagnostiserings værktøjet."
 
-#: Model/Event.php:4575
+#: Model/Event.php:5435
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:4584
+#: Model/Event.php:5444
 msgid "%s not set"
 msgstr "%s ikke sat"
 
-#: Model/Server.php:114
+#: Model/Event.php:5667
+msgid "Could not add tags."
+msgstr "Kunne ikke tilføje tags."
+
+#: Model/Galaxy.php:219;276;286;300
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
 msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
 msgstr "Visse administrative opgaver er tilgængelige via API'et, så vedligeholdelse og konfiguration af MISP kan automatiseres eller foretages via eksterne værktøjer."
 
-#: Model/Server.php:115
+#: Model/Server.php:122
 msgid "Administering MISP via the CLI"
 msgstr "Administrer MISP via CLI"
 
-#: Model/Server.php:125
+#: Model/Server.php:132
 msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
 msgstr "Hvis du vil automatisere opgaver såsom caching af feeds eller pull fra andre instanser, kan du gøre det ved hjælp af de følgende kommandolinjeværktøjer. Blot udfør de givne kommandoer via kommandolinjen, eller lav et cronjob ud af dem."
 
-#: Model/Server.php:126
+#: Model/Server.php:133
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr "Automatisering af visse konsol opgaver"
 
-#: Model/Server.php:135
+#: Model/Server.php:142
 msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
 msgstr "Rodadressen for applikationen (i formatet https://www.mymispinstance.com). Flere funktioner afhænger af indstillingen er korrekt."
 
-#: Model/Server.php:137
+#: Model/Server.php:144
 msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
 msgstr "Den aktuelt satte baseurl svarer ikke til den URL-adresse, som du har tilgået siden med. Du kan se bort fra dette hvis du tilgår siden via en alternativ URL-adresse (for eksempel via IP-adressen)."
 
-#: Model/Server.php:143
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr "Medmindre denne er angivet til sand, vil instansen kun være tilgængelig for admins."
 
-#: Model/Server.php:151
+#: Model/Server.php:166
 msgid "Select the language MISP should use. The default is english."
 msgstr "Vælg det sprog MISP skal anvende. Standard er engelsk."
 
-#: Model/Server.php:161
+#: Model/Server.php:176
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr "Aktiver nogle performance tunge korrelationer (i øjeblikket CIDR korrelation)"
 
-#: Model/Server.php:170
+#: Model/Server.php:185
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:195
 msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
 msgstr "I visse tilfælde kan en kraftigt anvendt MISP-instans generere uønskede blackhole-fejl grundet at serveren udsættest for et stort antal anmodninger. Deaktivér funktionen til automatisk udlogning for at lette systemets belastning."
 
-#: Model/Server.php:179
+#: Model/Server.php:204
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr "Sæt den ssdeep score ved hvilken to ssdeep hashes betragtes som korrelerede [1-100]"
 
-#: Model/Server.php:187
+#: Model/Server.php:212
 msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
 msgstr "Angiver det maksimale antal korrelationer, der kan hentes med en enkelt event. For ekstreme ydertilfælde kan dette forhindre hukommelsesproblemer. Standardværdien er 5k."
 
-#: Model/Server.php:196
+#: Model/Server.php:221
 msgid "The message that users will see if the instance is not live."
 msgstr "Den besked brugerne vil se, hvis instansen ikke er live."
 
-#: Model/Server.php:198
+#: Model/Server.php:223
 msgid "If this is not set the default value will be used."
 msgstr "Hvis dette ikke er angivet benyttes standardværdien."
 
-#: Model/Server.php:204;212;230;254;262;270;278;335;383;391;457
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
 msgid "This setting is deprecated and can be safely removed."
 msgstr "Denne indstilling er forældet og kan fjernes."
 
-#: Model/Server.php:220
+#: Model/Server.php:245
 msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
 msgstr "Cachede eksporter kan tage betydelig plads og kan deaktiveres for hele instansen med denne indstilling. Deaktivering af cached eksport anbefales ikke, da det er en værdifuld funktion. Hvis din server har plads problemer kan det dog være fornuftigt at tage dette skridt."
 
-#: Model/Server.php:238
+#: Model/Server.php:263
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr "Sidefodsteksten foran \"Drevet af MISP\" teksten."
 
-#: Model/Server.php:246
+#: Model/Server.php:271
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr "Sidefodsteksten efter \"Drevet af MISP\" teksten."
 
-#: Model/Server.php:286
+#: Model/Server.php:311
 msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
 msgstr "Hvis sat, tillader denne indstilling dig at vise et logo på højre side af sidefoden. Logoet skal uploades som et brugerdefineret billede i fil administrationen."
 
-#: Model/Server.php:294
+#: Model/Server.php:319
 msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
 msgstr "Hvis sat, tillader denne indstilling dig at vise et logo som hjem ikon. Logoet skal uploades som et brugerdefineret billede i fil administrationen."
 
-#: Model/Server.php:302
+#: Model/Server.php:327
 msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
 msgstr "Hvis sat, tillader denne indstilling dig at vise et andet billede i stedet for MISP logoet på loginsiden. Billedet skal uploades som et brugerdefineret billede i fil administrationen."
 
-#: Model/Server.php:310
+#: Model/Server.php:335
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr "Organisationtag for værtsorganisationen. Dette bruges i e-mail-emner."
 
-#: Model/Server.php:318
+#: Model/Server.php:343
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr "Værtsorganisationen for denne instans. Hvis dette ikke er valgt kan der ikke tilføjes replikerings instanser."
 
-#: Model/Server.php:327
+#: Model/Server.php:352
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr "MISP instans UUID. Denne UUID anvendes til at identificerer instansen."
 
-#: Model/Server.php:329
+#: Model/Server.php:354
 msgid "No valid UUID set"
 msgstr "Der er ikke sat et gyldigt UUID"
 
-#: Model/Server.php:343
+#: Model/Server.php:368
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr "Ved at sætte dette til 'falsk' vil alle organisations navne og logoer blive gemt."
 
-#: Model/Server.php:351
+#: Model/Server.php:376
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr "Sæt eventens trusselsniveau ind i emnet på adviserings e-mailen."
 
-#: Model/Server.php:359
+#: Model/Server.php:384
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr "Dette er TLP-strengen for emails, når email_subject_tag ikke er fundet."
 
-#: Model/Server.php:367
+#: Model/Server.php:392
 msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
 msgstr "Hvis dette tag er sat på en event, vil værdien blive sendt i e-mailens emne. Hvis tagget ikke angives anvendes i stedet værdien i email_subject_TLP_string."
 
-#: Model/Server.php:375
+#: Model/Server.php:400
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr "Inkludér navnet på email_subject_tag i emnet. Når falsk, benyttes kun tag-værdien."
 
-#: Model/Server.php:399
+#: Model/Server.php:424
 msgid "Enables the use of MISP's background processing."
 msgstr "Aktiver anvendelsen af MISP's baggrunds processering."
 
-#: Model/Server.php:407
+#: Model/Server.php:432
 msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
 msgstr "Mappe, hvor vedhæftede filer er gemt. MISP vil ikke overføre de eksisterende data, hvis du ændrer denne indstilling. Den eneste sikre måde at ændre denne indstilling er i config.php, mens MISP ikke kører, og efter at have flyttes/kopieres eksisterende data til den nye placering. Makken skal allerede eksistere, og kunne læses og skrives af MISP applikationen."
 
-#: Model/Server.php:416
+#: Model/Server.php:441
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr "Tillad XML caches at inkludere kodede vedhæftninger."
 
-#: Model/Server.php:424
+#: Model/Server.php:449
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr "Download altid vedhæftninger når indlæsningen sker af en bruger i en browser"
 
-#: Model/Server.php:432
+#: Model/Server.php:457
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr "Den e-mail-adresse, som MISP anvender for alle notifikationer"
 
-#: Model/Server.php:440
+#: Model/Server.php:465
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr "Du kan deaktivere al e-mail ved hjælp af denne indstilling. Når den er aktiveret, vil ingen udgående e-mails blive sendt af MISP."
 
-#: Model/Server.php:449
+#: Model/Server.php:474
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr "E-Mail adressen som MISP anvender som kontakt adresse til instansens support team."
 
-#: Model/Server.php:465
+#: Model/Server.php:490
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr "Omdan sårbarhedens type attributter til links, der linker til til den leverede CVE beskrivelse"
 
-#: Model/Server.php:473
+#: Model/Server.php:498
 msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
 msgstr "Denne indstilling styrer, om der sendes en e-mail notofikation, når en event bliver oprettet via REST interfacet. Det kan være en god ide at deaktivere denne indstilling, når der første gang oprettes et link til en anden instans, for at undgå at spamme din brugere mens du alver det første pull. Hurtigt Resumé: sand = E-mails sendes ikke, falsk = E-mails sendes på events publiceret via sync / REST."
 
-#: Model/Server.php:481
+#: Model/Server.php:506
 msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
 msgstr "aktivering af dette flag vil tillade at eventbeskrivelsen medtages i klartekst i emnefeltet på alert e-mail, da emnefeltet ikke krypteres af GnuPG. Vær sikker på at du kan acceptere dette."
 
-#: Model/Server.php:489
+#: Model/Server.php:514
 msgid "The default distribution setting for events (0-3)."
 msgstr "Standard distributions indstilling for events (0-3)."
 
-#: Model/Server.php:498
+#: Model/Server.php:523
 msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
 msgstr "Standardindstilling for distribution af attributter. Sæt denne til \"event\" hvis du ønsker at anvende distributions niveauet for events. (0-3 eller \"event\")"
 
-#: Model/Server.php:507
+#: Model/Server.php:532
 msgid "The default threat level setting when creating events."
 msgstr "Standardindstillingen for trussel niveau ved oprettelse af events."
 
-#: Model/Server.php:516
+#: Model/Server.php:541
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:550
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr "Aktiver funktionen tagging i MISP. Det er højest anbefalet."
 
-#: Model/Server.php:524
+#: Model/Server.php:558
 msgid "Show the full tag names on the event index."
 msgstr "Vis de fulde tag navne i event oversigten."
 
-#: Model/Server.php:533
+#: Model/Server.php:567
 msgid "Used on the login page, before the MISP logo"
 msgstr "Anvendes på login-siden, før MISP logoet"
 
-#: Model/Server.php:541
+#: Model/Server.php:575
 msgid "Used on the login page, after the MISP logo"
 msgstr "Anvendes på login-siden, efter MISP logoet"
 
-#: Model/Server.php:549
+#: Model/Server.php:583
 msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
 msgstr "Anvendes på login-siden, til venstre for MISP logoet. Skal uploades som en brugerdefineret billede i fil administrations værktøjet."
 
-#: Model/Server.php:557
+#: Model/Server.php:591
 msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
 msgstr "Anvendes på login-siden, til højre for MISP logoet. Skal uploades som en brugerdefineret billede i fil administrations værktøjet."
 
-#: Model/Server.php:565
+#: Model/Server.php:599
 msgid "Used in the page title, after the name of the page"
 msgstr "Bruges i sidetitlen efter navnet på siden"
 
-#: Model/Server.php:573
+#: Model/Server.php:607
 msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
 msgstr "Tillader brugere at overtage ejerskabet af hændelser der uploades via knappen \"Tilføj MISP XML\". Dette tillader spoofing af skaberen af en manuelt importeret event, og bryder måske den oprindeligt tænkte releasability. Synkronisering med en instans, der har en anderledes skaber til den samme event kan medføre uønskede konsekvenser."
 
-#: Model/Server.php:581
+#: Model/Server.php:615
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr "Vælg om vilkårene og betingelserne skal vises inline (falsk) eller tilbydes som download (sandt)"
 
-#: Model/Server.php:589
+#: Model/Server.php:623
 msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
 msgstr "Filnavnet til filen med vilkår og betingelser. Det skal sikres at filen er placeret i mappen MISP/app/files/terms"
 
-#: Model/Server.php:597
+#: Model/Server.php:631
 msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
 msgstr "Hvis sat til sand gives der mulighed for alternative org felter for event oversigten (kilde organisation og medlems organisation) i stedet for blot at vise kun et organisationsfelt (standard). Dette tillader brugere at se, om en event blev uploadet af en medlemsorganisation på deres MISP instans, eller om den opstod på en forbundet instans."
 
-#: Model/Server.php:605
+#: Model/Server.php:639
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr "Hvis sat til sand vil ikke-offentliggjorte events være utilgængelige for brugere uden for indsenderens organisation, med undtagelse af site admins."
 
-#: Model/Server.php:614
+#: Model/Server.php:648
 msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr "Meddelelsen der sendes til brugeren efter kontooprettelse (skal sendes manuelt fra administrations interfacet). Brug \\n for linjeskift. Følgende variable erstattes automatisk i teksten: $password = en ny midlertidig adgangskode, som MISP genererer, $username = brugerens e-mail-adresse, $misp = url til denne instans, $org = den organisation, som instansen hører til, som angivet i MISP.org, $contact = den e-mail-adresse der bruges til at kontakte instansens supportteam, som angivet i MISP.contact. Eksempel: Hvis feltet er \"adgangskoden til $username er $password\", vil brugeren med e-mail-adressen user@misp.org få teksten: \"adgangskoden til user@misp.org er hNamJae81\"."
 
-#: Model/Server.php:623
+#: Model/Server.php:657
 msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr "Meddelelsen der sendes til brugere efter kontooprettelse (skal sendes manuelt fra administrations interfacet). Brug \\n for linjeskift. Følgende variable erstattes automatisk i teksten: $password = en ny midlertidig adgangskode, som MISP genererer, $username = brugerens e-mail-adresse, $misp = url til denne instans, $org = den organisation, som instansen hører til, som angivet i MISP.org, $contact = den e-mail-adresse der bruges til at kontakte instansens supportteam, som angivet i MISP.contact. Eksempel: Hvis feltet er \"adgangskoden til $username er $password\", vil brugeren med e-mail-adressen user@misp.org få teksten: \"adgangskoden til user@misp.org er hNamJae81\"."
 
-#: Model/Server.php:631
+#: Model/Server.php:665
 msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
 msgstr "Siden version 2.3.107 har det været muligt at bruge blacklisting af event UUIDs for at forhindre dem i at blive synkroniseret til din instans. Denne funktionalitet vil desuden ske automatisk, når en event slettes, for at forhindre en slettet event i at blive skubbet tilbage fra en anden instans."
 
-#: Model/Server.php:638
+#: Model/Server.php:672
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr "Sortlist organisationers UUIDer for at forhindre dem i at oprette nogen begivenheder."
 
-#: Model/Server.php:645
+#: Model/Server.php:679
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr "Hvis aktiveret, vil alle logposter inkludere brugerens IP-adresse."
 
-#: Model/Server.php:654
+#: Model/Server.php:688
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr "Hvis aktiveret, vil MISP logge alle vellykkede godkendelser der anvender API nøgler. De forespurgte URLs bliver også logget."
 
-#: Model/Server.php:662
+#: Model/Server.php:696
 msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
 msgstr "Denne funktion lader brugere oprette rene organisationsbegivenheder og bede en anden organisation overtage ejerskabet af begivenheden. Dette lader organisationer forblive anonyme ved at bede en partner publicere en begivenhed for dem."
 
-#: Model/Server.php:671
+#: Model/Server.php:705
 msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
 msgstr "Når aktiveret, vil antallet af synlige korrelationer for den indloggede bruger kunne ses i begivenhedsindeks-UI'et. Dette medfører et ydelsestab, men det kan være meget nyttigt at se korrelerede begivenheder med ét blik."
 
-#: Model/Server.php:680
+#: Model/Server.php:714
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr "Når aktiveret, vises antallet af forslag til begivenhederne i indekset."
 
-#: Model/Server.php:689
+#: Model/Server.php:723
 msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
 msgstr "Når aktiveret, bliver det samlede antal attributobservationer inden for begivenheden synlige for den indloggede bruger i begivenhedsindeks-UI'et."
 
-#: Model/Server.php:698
+#: Model/Server.php:732
 msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
 msgstr "Når aktiveret, bliver det samlede antal diskussionsindlæg inden for begivenheden synlige for den indloggede bruger i begivenhedsindeks-UI'et."
 
-#: Model/Server.php:707
+#: Model/Server.php:741
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr "Når aktiveret, kan kun Org- og Site-admins redigere en brugers profil."
 
-#: Model/Server.php:717
+#: Model/Server.php:751
 msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
 msgstr "Aktivér denne indstilling for at starte blokering af advarselsemails til begivenheder med et bestemt tag. Definér tag'et i MISP.block_event_alert_tag."
 
-#: Model/Server.php:726
+#: Model/Server.php:760
 msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
 msgstr "Hvis indstillingen MISP.block_event_alert er opsat, blokeres e-mails for begivenheder, som er tagget med det i dene indstilling definerede tag."
 
-#: Model/Server.php:735
+#: Model/Server.php:769
 msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
 msgstr "Aktivér denne indstilling for at starte blokering af advarselsemails for gamle begivenheder. Den præcise definition af, hvad der udgør en gammel begivenhed, opsættes i MISP.block_old_event_alert_age."
 
-#: Model/Server.php:744
+#: Model/Server.php:778
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
 msgstr "Hvis indstillingen MISP.block_old_event_alert er opsat, styrer denne indstilling, hvor gammel en begivenhed må være, før den udløser en advarsel. \"Dato\"-feltet for begivenheden benyttes. Forventet format: Heltal, i dage"
 
-#: Model/Server.php:753
+#: Model/Server.php:787
 msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
 msgstr "Angiv temp-mappen, du vil benytte, til bestemte MISP-funktionaliteter. Standardstien er /tmp, og den benyttes bl.a. til at lagre visse midlertidige filer fra eksempelvis importprocessen mv."
 
-#: Model/Server.php:762
-msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/webroot/css directory and enter the name here."
-msgstr "Vil du at tilpasse css'en, så placér blot en css-fil i mappen /var/www/MISP/webroot/css og angiv dens navn her."
+#: Model/Server.php:796
+msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
+msgstr ""
 
-#: Model/Server.php:771
+#: Model/Server.php:805
 msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
 msgstr "Aktivér denne indstilling for at tillade blokering af attributter fra to_ids-sensitive eksporter, hvis der er blevet fremsat forslag om at fjerne IDS-flaget eller helt at fjerne attributten. Dette er et kraftfuldt værktøj til effetivt at håndtere falske positiver."
 
-#: Model/Server.php:780
+#: Model/Server.php:814
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr "Aktivér denne indstilling, hvis nye tags synkroniseret/tilføjet via indkommende begivenheder fra en hvilken som helst kilde ikke som standard bør kunne vælges af brugerne."
 
-#: Model/Server.php:789
+#: Model/Server.php:823
 msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
 msgstr "*ADVARSEL* Denne indstilling vil helt deaktivere korrelationen på denne instans og fjerne eventuelle eksisterende korrelationer. Aktivering af dette vil udløse en fuldstændig genkorrelering af alle data, hvilket er en ekstremt langsomlig og kostbar procedure. Aktivér kun dette, hvis du præcist ved, hvad du foretager dig."
 
-#: Model/Server.php:799
+#: Model/Server.php:833
 msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
 msgstr "*ADVARSEL* denne indstilling vil give event ejere mulighed for at deaktivere korrelationen mellem enkelte events / attributter, de har oprettet."
 
-#: Model/Server.php:808
+#: Model/Server.php:842
 msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr "Værten, som kører redis-serveren, der skal benyttes til generiske MISP-opgaver såsom caching. Dette skal ikke forveksles med redis-serveren, der benyttes af baggrundsbehandlingen."
 
-#: Model/Server.php:816
+#: Model/Server.php:850
 msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr "Redis-serverens port allokeret til generiske MISP-opgaver, såsom caching. Dette skal ikke forveksles med den redis-server, der benyttes af baggrundsbehandlingen."
 
-#: Model/Server.php:824
+#: Model/Server.php:858
 msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
 msgstr "Databasen på redis-serveren, der skal benyttes til generiske MISP-opgaver. Afvikles flere end én MISP-instans, skal der benytte en anden/individuel database til hver instans."
 
-#: Model/Server.php:832
+#: Model/Server.php:866
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr "Adgangskoden på redis-serveren (hvis nogen), der skal benyttes til generiske MISP-opgaver."
 
-#: Model/Server.php:841
+#: Model/Server.php:875
 msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
 msgstr "Angive hvilke felter, som skal filtreres, når du søger i begivenhedsoversigten. Standardværdierne er: \"id, uuid, værdi, kommentar, type, kategori, Tag.name\""
 
-#: Model/Server.php:849
+#: Model/Server.php:883
+msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
+msgstr ""
+
+#: Model/Server.php:891
 msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
 msgstr "Aktivér kun dette, hvis du har nogle værktøjer, som benytter MISP med en ekstremt høj samtidighed. Den generelle ydelse vil være lavere end normalt, da visse transaktionsmæssige forespørgsler undgås til fordel for kortere tabellåsninger."
 
-#: Model/Server.php:861
+#: Model/Server.php:903
 msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
 msgstr "Placeringen på den eksekverbare GnuPG. Vil du benytte en anden GnuPG-eksekverbar end /usr/bin/gpg, kan den opsættes her. Er standardvalget fint, skal du blot beholde den af MISP forslåede opsætning."
 
-#: Model/Server.php:869
+#: Model/Server.php:911
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr "Tillad (falsk) afsendelser af ukrypterede e-mails til brugere, som ikke har en GnuPG-nøgle."
 
-#: Model/Server.php:877
+#: Model/Server.php:919
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr "Tillad (falsk) at brødteksten i ukrypterede e-mails indeholder detaljer om begivenheden."
 
-#: Model/Server.php:885
+#: Model/Server.php:927
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr "Aktivér signering af GnuPG e-mails. Som standard signeres GnuPG e-mails"
 
-#: Model/Server.php:893
+#: Model/Server.php:935
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr "Den e-mail, som instansens GnuPG-nøgle er tilknyttet."
 
-#: Model/Server.php:901
+#: Model/Server.php:943
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr "Adgangskoden (hvis opsat) til instansens GnuPG-nøgle."
 
-#: Model/Server.php:910
+#: Model/Server.php:952
 msgid "The location of the GnuPG homedir."
 msgstr "Placeringen af ​​GnuPGs hjemmemappe."
 
-#: Model/Server.php:921
+#: Model/Server.php:963
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr "Aktivér SMIME-kryptering. Krypteringsmetodik for indstillingerne GnuPG.onlyencrypted og GnuPG.bodyonlyencrypted nedarves, hvis SMIME er aktiveret."
 
-#: Model/Server.php:929
+#: Model/Server.php:971
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr "Den e-mail, som instansens SMIME-nøgle er tilknyttet."
 
-#: Model/Server.php:937
+#: Model/Server.php:979
 msgid "The location of the public half of the signing certificate."
 msgstr "Placeringen af den offentlige del af signeringscertifikatet."
 
-#: Model/Server.php:945
+#: Model/Server.php:987
 msgid "The location of the private half of the signing certificate."
 msgstr "Placeringen af den private del af signerings certifikatet."
 
-#: Model/Server.php:953
+#: Model/Server.php:995
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr "Adgangskoden (hvis opsat) til instansens SMIME-nøgle."
 
-#: Model/Server.php:965
+#: Model/Server.php:1007
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr "Værtsnavnet på en HTTP-proxy til udgående synkroniseringsanmodninger. Lad stå tomme for ikke at benytte en proxy."
 
-#: Model/Server.php:973
+#: Model/Server.php:1015
 msgid "The TCP port for the HTTP proxy."
 msgstr "TCP-porten til HTTP-proxy'en."
 
-#: Model/Server.php:981
+#: Model/Server.php:1023
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr "Godkendelsesmetoden for HTTP-proxy'en. Pt. understøttes Basic eller Digest. Lad feltet stå tomt, hvis proxy'en ikke kræver godkendelse."
 
-#: Model/Server.php:989
+#: Model/Server.php:1031
 msgid "The authentication username for the HTTP proxy."
 msgstr "Godkendelsesbrugernavnet til HTTP proxy'en."
 
-#: Model/Server.php:997
+#: Model/Server.php:1039
 msgid "The authentication password for the HTTP proxy."
 msgstr "Godkendelsesadgangskoden til HTTP-proxy'en."
 
-#: Model/Server.php:1008
+#: Model/Server.php:1050
 msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
 msgstr "Salt'en benyttes til de hashede adgangskoder. Du kan ikke nulstille denne fra GUI'et, kun manuelt via settings.php-filen. Husk, at dette vil ugyldiggøre alle adgangskoder i databasen."
 
-#: Model/Server.php:1017
+#: Model/Server.php:1059
 msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
 msgstr "Aktivér denne indstilling for at overføre alle revisionslogposter direkte til syslog. Husk, at dette er detaljeret og bl.a. vil indeholde bruger-, organisations- og begivenhedsdata."
 
-#: Model/Server.php:1026
+#: Model/Server.php:1068
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr "Adgangskodelængdekrav. Hvis ikke opsat, eller indstillet til 0, antages brug af standardværdien (12)."
 
-#: Model/Server.php:1034
+#: Model/Server.php:1076
 msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 msgstr "Adgangskodekompleksitetskrav. Lad stå tomt for standardindstillingen (3 ud af 4, med enten ét ciffer eller ét specialtegn) eller angiv dit eget regulære udtryk (regex). Husk, at længden er tjekkes i en anden nøgle. Standard (simpel 3 ud af 4 eller mindst 16 tegn): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 
-#: Model/Server.php:1042
+#: Model/Server.php:1084
 msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
 msgstr "Aktivering af denne indstilling betyder, at brugeren skal angive sin aktuelle adgangskode ved en evt. redigering af sin profil (herunder et udløst adgangskodeskift). For administratorer vil bekræftelsen være krævet, når enhver brugerprofil ændres. Kan potentielt afbøde en angribers forsøg på at ændre en kompromitteret brugers adgangskode for at etablere fodfæste, men aktivering af funktionen vil være yderst irriterende for brugerne."
 
-#: Model/Server.php:1051
+#: Model/Server.php:1093
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr "Aktivering af denne indstilling vil rense indholdet af en attribut ved en soft delete"
 
-#: Model/Server.php:1060
+#: Model/Server.php:1102
 msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
 msgstr "Aktivering af denne indstilling vil hindre organisationsindekset i at være synligt for andre end webstedsadministratorer for den aktuelle instans. Husk, at brugerne stadig kan se organisationer, som producerer data via begivenheder, forslag, begivenhedshistoriklogposter mv."
 
-#: Model/Server.php:1069
+#: Model/Server.php:1111
 msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
 msgstr "Tillader videregivelse af API-nøglen via den navngivne URL-parameter \"apikey\" - det anbefales kraftigt ikke at aktivere dette, men har du nogle problematiske forældede værktøjer, som ikke kan passere godkendelsesheaderen, kan det fungere som en løsning. Benyt dog kun dette som den absolut allersidste udvej."
 
-#: Model/Server.php:1071
+#: Model/Server.php:1113
 msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
 msgstr "Du har aktiveret videregivelsen af API-nøgler via URL-parametre, hvilket srærkt frarådes. Sikker på, at du vil afsløre API-nøgler i dine logfiler?"
 
-#: Model/Server.php:1081
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr "Antal indlogningsforsøg en bruger kan udføre, inden brute force-beskyttelsen træder i kraft."
 
-#: Model/Server.php:1089
+#: Model/Server.php:1149
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr "Varigheden (i sekunder) af, hvor længe brugeren vil blive låst, hvis det tilladte antal login forsøg er opbrugt."
 
-#: Model/Server.php:1100
+#: Model/Server.php:1160
 msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
 msgstr "Indstil til sandt for automatisk at regenerere sessioner efter x antal anmodninger. Dette kan føre til, at brugeren de-autentificeres, hvilket generelt er frustrerende, så aktivér kun dette, hvis du virkelig har behov for at regenerere sessioner. (Ikke anbefalet)"
 
-#: Model/Server.php:1108
+#: Model/Server.php:1168
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr "Sættes til sandt for at tjekke user agent-strengen i hver anmodning. Dette kan føre til lejlighedsvise udlogninger. (Ikke anbefalet)"
 
-#: Model/Server.php:1116
+#: Model/Server.php:1176
 msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
 msgstr "Den af MISP benyttede sessionstype. Standardindstillingen er php, som gør brug af de i php.ini opsatte indstillinger for sessionsdataene (understøttede indstillinger: php, database). Den anbefalede indstilling er php samt opsætning af din PHP til brug af redis-sessioner via din php.ini. Føj blot ' session.save_handler = redis' og \"session.save_path = 'tcp://localhost:6379'\" (erstat sidstnævnte med din redis-forbindelse) til "
 
-#: Model/Server.php:1125
-msgid "The timeout duration of sessions (in MINUTES)."
-msgstr "Timeout-varigheden for sessioner (i MINUTTER)."
+#: Model/Server.php:1185
+msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
+msgstr ""
 
-#: Model/Server.php:1133
+#: Model/Server.php:1193
 msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
 msgstr "Udløbet af cookien (i MINUTTER). Sessions-timeoutet opfriskes hyppigt, hvilket ikke gælder cookies. Generelt anbefales det at have en meget længere cookie_timeout end timeout."
 
-#: Model/Server.php:1144
+#: Model/Server.php:1204
 msgid "The default policy action for the values added to the RPZ."
 msgstr "Standard politikhandlingen for de værdier, som er tilføjet RPZ."
 
-#: Model/Server.php:1153
+#: Model/Server.php:1213
 msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
 msgstr "Standard walled garden benyttes af RPZ-eksporten, hvis indstillingen walled garden er valgt for eksporten."
 
-#: Model/Server.php:1161
+#: Model/Server.php:1221
 msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
 msgstr "Serien i SOA-delen af zonefilen. (numerisk, bedste praksis er yyyymmddrr, hvor rr er den to-cifrede underrevision af filen. $date konverteres automatisk til det aktuelle ååååmmdd format, så $date00 er en gyldig indstilling)."
 
-#: Model/Server.php:1169
+#: Model/Server.php:1229
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Opfriskningen angivet i SOA-delen af zonefilen (i sekunder eller forkortet til f.eks. 15m)."
 
-#: Model/Server.php:1177
+#: Model/Server.php:1237
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Gentagelsen angivet i SOA-delen af zonefilen (i sekunder eller forkortet til f.eks. 15m)."
 
-#: Model/Server.php:1185
+#: Model/Server.php:1245
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Udløbet angivet i SOA-delen af zonefilen (i sekunder eller forkortet til f.eks. 15m)."
 
-#: Model/Server.php:1193
+#: Model/Server.php:1253
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Maksimal TTL angivet i SOA-delen af zonefilen (i sekunder eller forkortet til f.eks. 15m)."
 
-#: Model/Server.php:1201
+#: Model/Server.php:1261
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Zonefilens TTL (i sekunder eller forkortet til f.eks. 15m)."
 
-#: Model/Server.php:1217
+#: Model/Server.php:1277
 msgid "Alternate nameserver"
 msgstr "Alternativ navneserver"
 
-#: Model/Server.php:1225
+#: Model/Server.php:1285
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr "E-mailen angivet i SOA-delen af zonefilen."
 
-#: Model/Server.php:1233
+#: Model/Server.php:1293
 msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
 msgstr "Aktiverer/deaktiverer funktionen pub/sub i MISP. Sørg for de nødvendige installationer for at plugin'et kan fungere. Konsultér installationsvejledningen for yderligere oplysninger."
 
-#: Model/Server.php:1242
+#: Model/Server.php:1302
 msgid "The port that the pub/sub feature will use."
 msgstr "Porten benyttet af funktionerne pub/sub."
 
-#: Model/Server.php:1251
+#: Model/Server.php:1311
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr "Placering af Redis DB'en benyttet af MISP og Python PUB-scriptet til håndtering af datakøen til publisering."
 
-#: Model/Server.php:1260
+#: Model/Server.php:1320
 msgid "The port that Redis is listening on."
 msgstr "Porten, som Redis monitere."
 
-#: Model/Server.php:1269
+#: Model/Server.php:1329
 msgid "The password, if set for Redis."
 msgstr "Redis-adgangskoden (hvis opsat)."
 
-#: Model/Server.php:1278
+#: Model/Server.php:1338
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr "Databasen til brug for ikøsætning af beskeder til pub/sub-funktionaliteten."
 
-#: Model/Server.php:1287
+#: Model/Server.php:1347
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr "Navneområde til brug for ikøsætning af beskeder til pub/sub-funktionaliteten."
 
-#: Model/Server.php:1296
+#: Model/Server.php:1356
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr "Aktivér denne indstilling for inkludering af base64-kodet indhold af malware-prøver/vedhæftninger i outputtet."
 
-#: Model/Server.php:1304
+#: Model/Server.php:1364
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr "Aktiverer/deaktiverer publiceringen af enhver begivenhedsoprettelse/redigering/sletning."
 
-#: Model/Server.php:1312
+#: Model/Server.php:1372
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr "Aktiverer/deaktiverer publiceringen af enhver objektoprettelse/redigering/sletning."
 
-#: Model/Server.php:1320
+#: Model/Server.php:1380
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr "Aktiverer/deaktiverer publiceringen af enhver objektreferenceoprettelse/sletning."
 
-#: Model/Server.php:1328
+#: Model/Server.php:1388
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr "Aktiverer/deaktiverer publiceringen af enhver attributoprettelse/redigering/sletning."
 
-#: Model/Server.php:1336
+#: Model/Server.php:1396
 msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr "Aktiverer/deaktiverer publiceringen af enhver tagoprettelse/redigering/sletning samt tags, som knyttes til eller fjernes fra forskellige MISP-elementer."
 
-#: Model/Server.php:1344
+#: Model/Server.php:1404
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr "Aktiverer/deaktiverer publiceringen af nye observationer til ZMQ-pubsub feedet."
 
-#: Model/Server.php:1352
+#: Model/Server.php:1412
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr "Aktiverer/deaktiverer publiceringen af nye/ændrede brugere til ZMQ-pubsub feedet."
 
-#: Model/Server.php:1360
+#: Model/Server.php:1420
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr "Aktiverer/deaktiverer publiceringen af ​​nye/ændrede organisationer til ZMQ-pubsub feedet."
 
-#: Model/Server.php:1368
+#: Model/Server.php:1428
 msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr "Aktiverer/deaktiverer publiceringen af logposteringer til ZMQ-pubsub feedet. Husk, at outputtet kan blive temmelig omfattende afhængigt af dine logindstillinger."
 
-#: Model/Server.php:1376
+#: Model/Server.php:1436
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr "Aktivér logning til en ElasticSearch-instans"
 
-#: Model/Server.php:1384
-msgid "The URL(s) at which to access ElasticSearch - comma seperate if you want to have more than one."
-msgstr "URL('er) til ElasticSearch-adgang - kommaseparér ved flere end én URL."
+#: Model/Server.php:1444
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
+msgstr ""
 
-#: Model/Server.php:1392
+#: Model/Server.php:1452
 msgid "The index in which to place logs"
 msgstr "Indekset, hvori logger skal placeres"
 
-#: Model/Server.php:1400
+#: Model/Server.php:1460
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr "Aktiverer/deaktiverer upload af malware-prøver til S3 fremfor til disk (Advarsel: Indhent tilladelse fra Amazon først!)"
 
-#: Model/Server.php:1408
+#: Model/Server.php:1468
 msgid "Bucket name to upload to"
 msgstr "Bucket-navn til at uploade til"
 
-#: Model/Server.php:1416
+#: Model/Server.php:1476
 msgid "Region in which your S3 bucket resides"
 msgstr "Region, hvori din S3-bucket er beliggende"
 
-#: Model/Server.php:1424
+#: Model/Server.php:1484
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr "AWS-nøglen til brug når du uploader prøver (Advarsel: Det anbefales kraftigt, at du benytter EC2 IAM-roller, hvis overhovedet muligt)"
 
-#: Model/Server.php:1432
+#: Model/Server.php:1492
 msgid "AWS secret key to use when uploading samples"
 msgstr "Den hemmelige AWS-nøgle til brug ved upload af prøver"
 
-#: Model/Server.php:1440
+#: Model/Server.php:1500
 msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
 msgstr "Denne indstilling definerer, hvem som vil kunne se de rapporterede observationer. Standardindstillingen er Begivenhedsejer alene (ud over alle, som kan se egne bidrag) med de flg. muligheder Observationsrapportører (dvs., begivenhedsejeren og alle, som leverede observationsdata om hændelsen), og Alle (dvs., alle med adgang til at se begivenheden/attributten)."
 
-#: Model/Server.php:1449
+#: Model/Server.php:1509
 msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
 msgstr "Aktivering af observationsanonymisering vil blot samle alle observationer i stedet for at vise de organisationer, som har rapporteret en observation. Brugere vil være i stand til at afgøre antallet af observationer indsendt af deres organisation samt antallet af observationer for andre organisationer"
 
-#: Model/Server.php:1457
+#: Model/Server.php:1517
 msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
 msgstr "Angiv området, indenfor hvilket observationer vil blive taget i betragtning ved generering af grafer. F.eks. er en observation med en sighted_date på 7 år måske ikke længere relevant. Indstilles i antal dage, standardanangivelsen er 365"
 
-#: Model/Server.php:1465
+#: Model/Server.php:1525
 msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
 msgstr "Aktivér denne funktionalitet, hvis du vil håndtere autentificeringen via et eksternt værktøj og autentificere med MISP vha. en tilpasset header."
 
-#: Model/Server.php:1475
+#: Model/Server.php:1535
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr "Angiv headeren, som MISP skal kigge efter, her. Hvis tom, benyttes standard Authorization header."
 
-#: Model/Server.php:1484
+#: Model/Server.php:1544
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr "Benyt et header-navneområde for auth headeren - standardindstillingen er aktiv"
 
-#: Model/Server.php:1493
+#: Model/Server.php:1553
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr "Standard header-navneområdet for auth headeren - standardindstillingen er HTTP_"
 
-#: Model/Server.php:1502
+#: Model/Server.php:1562
 msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
 msgstr "Er denne indstilling er aktiv, vil eneste godkendelsesmåde være at benytte den tilpassede header. Altnertativt kan du kan køre i blandet tilstand, hvilket vil logge brugere ind via headeren, hvis den findes, ellers vil brugerne blive omdirigeret til den normal login-side."
 
-#: Model/Server.php:1511
+#: Model/Server.php:1571
 msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
 msgstr "Beytter du et eksternt værktøj til MISP-godkendelse, men vil du kun tillade værktøjets URL som et gyldigt indgangspunkt, så opsæt dette felt. "
 
-#: Model/Server.php:1520
+#: Model/Server.php:1580
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr "Navnet på godkendelsesmetoden. Dette er rent kosmetisk og vil fremgå på brugeroprettelsessiden og i logs."
 
-#: Model/Server.php:1529
+#: Model/Server.php:1589
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr "Deaktivér knappen log ud for brugeres godkendelse med den eksterne auth-mekanisme."
 
-#: Model/Server.php:1537
+#: Model/Server.php:1597
 msgid "Enable/disable the enrichment services"
 msgstr "Aktivér/deaktivér berigelsestjenesterne"
 
-#: Model/Server.php:1545
+#: Model/Server.php:1605
 msgid "Set a timeout for the enrichment services"
 msgstr "Angiv en timeout for berigelsestjenesterne"
 
-#: Model/Server.php:1553;1665
+#: Model/Server.php:1613;1725
 msgid "Enable/disable the import services"
 msgstr "Aktivér/deaktivér importtjenesterne"
 
-#: Model/Server.php:1561;1682
+#: Model/Server.php:1621;1742
 msgid "Set a timeout for the import services"
 msgstr "Angiv en timeout for importtjenesterne"
 
-#: Model/Server.php:1569
+#: Model/Server.php:1629
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "URL'en, der benyttes for at tilgå importtjenesterne. Som standard er den tilgængelig via http://127.0.0.1:6666"
 
-#: Model/Server.php:1577
+#: Model/Server.php:1637
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Porten, der benyttes for at tilgå importtjenesterne. Som standard tilgængelig via 127.0.0.1:6666"
 
-#: Model/Server.php:1585
+#: Model/Server.php:1645
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "URL'en, som benyttes for at tilgå eksporttjenesterne. Som standard tilgængelig via http://127.0.0.1:6666"
 
-#: Model/Server.php:1593
+#: Model/Server.php:1653
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Porten, som benyttes for at tilgå eksporttjenesterne. Som standard tilgængelig via 127.0.0.1:6666"
 
-#: Model/Server.php:1601
+#: Model/Server.php:1661
 msgid "Enable/disable the export services"
 msgstr "Aktivér/deaktivér eksporttjenesterne"
 
-#: Model/Server.php:1609
+#: Model/Server.php:1669
 msgid "Set a timeout for the export services"
 msgstr "Angiv en timeout for eksporttjenesterne"
 
-#: Model/Server.php:1617
+#: Model/Server.php:1677
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr "Aktivér/deaktivér Mus-over informationshentningen fra berigelsesmodulerne"
 
-#: Model/Server.php:1625
+#: Model/Server.php:1685
 msgid "Set a timeout for the hover services"
 msgstr "Angiv en timeout for mus-over tjenesterne"
 
-#: Model/Server.php:1633
+#: Model/Server.php:1693
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "URL'en, som benyttes for at tilgå berigelsestjenesterne. Som standard tilgængelig via http://127.0.0.1:6666"
 
-#: Model/Server.php:1641
+#: Model/Server.php:1701
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Porten, som benyttes for at tilgå berigelsestjenesterne. Som standard tilgængelig via 127.0.0.1:6666"
 
-#: Model/Server.php:1649
+#: Model/Server.php:1709
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr "URL'en, som beyttes for at tilgå Cortex. Som standard tilgængelig via http://cortex-url"
 
-#: Model/Server.php:1657
+#: Model/Server.php:1717
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr "Porten, som benyttes for at tilgå Cortex. Som standard port 9000"
 
-#: Model/Server.php:1673
+#: Model/Server.php:1733
 msgid "Set an authentication key to be passed to Cortex"
 msgstr "Angiv en godkendelsesnøgle til videreivelse til Cortex"
 
-#: Model/Server.php:1690
+#: Model/Server.php:1750
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr "Sæt til falsk for at deaktivere SSL-bekræftelse. Anbefales ikke."
 
-#: Model/Server.php:1699
+#: Model/Server.php:1759
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr "Sæt til falsk, hvis du ønsker at ignorere matchkomtrolfejl for værtsnavne under certifikatvalideringer."
 
-#: Model/Server.php:1708
+#: Model/Server.php:1768
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr "Sæt til sandt for at aktivere anvendelse af selvsignerede certifikater. Dette kræver, at Cortex_ssl_verify_peer er aktiveret."
 
-#: Model/Server.php:1717
+#: Model/Server.php:1777
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr "Sæt til den absolutte sti til Certifikatmyndighedsfilen, som skal benyttes til bekræftelse af SSL-certifikater."
 
-#: Model/Server.php:1726
+#: Model/Server.php:1786
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr "Give dine tilpassede autentifikationsbrugere en ekstern URL til autentifikationssystemet til nulstilling af deres adgangskoder."
 
-#: Model/Server.php:1735
+#: Model/Server.php:1795
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr "Giver en tilpasset log-ud URL til dine brugere, som vil logge dem ud vha. det godkendelsessystem, du benytter."
 
-#: Model/Server.php:1745
+#: Model/Server.php:1805
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr "Instansens debug-niveau. Benyt altid 0 til prodktionsinstanser."
 
-#: Model/Server.php:1754
+#: Model/Server.php:1814
 msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
 msgstr "Instansens debug-niveauet for webstedsadmins. Denne funktion lader webstedsadmins eksekvere debug-tilstand på en idriftsat instans uden at afsløre dette overfor andre brugere. Den mest detaljerigholdige Indstilling for debug og site_admin_debug benyttes for admins."
 
-#: Model/Server.php:2401
+#: Model/Server.php:1947
+msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/Server.php:2054
+msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+msgstr "Ingen autorisation. Dette skyldes enten en ugyldig auth-nøgle, eller fordi synkroniserings brugeren ikke har godkendelses rettigheder aktiveret på den eksterne server. En anden grund kan være en forkert synkroniserings indstilling."
+
+#: Model/Server.php:2056
+msgid "Sorry, this is not yet implemented"
+msgstr ""
+
+#: Model/Server.php:2057
+msgid "Something went wrong while trying to pull"
+msgstr ""
+
+#: Model/Server.php:2069;2071
+msgid "Unknown issue."
+msgstr ""
+
+#: Model/Server.php:2535
 msgid "Enable or disable the %s module."
 msgstr "Aktivér/deaktivér %s-modulet."
 
-#: Model/Server.php:2404
+#: Model/Server.php:2538
 msgid "Restrict the %s module to the given organisation."
 msgstr "Begræns %s-modulet til den givne organisation."
 
-#: Model/Server.php:2412
+#: Model/Server.php:2546
 msgid "Set this required module specific setting."
 msgstr "Angiv specifikke indstillinger for dette modul."
 
-#: Model/Server.php:2527
+#: Model/Server.php:2661
 msgid "Value not set."
 msgstr "Ingen værdi sat."
 
-#: Model/Server.php:3130
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
 msgid "Organisation logos"
 msgstr "Organisationslogoer"
 
-#: Model/Server.php:3131
+#: Model/Server.php:3476
 msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
 msgstr "Det af organisationen benyttede logo til et begivenhedsindeks, begivenhedsvisning, diskussioner, forslag mv. Sørg for, at filnavnet er i formatet org.png, hvor org udgør det versal-/minuskelsensitive organisationsnavn."
 
-#: Model/Server.php:3133
+#: Model/Server.php:3478
 msgid "48x48 pixel .png files"
 msgstr "48x48 pixel .png filer"
 
-#: Model/Server.php:3136;3151
+#: Model/Server.php:3481;3496
 msgid "Filename must be in the following format: *.png"
 msgstr "Filnavnet skal være i følgende format: *.png"
 
-#: Model/Server.php:3140
+#: Model/Server.php:3485
 msgid "Additional image files"
 msgstr "Yderligere billedfiler"
 
-#: Model/Server.php:3141
+#: Model/Server.php:3486
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr "Billedfiler, uploadet til denne mappe, kan benyttes til forskellige formål, f.eks. som logoer på login-siden"
 
-#: Model/Server.php:3148
+#: Model/Server.php:3493
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr "tekst/html Hvis serveres inline, noget, der formidler vilkår for anvendelse, hvis fungerede som download"
 
-#: Model/Server.php:3765
+#: Model/Server.php:3665
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr ""
+
+#: Model/Server.php:4115
 msgid "Removing a dead worker."
 msgstr "Fjerner en dead worker."
 
-#: Model/Server.php:3766
+#: Model/Server.php:4116
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr "Fjerner dead worker-data. Worker var af typen %s med PID %s"
 
-#: Model/Server.php:3770
+#: Model/Server.php:4120
 msgid "Stopping a worker."
 msgstr "Stopper en worker."
 
-#: Model/Server.php:3771
+#: Model/Server.php:4121
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr "Stopper en worker. Worker var af typen %s med PID %s"
 
@@ -2029,7 +2311,7 @@ msgstr "der har de følgende afhængige items"
 
 #: View/Attributes/add.ctp:7
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Tilføj attribut"
@@ -2074,7 +2356,7 @@ msgstr "Type "
 #: View/Attributes/add.ctp:36
 #: View/Attributes/add_attachment.ctp:24
 #: View/Attributes/edit.ctp:24
-#: View/Events/add.ctp:24
+#: View/Events/add.ctp:20
 msgid "Distribution "
 msgstr "Distribution "
 
@@ -2082,7 +2364,7 @@ msgstr "Distribution "
 #: View/Attributes/add_attachment.ctp:33
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
-#: View/Events/add.ctp:34
+#: View/Events/add.ctp:30
 #: View/Events/edit.ctp:26
 #: View/Feeds/add.ctp:176
 #: View/Feeds/edit.ctp:172
@@ -2109,23 +2391,24 @@ msgstr "Kontekstuel kommentar"
 msgid "for Intrusion Detection System"
 msgstr "til Intrustion Dectection System"
 
-#: View/Attributes/add.ctp:87
+#: View/Attributes/add.ctp:91
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_mitre_attack_matrix.ctp:14;113
+#: View/Elements/view_galaxy_matrix.ctp:76;199
 #: View/Events/contact.ctp:29
 #: View/Events/edit.ctp:59
 #: View/Events/free_text_import.ctp:27
 #: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:78
+#: View/ObjectReferences/ajax/add.ctp:130
 #: View/Objects/add.ctp:147
 #: View/Objects/revise_object.ctp:85
 #: View/Organisations/admin_add.ctp:49
 #: View/Organisations/admin_edit.ctp:60
-#: View/Servers/add.ctp:126
-#: View/Servers/edit.ctp:167
-#: View/SharingGroups/add.ctp:75
+#: View/Servers/add.ctp:115
+#: View/Servers/edit.ctp:162
+#: View/SharingGroups/add.ctp:115
+#: View/TagCollections/add.ctp:21
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
 #: View/TemplateElements/ajax/template_element_add_file.ctp:67
 #: View/TemplateElements/ajax/template_element_add_text.ctp:29
@@ -2134,7 +2417,7 @@ msgstr "til Intrustion Dectection System"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/Users/admin_add.ctp:97
 #: View/Users/admin_edit.ctp:91
-#: View/Users/admin_email.ctp:51
+#: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
 #: View/Users/change_pw.ctp:23
 #: View/Users/edit.ctp:41
@@ -2142,14 +2425,17 @@ msgstr "til Intrustion Dectection System"
 msgid "Submit"
 msgstr "Godkend"
 
-#: View/Attributes/add.ctp:88
+#: View/Attributes/add.ctp:92
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:62
+#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/exportSearch.ctp:32
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Elements/eventattributecreation.ctp:89
-#: View/Elements/view_mitre_attack_matrix.ctp:114
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/view_galaxy_matrix.ctp:200
 #: View/Elements/serverRuleElements/pull.ctp:70
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2158,21 +2444,18 @@ msgstr "Godkend"
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/ajax/enrich_event.ctp:21
+#: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:15
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/exportChoice.ctp:51
 #: View/Events/ajax/importChoice.ctp:12
 #: View/Events/ajax/quick_edit.ctp:6
-#: View/Galaxies/ajax/cluster_choice.ctp:32
-#: View/Galaxies/ajax/galaxy_choice.ctp:22
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:15
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
-#: View/ObjectReferences/ajax/add.ctp:82
+#: View/ObjectReferences/ajax/add.ctp:134
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/ObjectTemplates/ajax/object_choice.ctp:10
 #: View/Objects/add.ctp:153
 #: View/Objects/revise_object.ctp:87
 #: View/Objects/ajax/delete.ctp:24
@@ -2187,11 +2470,12 @@ msgstr "Godkend"
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
 #: View/Sightings/ajax/advanced.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
-#: View/Tags/ajax/select_tag.ctp:32
-#: View/Tags/ajax/taxonomy_choice.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:6
 #: View/TemplateElements/ajax/template_element_add_file.ctp:73
@@ -2201,6 +2485,7 @@ msgstr "Godkend"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:35
 #: View/Templates/ajax/template_choices.ctp:15
 #: View/Users/admin_filter_user_index.ctp:107
+#: View/Users/ajax/emailConfirmTemplate.ctp:14
 #: View/Users/ajax/fetchpgpkey.ctp:24
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
@@ -2239,8 +2524,6 @@ msgstr "Begivenheds-ID"
 #: View/Elements/Users/userIndexTable.ctp:4
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_view.ctp:14
-#: View/Users/view.ctp:14
 msgid "Org"
 msgstr "Org"
 
@@ -2255,7 +2538,7 @@ msgid "Event date"
 msgstr "Begivenhedsdato"
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Event graph"
 msgstr "Begivenhedsgraf"
 
@@ -2283,12 +2566,12 @@ msgstr "Marker alle nye attributter til IDS"
 
 #: View/Attributes/attribute_replace.ctp:26
 #: View/Noticelists/view.ctp:36
-#: View/Warninglists/view.ctp:54
+#: View/Warninglists/view.ctp:35
 msgid "Values"
 msgstr "Værdier"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:75
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:46
@@ -2322,7 +2605,7 @@ msgstr "Ingen fejlede Composites"
 msgid "disabled"
 msgstr "deaktiveret"
 
-#: View/Attributes/edit.ctp:64
+#: View/Attributes/edit.ctp:68
 #: View/ShadowAttributes/add.ctp:55
 #: View/ShadowAttributes/edit.ctp:45;54
 msgid "Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this."
@@ -2330,7 +2613,7 @@ msgstr "Advarsel: Du er ved at dele data af en sensitiv art (Tilskrivningsdata/m
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -2338,10 +2621,6 @@ msgstr "Advarsel: Du er ved at dele data af en sensitiv art (Tilskrivningsdata/m
 msgid "Attributes"
 msgstr "Attributter"
 
-#: View/Attributes/index.ctp:7
-msgid "Results for all attributes"
-msgstr "Resultater for alle attributter"
-
 #: View/Attributes/index.ctp:8
 msgid " with the value containing "
 msgstr " med værdien indeholdende "
@@ -2354,57 +2633,67 @@ msgstr " bliver tagget med "
 msgid " from the events "
 msgstr " fra begivenhederne "
 
-#: View/Attributes/index.ctp:12
-msgid " of category "
-msgstr " i kategorien "
+#: View/Attributes/index.ctp:11
+msgid " carrying the tag(s) "
+msgstr ""
 
-#: View/Attributes/index.ctp:13
+#: View/Attributes/index.ctp:12
 msgid " of type "
 msgstr " af typen "
 
-#: View/Attributes/index.ctp:14
-msgid " created by the organisation "
-msgstr " oprettet af organisation "
+#: View/Attributes/index.ctp:13
+msgid " of category "
+msgstr " i kategorien "
 
-#: View/Attributes/index.ctp:28;173
-#: View/Elements/eventattribute.ctp:60;258
+#: View/Attributes/index.ctp:14
+msgid " created by organisation "
+msgstr ""
+
+#: View/Attributes/index.ctp:26
+msgid "Results for all attributes"
+msgstr "Resultater for alle attributter"
+
+#: View/Attributes/index.ctp:39;132
+#: View/Elements/eventattribute.ctp:60;229
 #: View/Elements/eventdiscussion.ctp:15;126
+#: View/Elements/generic_table.ctp:16
+#: View/Elements/generic_table_row.ctp:16
 #: View/Elements/Feeds/eventattribute.ctp:20;86
 #: View/Elements/Servers/eventattribute.ctp:20;86
 #: View/EventBlacklists/index.ctp:13;54
-#: View/Events/index.ctp:12;89
+#: View/Events/index.ctp:12;115
 #: View/Events/proposal_event_index.ctp:12;95
 #: View/Events/ajax/index.ctp:13;39
 #: View/Feeds/freetext_index.ctp:22;86
-#: View/Feeds/index.ctp:20;230
-#: View/Feeds/preview_index.ctp:14;82
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
 #: View/Galaxies/index.ctp:13;53
-#: View/GalaxyClusters/ajax/index.ctp:11;96
+#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:33;162
-#: View/Logs/admin_index.ctp:37;111
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
 #: View/Logs/event_index.ctp:17;61
 #: View/News/index.ctp:39
 #: View/Noticelists/index.ctp:13;83
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
-#: View/ObjectTemplates/index.ctp:13;126
+#: View/ObjectTemplates/index.ctp:13;137
 #: View/OrgBlacklists/index.ctp:13;52
-#: View/Organisations/index.ctp:42;138
+#: View/Organisations/index.ctp:42;159
 #: View/Regexp/admin_index.ctp:13;51
 #: View/Regexp/index.ctp:13;45
 #: View/Roles/admin_index.ctp:13;82
 #: View/Roles/index.ctp:13;55
-#: View/Servers/index.ctp:13;117
-#: View/Servers/preview_index.ctp:15;164
-#: View/ShadowAttributes/index.ctp:12;108
-#: View/SharingGroups/index.ctp:13;86
+#: View/Servers/index.ctp:13;156
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;63
-#: View/Taxonomies/view.ctp:53;169
+#: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:12;56
+#: View/Users/admin_index.ctp:12;86
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -2412,45 +2701,47 @@ msgstr " oprettet af organisation "
 msgid "previous"
 msgstr "forrige"
 
-#: View/Attributes/index.ctp:30;175
-#: View/Elements/eventattribute.ctp:62;260
+#: View/Attributes/index.ctp:41;134
+#: View/Elements/eventattribute.ctp:62;231
 #: View/Elements/eventdiscussion.ctp:17;128
+#: View/Elements/generic_table.ctp:18
+#: View/Elements/generic_table_row.ctp:18
 #: View/Elements/Feeds/eventattribute.ctp:22;88
 #: View/Elements/Servers/eventattribute.ctp:22;88
 #: View/EventBlacklists/index.ctp:15;56
-#: View/Events/index.ctp:14;91
+#: View/Events/index.ctp:14;117
 #: View/Events/proposal_event_index.ctp:14;97
 #: View/Events/ajax/index.ctp:15;41
 #: View/Feeds/freetext_index.ctp:24;88
-#: View/Feeds/index.ctp:22;232
-#: View/Feeds/preview_index.ctp:16;84
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
 #: View/Galaxies/index.ctp:15;55
-#: View/GalaxyClusters/ajax/index.ctp:13;98
+#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:35;164
-#: View/Logs/admin_index.ctp:39;113
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
 #: View/Logs/event_index.ctp:19;63
 #: View/News/index.ctp:41
 #: View/Noticelists/index.ctp:15;85
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
-#: View/ObjectTemplates/index.ctp:15;128
+#: View/ObjectTemplates/index.ctp:15;139
 #: View/OrgBlacklists/index.ctp:15;54
-#: View/Organisations/index.ctp:44;140
+#: View/Organisations/index.ctp:44;161
 #: View/Regexp/admin_index.ctp:15;53
 #: View/Regexp/index.ctp:15;47
 #: View/Roles/admin_index.ctp:15;84
 #: View/Roles/index.ctp:15;57
-#: View/Servers/index.ctp:15;119
-#: View/Servers/preview_index.ctp:17;166
-#: View/ShadowAttributes/index.ctp:14;110
-#: View/SharingGroups/index.ctp:15;88
+#: View/Servers/index.ctp:15;158
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;65
-#: View/Taxonomies/view.ctp:55;171
+#: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:14;58
+#: View/Users/admin_index.ctp:14;88
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -2458,66 +2749,144 @@ msgstr "forrige"
 msgid "next"
 msgstr "næste"
 
-#: View/Attributes/index.ctp:148
-msgid "Are you sure you want to delete this attribute?"
-msgstr "Er du sikker på at du vil slette denne attribut?"
+#: View/Attributes/index.ctp:53
+#: View/Elements/eventattribute.ctp:152
+#: View/Elements/Events/eventIndexTable.ctp:37
+#: View/Elements/Feeds/eventattribute.ctp:45
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/view.ctp:117
+#: View/Feeds/preview_event.ctp:16
+#: View/Noticelists/view.ctp:43
+#: View/Pages/doc/using_the_system.ctp:164;207;318
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
+#: View/Tags/index.ctp:10
+#: View/Templates/add.ctp:12
+#: View/Templates/edit.ctp:12
+#: View/Templates/view.ctp:19
+msgid "Tags"
+msgstr "Tags"
 
-#: View/Attributes/index.ctp:151
-msgid "Propose an edit"
-msgstr "Foreslå en ændring"
+#: View/Attributes/index.ctp:54
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/Galaxies/index.ctp:2
+msgid "Galaxies"
+msgstr "Galaxies"
 
-#: View/Attributes/index.ctp:155
-#: View/Elements/Events/eventIndexTable.ctp:82;86;229
-#: View/Elements/Users/userIndexTable.ctp:94
-#: View/Elements/dashboard/dashboard_events.ctp:4;5
-#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
-#: View/Events/proposal_event_index.ctp:45;49
-#: View/Feeds/preview_index.ctp:66
-#: View/Noticelists/index.ctp:66
-#: View/ObjectTemplates/index.ctp:104
-#: View/Organisations/index.ctp:122
-#: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/preview_index.ctp:148
-#: View/Taxonomies/index.ctp:47
-#: View/Warninglists/index.ctp:60
-msgid "View"
-msgstr "Se"
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:161
+msgid "Correlate"
+msgstr "Korrelere"
 
-#: View/Attributes/index.ctp:166
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Events/view.ctp:314
+#: View/Feeds/preview_event.ctp:73
+#: View/Pages/doc/using_the_system.ctp:235
+#: View/Servers/preview_event.ctp:95
+msgid "Related Events"
+msgstr "Relaterede begivenheder"
+
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:163
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+msgid "Feed hits"
+msgstr "Feedhits"
+
+#: View/Attributes/index.ctp:61
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
+msgid "Sightings"
+msgstr "Observationer"
+
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
+#: View/Tags/index.ctp:73
+msgid "Activity"
+msgstr "Aktivitet"
+
+#: View/Attributes/index.ctp:63
+#: View/Elements/eventattribute.ctp:168
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/healthElements/files.ctp:33
+#: View/Elements/healthElements/workers.ctp:60
+#: View/Elements/templateElements/templateRowAttribute.ctp:94
+#: View/Elements/templateElements/templateRowFile.ctp:71
+#: View/Elements/templateElements/templateRowText.ctp:28
+#: View/EventBlacklists/index.ctp:27
+#: View/Events/export.ctp:31
+#: View/Events/resolved_attributes.ctp:53
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:51
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:66
+#: View/OrgBlacklists/index.ctp:26
+#: View/Organisations/index.ctp:102
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:25
+#: View/Roles/admin_index.ctp:35
+#: View/Servers/index.ctp:37
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:27
+#: View/Templates/index.ctp:27
+#: View/Threads/index.ctp:28
+#: View/Warninglists/index.ctp:38
+#: View/Whitelists/admin_index.ctp:24
+msgid "Actions"
+msgstr "Handlinger"
+
+#: View/Attributes/index.ctp:125
 #: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
 #: View/EventBlacklists/index.ctp:47
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:223
-#: View/Feeds/preview_index.ctp:74
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
 #: View/Galaxies/index.ctp:46
-#: View/GalaxyClusters/ajax/index.ctp:90
+#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:155
-#: View/Logs/admin_index.ctp:104
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
 #: View/Logs/event_index.ctp:54
 #: View/News/index.ctp:33
 #: View/Noticelists/index.ctp:76
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:66
-#: View/ObjectTemplates/index.ctp:119
+#: View/ObjectTemplates/index.ctp:130
 #: View/OrgBlacklists/index.ctp:45
-#: View/Organisations/index.ctp:131
+#: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
 #: View/Roles/admin_index.ctp:75
 #: View/Roles/index.ctp:48
-#: View/Servers/index.ctp:110
-#: View/Servers/preview_index.ctp:156
-#: View/ShadowAttributes/index.ctp:101
-#: View/SharingGroups/index.ctp:79
+#: View/Servers/index.ctp:149
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:56
-#: View/Taxonomies/view.ctp:162
+#: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:49
+#: View/Users/admin_index.ctp:79
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -2564,26 +2933,22 @@ msgid "Containing the following expressions"
 msgstr "Indeholder følgende udtryk"
 
 #: View/Attributes/search.ctp:11
-msgid "Being an attribute matching the following tags"
-msgstr "Er en attribut matchende flg. tags"
+msgid "Having tag or being an attribute of an event having the tag"
+msgstr ""
 
 #: View/Attributes/search.ctp:12
 msgid "Being attributes of the following event IDs, event UUIDs or attribute UUIDs"
 msgstr "Er attributter af flg. begivenheds-ID'er, begivenheds-UUID'er eller attribut-UUID'er"
 
-#: View/Attributes/search.ctp:13
-msgid "Being an attribute of an event matching the following tags"
-msgstr "Er en attribut af en begivenhed matchende flg. tags"
-
-#: View/Attributes/search.ctp:20
+#: View/Attributes/search.ctp:15
 msgid "From the following organisation(s)"
 msgstr "Fra følgende organisation(er)"
 
-#: View/Attributes/search.ctp:36
-msgid "Only find IOCs to use in IDS"
-msgstr "Find kun IOC'er til brug i IDS"
+#: View/Attributes/search.ctp:29
+msgid "Only find IOCs flagged as to_ids"
+msgstr ""
 
-#: View/Attributes/search.ctp:40
+#: View/Attributes/search.ctp:33
 msgid "Alternate Search Result (Events)"
 msgstr "Alternativt søgeresultat (begivenheder)"
 
@@ -2601,26 +2966,26 @@ msgstr "Er du sikker på at du vil soft-delete attribut #%s? Dette betyder at de
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90
-#: View/Elements/galaxyQuickView.ctp:23
-#: View/Elements/side_menu.ctp:351
-#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/eventIndexTable.ctp:229
 #: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:30
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Roles/admin_index.ctp:67
-#: View/Servers/index.ctp:99
+#: View/Servers/index.ctp:138
 #: View/Tags/index.ctp:125
 msgid "Delete"
 msgstr "Slet"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
@@ -2634,34 +2999,36 @@ msgstr "Slet"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:56
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:168
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
 #: View/Events/ajax/handleSelected.ctp:17
 #: View/Events/ajax/toggle_correlation.ctp:20
 #: View/Feeds/preview_event.ctp:56
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:79
 #: View/Servers/ajax/update.ctp:11
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
 #: View/Templates/view.ctp:41
-#: View/Users/admin_view.ctp:32;37;104;114;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:27
 msgid "Yes"
 msgstr "Ja"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:21
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
@@ -2675,29 +3042,30 @@ msgstr "Ja"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:58;176
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:166
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/handleSelected.ctp:22
 #: View/Events/ajax/toggle_correlation.ctp:25
 #: View/Feeds/preview_event.ctp:61;66
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:89
 #: View/Servers/ajax/update.ctp:16
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
 #: View/Templates/view.ctp:42
-#: View/Users/admin_view.ctp:32;37;106;116;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
 msgid "No"
@@ -2706,7 +3074,6 @@ msgstr "Nej"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:5
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:5
 #: View/Attributes/ajax/attributeEditValueForm.ctp:6
 msgid "Accept change"
@@ -2715,7 +3082,6 @@ msgstr "Acceptér ændring"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:6
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
 msgid "Discard change"
@@ -2732,7 +3098,7 @@ msgstr "Undlad ændring af nuværende indstillinger"
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/view.ctp:143
+#: View/Events/view.ctp:145
 #: View/Feeds/add.ctp:167
 #: View/Feeds/edit.ctp:164
 #: View/Feeds/freetext_index.ctp:36
@@ -2754,6 +3120,50 @@ msgstr "Til Intrusion Detection System"
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr "Bevar feltet tomt for at bevare kommentarfeltet for de valgte attributter uændret."
 
+#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+msgid "Tags to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+msgid "Tags to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+msgid "Clusters to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+msgid "Clusters to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr "til"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr "fra"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
 #: View/Attributes/ajax/attributeRestorationForm.ctp:5
 msgid "Attribute Restoration"
 msgstr "Attributgendannelse"
@@ -2762,6 +3172,15 @@ msgstr "Attributgendannelse"
 msgid "Are you sure you want to undelete Attribute #%s?"
 msgstr "Sikker på, at du vil fortryde sletning af Attribut #%s?"
 
+#: View/Attributes/ajax/exportSearch.ctp:2
+msgid "Choose the format that you wish to download the search results in"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:10;23
+#: View/Events/ajax/exportChoice.ctp:17;18;27;28
+msgid "Export as %s"
+msgstr "Eksporter som %s"
+
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
 msgid "Remove Tag"
 msgstr "Fjern tag"
@@ -2782,16 +3201,6 @@ msgstr "Fjern"
 msgid "Toggle Correlation %s "
 msgstr "Omskift Korrelation %s "
 
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "on"
-msgstr "til"
-
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "off"
-msgstr "fra"
-
 #: View/Attributes/ajax/toggle_correlation.ctp:11
 msgid "Re-enable the correlation for this attribute."
 msgstr "Genaktiver korrelationen for denne attribut."
@@ -2804,13 +3213,21 @@ msgstr "Dette fjerner alle eksisterende korrelationer for denne attribut og forh
 msgid "Toggle correlation for attribute"
 msgstr "Skift korrelation for attributten"
 
-#: View/Elements/ajaxAttributeTags.ctp:25
+#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Elements/ajaxTagCollectionTags.ctp:16
 #: View/Elements/ajaxTags.ctp:14
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr "Fjern tag"
 
+#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Pages/doc/using_the_system.ctp:303
+#: View/Templates/add.ctp:17
+#: View/Templates/edit.ctp:17
+msgid "Add tag"
+msgstr "Tilføj tag"
+
 #: View/Elements/ajaxTags.ctp:17
 msgid "Remove tag %s"
 msgstr "Fjern tag %s"
@@ -2821,209 +3238,27 @@ msgstr "Fjern tag %s"
 msgid "Add a tag"
 msgstr "Tilføj et tag"
 
-#: View/Elements/eventattribute.ctp:71;269
+#: View/Elements/eventattribute.ctp:71;240
 #: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
 #: View/Elements/Servers/eventattribute.ctp:28;31;94;97
 msgid "view all"
 msgstr "se alle"
 
-#: View/Elements/eventattribute.ctp:117
-#: View/Pages/doc/using_the_system.ctp:86
-msgid "Add attribute"
-msgstr "Tilføj attribut"
-
-#: View/Elements/eventattribute.ctp:118
-msgid "Edit selected Attributes"
-msgstr "Redigér valgte attributter"
-
-#: View/Elements/eventattribute.ctp:119
-msgid "Tag selected Attributes"
-msgstr "Tag valgte attributter"
-
-#: View/Elements/eventattribute.ctp:120
-msgid "Delete selected Attributes"
-msgstr "Slet valgte attributter"
-
-#: View/Elements/eventattribute.ctp:121
-msgid "Accept selected Proposals"
-msgstr "Acceptér valgte forslag"
-
-#: View/Elements/eventattribute.ctp:122
-msgid "Discard selected Proposals"
-msgstr "Kassér valgte forslag"
-
-#: View/Elements/eventattribute.ctp:123
-msgid "Sightings display for selected attributes"
-msgstr "Observationsvisning af valgte attributter"
-
-#: View/Elements/eventattribute.ctp:127
-msgid "Populate using a template"
-msgstr "Udfyld via skabelon"
-
-#: View/Elements/eventattribute.ctp:129
-msgid "Populate using the freetext import tool"
-msgstr "Udfyld via fritekstimportværktøjet"
-
-#: View/Elements/eventattribute.ctp:131
-msgid "Replace all attributes of a category/type combination within the event"
-msgstr "Erstat alle attributter for en kategori/type kombination i begivenheden"
-
-#: View/Elements/eventattribute.ctp:140;159
-msgid "Show all attributes"
-msgstr "Vis alle attributter"
-
-#: View/Elements/eventattribute.ctp:144
-msgid "Only show %s related attributes"
-msgstr "Vis kun %s-relaterede attributter"
-
-#: View/Elements/eventattribute.ctp:148
-msgid "Only show proposals"
-msgstr "Vis kun forslag"
-
-#: View/Elements/eventattribute.ctp:148
-#: View/Logs/event_index.ctp:44
-msgid "Proposal"
-msgstr "Forslag"
-
-#: View/Elements/eventattribute.ctp:149
-msgid "Only show correlating attributes"
-msgstr "Vis kun korrelerende attributter"
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Only show potentially false positive attributes"
-msgstr "Vis kun potentielt falske positive attributter"
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Warnings"
-msgstr "Advarsler"
-
-#: View/Elements/eventattribute.ctp:152
-msgid "Include deleted attributes"
-msgstr "Inkluder slettede attributter"
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show attribute context fields"
-msgstr "Vis attributkontekstfelter"
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show context fields"
-msgstr "Vis kontekstfelter"
-
-#: View/Elements/eventattribute.ctp:157
-msgid "Filter on attributes value"
-msgstr "Filterér på attributværdi"
-
-#: View/Elements/eventattribute.ctp:159
-#: View/Events/index.ctp:41
-#: View/Servers/preview_index.ctp:42
-#: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:37
-msgid "Remove filters"
-msgstr "Fjern filtre"
-
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all"
 msgstr "Vælg alle"
 
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 msgid "Select all attributes/proposals on current page"
 msgstr "Vælg alle attributter/forslag på den aktuelle side"
 
-#: View/Elements/eventattribute.ctp:188
-#: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/view.ctp:121
-#: View/Feeds/preview_event.ctp:16
-#: View/Noticelists/view.ctp:43
-#: View/Pages/doc/using_the_system.ctp:164;207;318
-#: View/Servers/preview_event.ctp:27
-#: View/Servers/preview_index.ctp:68
-#: View/Tags/index.ctp:10
-#: View/Templates/add.ctp:12
-#: View/Templates/edit.ctp:12
-#: View/Templates/view.ctp:19
-msgid "Tags"
-msgstr "Tags"
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
+msgstr ""
 
-#: View/Elements/eventattribute.ctp:189
-#: View/Elements/global_menu.ctp:56
-#: View/Events/view.ctp:387
-#: View/Galaxies/index.ctp:2
-msgid "Galaxies"
-msgstr "Galaxies"
-
-#: View/Elements/eventattribute.ctp:191
-msgid "Correlate"
-msgstr "Korrelere"
-
-#: View/Elements/eventattribute.ctp:192
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:263
-#: View/Feeds/preview_event.ctp:73
-#: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:95
-msgid "Related Events"
-msgstr "Relaterede begivenheder"
-
-#: View/Elements/eventattribute.ctp:193
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
-msgid "Feed hits"
-msgstr "Feedhits"
-
-#: View/Elements/eventattribute.ctp:196
-#: View/Events/view.ctp:198
-msgid "Sightings"
-msgstr "Observationer"
-
-#: View/Elements/eventattribute.ctp:197
-#: View/Events/view.ctp:205
-#: View/Tags/index.ctp:73
-msgid "Activity"
-msgstr "Aktivitet"
-
-#: View/Elements/eventattribute.ctp:198
-#: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/healthElements/files.ctp:33
-#: View/Elements/healthElements/workers.ctp:55
-#: View/Elements/templateElements/templateRowAttribute.ctp:94
-#: View/Elements/templateElements/templateRowFile.ctp:71
-#: View/Elements/templateElements/templateRowText.ctp:28
-#: View/EventBlacklists/index.ctp:27
-#: View/Events/export.ctp:31
-#: View/Events/resolved_attributes.ctp:53
-#: View/Feeds/index.ctp:61
-#: View/Feeds/preview_index.ctp:38
-#: View/GalaxyClusters/ajax/index.ctp:51
-#: View/Noticelists/index.ctp:37
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:55
-#: View/OrgBlacklists/index.ctp:26
-#: View/Organisations/index.ctp:81
-#: View/Pages/doc/using_the_system.ctp:187;238;286;382
-#: View/Regexp/admin_index.ctp:25
-#: View/Roles/admin_index.ctp:35
-#: View/Servers/index.ctp:36
-#: View/Servers/preview_index.ctp:80
-#: View/SharingGroups/add.ctp:34;54
-#: View/SharingGroups/edit.ctp:34;62
-#: View/SharingGroups/index.ctp:30
-#: View/Sightings/ajax/list_sightings.ctp:11
-#: View/Tags/index.ctp:76
-#: View/Taxonomies/index.ctp:27
-#: View/Templates/index.ctp:27
-#: View/Threads/index.ctp:28
-#: View/Warninglists/index.ctp:38
-#: View/Whitelists/admin_index.ctp:24
-msgid "Actions"
-msgstr "Handlinger"
-
-#: View/Elements/eventattribute.ctp:238
+#: View/Elements/eventattribute.ctp:209
 msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
 "a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
 "attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
@@ -3031,7 +3266,7 @@ msgstr "Attributadvarsel: Denne begivenhed har ingen attributter synlige for dig
 "specifikt distributionsprogram pr. attribut og ønskede stadig begivenheden distribueret alene enten som notifikation eller potentielt bidrag med attributter uden en sådan begrænsning. Eller ejeren\n"
 "glemte at tilføje attributter eller det relevante distributionsniveau. Mener du, at der er en fejl eller kan du bidrage med attributter baseret på begivenhedsmetainformationen, kan du fremsætte et forslag"
 
-#: View/Elements/eventattribute.ctp:242
+#: View/Elements/eventattribute.ctp:213
 msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
 msgstr "Attributadvarsel: Denne begivenhed indeholder ingen attributter. Det anbefales kraftigt at udvide en begivenhed med attributter (indikatorer, observerbare data eller informationer) for at give en meningsfyldt begivenhed"
 
@@ -3039,6 +3274,140 @@ msgstr "Attributadvarsel: Denne begivenhed indeholder ingen attributter. Det anb
 msgid "Create multiple attributes one per line"
 msgstr "Opret flere attributter, en pr. linje"
 
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr "Vis alle attributter"
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr "Alle"
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr "Vis kun %s-relaterede attributter"
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr "Vis kun forslag"
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr "Forslag"
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr "Vis kun korrelerende attributter"
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr "Korrelation"
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr "Vis kun potentielt falske positive attributter"
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr "Advarsel"
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr "Tilføj attribut"
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr "Redigér valgte attributter"
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr "Tag valgte attributter"
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr "Slet valgte attributter"
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr "Acceptér valgte forslag"
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr "Kassér valgte forslag"
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr "Observationsvisning af valgte attributter"
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr "Udfyld via skabelon"
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr "Udfyld via fritekstimportværktøjet"
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr "Erstat alle attributter for en kategori/type kombination i begivenheden"
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr "Inkluder slettede attributter"
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr "Vis attributkontekstfelter"
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr "Fjern filtre"
+
 #: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr "Dato: "
@@ -3048,14 +3417,14 @@ msgid "Deactivated user"
 msgstr "Deaktiveret bruger"
 
 #: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:223
-#: View/Elements/Events/View/row_attribute.ctp:299
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/View/row_attribute.ctp:380
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/Feeds/edit.ctp:193
 #: View/OrgBlacklists/edit.ctp:22
 #: View/Pages/doc/using_the_system.ctp:191
-#: View/Servers/index.ctp:98
-#: View/Tags/edit.ctp:35
+#: View/Servers/index.ctp:137
+#: View/Tags/edit.ctp:36
 #: View/Templates/edit.ctp:49
 msgid "Edit"
 msgstr "Redigér"
@@ -3083,12 +3452,12 @@ msgid "Insert a link to an event - just enter the event ID between the [event][/
 msgstr "Indsæt et link til en begivenhed - angiv blot begivenheds-ID'et mellem [event][/event] tagsne."
 
 #: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:180;191
+#: View/Events/view.ctp:196;207
 #: View/Objects/orphaned_object_diagnostics.ctp:21
 #: View/Pages/doc/administration.ctp:167
 #: View/Pages/doc/using_the_system.ctp:200;279
 #: View/Posts/add.ctp:33
-#: View/ShadowAttributes/index.ctp:31
+#: View/ShadowAttributes/index.ctp:41
 msgid "Event"
 msgstr "Begivenhed"
 
@@ -3123,9 +3492,19 @@ msgid "Code"
 msgstr "Kode"
 
 #: View/Elements/eventdiscussion.ctp:156
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr "Indsend"
 
+#: View/Elements/flashErrorMessage.ctp:2
+msgid "Errors"
+msgstr ""
+
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Jobs/ajax/error.ctp:34
+msgid "Close"
+msgstr "Luk"
+
 #: View/Elements/footer.ctp:5
 msgid "Keyboard shortcuts for this page"
 msgstr "Tastaturgenveje til denne side"
@@ -3137,8 +3516,8 @@ msgstr "ingen"
 #: View/Elements/footer.ctp:15
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:60
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
 msgid "GnuPG key"
 msgstr "GnuPG-nøgle"
 
@@ -3154,32 +3533,36 @@ msgstr "Kunne ikke finde SMIME-certifikat."
 msgid "View details about this galaxy"
 msgstr "Se detaljer omkring denne galaxy"
 
-#: View/Elements/galaxyQuickView.ctp:17
+#: View/Elements/galaxyQuickView.ctp:19
 #: View/Elements/galaxyQuickViewMini.ctp:69
 msgid "View details about this cluster"
 msgstr "Se detaljer om denne formation"
 
-#: View/Elements/galaxyQuickView.ctp:18
+#: View/Elements/galaxyQuickView.ctp:20
 #: View/Elements/galaxyQuickViewMini.ctp:70
 msgid "View all events containing this cluster."
 msgstr "Se alle begivenheder indeholdende denne formation."
 
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
 #: View/Elements/galaxyQuickView.ctp:24
 msgid "Are you sure you want to detach %s from this event?"
 msgstr "Sikker på, at du vil adskille %s fra denne begivenhed?"
 
-#: View/Elements/galaxyQuickViewMini.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:74
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr "Er du sikker på, at du vil fjerne %s fra denne %s?"
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 msgid "Add new cluster"
 msgstr "Tilføj nyt cluster"
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 #: View/EventBlacklists/add.ctp:35
 #: View/EventBlacklists/edit.ctp:29
-#: View/Events/add.ctp:72
+#: View/Events/add.ctp:68
 #: View/Events/filter_event_index.ctp:125
 #: View/Feeds/add.ctp:198
 #: View/Feeds/import_feeds.ctp:19
@@ -3189,113 +3572,139 @@ msgstr "Tilføj nyt cluster"
 #: View/Roles/admin_add.ctp:44
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 #: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:19
 #: View/Tags/add.ctp:35
 #: View/Users/admin_filter_user_index.ctp:62
 #: View/Whitelists/admin_add.ctp:13
 msgid "Add"
 msgstr "Tilføj"
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/side_menu.ctp:174;188
+#: View/Elements/generic_picker.ctp:205
+msgid "Due to the large number of options, no contextual information is provided."
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:273
+msgid "Nothing to pick"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:11
+#: View/Pages/doc/general.ctp:20
+msgid "Event Actions"
+msgstr "Event handlinger"
+
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr "Oplist begivenheder"
 
-#: View/Elements/global_menu.ctp:26
-#: View/Elements/side_menu.ctp:179;194
-#: View/Events/add.ctp:8
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
+#: View/Events/add.ctp:4
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
 msgstr "Tilføj Event"
 
-#: View/Elements/global_menu.ctp:28
-#: View/Elements/side_menu.ctp:213
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr "Oplist attributter"
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/side_menu.ctp:218
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr "Søg efter attributter"
 
-#: View/Elements/global_menu.ctp:30
-#: View/Elements/side_menu.ctp:206
-#: View/Servers/rest.ctp:4
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
+#: View/Servers/rest.ctp:20
 msgid "REST client"
 msgstr "REST-klient"
 
-#: View/Elements/global_menu.ctp:32
-#: View/Elements/side_menu.ctp:238
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "Vis forslag"
 
-#: View/Elements/global_menu.ctp:35
-#: View/Elements/side_menu.ctp:446
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
+#: View/Pages/doc/general.ctp:39
+msgid "Events with proposals"
+msgstr "Begivenheder med forslag"
+
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "Liste over Tags"
 
-#: View/Elements/global_menu.ctp:37
-#: View/Elements/side_menu.ctp:450
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
+msgid "List Tag Collections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 #: View/Tags/edit.ctp:4
 msgid "Add Tag"
 msgstr "Tilføj Tag"
 
-#: View/Elements/global_menu.ctp:39
-#: View/Elements/side_menu.ctp:471
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 msgid "List Taxonomies"
 msgstr "Opliste taksonomier"
 
-#: View/Elements/global_menu.ctp:41
-#: View/Elements/side_menu.ctp:485
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "Liste over Skabeloner"
 
-#: View/Elements/global_menu.ctp:43
-#: View/Elements/side_menu.ctp:487
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "Tilføj Skabelon"
 
-#: View/Elements/global_menu.ctp:46
-#: View/Elements/side_menu.ctp:247
+#: View/Elements/global_menu.ctp:78
 #: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
 msgstr "Eksporter"
 
-#: View/Elements/global_menu.ctp:48
-#: View/Elements/side_menu.ctp:253
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
+#: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
 #: View/Pages/doc/using_the_system.ctp:15;361
 msgid "Automation"
 msgstr "Automatisering"
 
-#: View/Elements/global_menu.ctp:60
-#: View/Elements/side_menu.ctp:529
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 msgid "List Galaxies"
 msgstr "Liste over Galaxies"
 
-#: View/Elements/global_menu.ctp:67
+#: View/Elements/global_menu.ctp:101
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr "Inputfiltre"
 
-#: View/Elements/global_menu.ctp:72;76
+#: View/Elements/global_menu.ctp:104;109
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -3304,7 +3713,7 @@ msgstr "Inputfiltre"
 msgid "Import Regexp"
 msgstr "Importer Regexp"
 
-#: View/Elements/global_menu.ctp:73;77
+#: View/Elements/global_menu.ctp:114;119
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -3313,82 +3722,88 @@ msgstr "Importer Regexp"
 msgid "Signature Whitelist"
 msgstr "Signatur Whitelist"
 
-#: View/Elements/global_menu.ctp:79
-#: View/Elements/side_menu.ctp:274
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 msgid "List Warninglists"
 msgstr "Vis advarselslister"
 
-#: View/Elements/global_menu.ctp:80
-#: View/Elements/side_menu.ctp:283
+#: View/Elements/global_menu.ctp:128
 msgid "List Noticelists"
 msgstr "Vis varslingslister"
 
-#: View/Elements/global_menu.ctp:90
+#: View/Elements/global_menu.ctp:135
+#: View/Pages/doc/general.ctp:22;54
+msgid "Global Actions"
+msgstr "Globale Handlinger"
+
+#: View/Elements/global_menu.ctp:139
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
 msgstr "Nyheder"
 
-#: View/Elements/global_menu.ctp:91
-#: View/Elements/side_menu.ctp:311
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "Min profil"
 
-#: View/Elements/global_menu.ctp:92;203
-#: View/Elements/side_menu.ctp:312
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "Kontrolpanel"
 
-#: View/Elements/global_menu.ctp:96
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
-#: View/Users/statistics_data.ctp:32
+#: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr "Organisationer"
 
-#: View/Elements/global_menu.ctp:100
-#: View/Elements/side_menu.ctp:325
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "Rollerettigheder"
 
-#: View/Elements/global_menu.ctp:102
-#: View/Elements/side_menu.ctp:552
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "List Object Templates"
 msgstr "Oplist objektskabeloner"
 
-#: View/Elements/global_menu.ctp:104
-#: View/Elements/side_menu.ctp:331
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Sharing Groups"
 msgstr "Oplist delingsgrupper"
 
-#: View/Elements/global_menu.ctp:106
-#: View/Elements/side_menu.ctp:332
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
 msgid "Add Sharing Group"
 msgstr "Tilføj delingsgruppe"
 
-#: View/Elements/global_menu.ctp:109
-#: View/Elements/side_menu.ctp:334
-#: View/Events/automation.ctp:42
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
+#: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
 msgstr "Brugerguide"
 
-#: View/Elements/global_menu.ctp:110
-#: View/Elements/side_menu.ctp:335
-#: View/Pages/doc/general.ctp:61
-#: View/Pages/doc/user_management.ctp:54
-msgid "Terms &amp; Conditions"
-msgstr "Vilkår og Betingelser"
+#: View/Elements/global_menu.ctp:186
+msgid "Categories & Types"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:111
-#: View/Elements/side_menu.ctp:336
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -3401,30 +3816,34 @@ msgstr "Vilkår og Betingelser"
 msgid "Statistics"
 msgstr "Statistik"
 
-#: View/Elements/global_menu.ctp:113
+#: View/Elements/global_menu.ctp:201
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr "Oplist diskussioner"
 
-#: View/Elements/global_menu.ctp:114
+#: View/Elements/global_menu.ctp:205
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr "Start diskussion"
 
-#: View/Elements/global_menu.ctp:125
-#: View/Elements/side_menu.ctp:354
+#: View/Elements/global_menu.ctp:212
+#: View/Pages/doc/general.ctp:23;66
+msgid "Sync Actions"
+msgstr "Sync handlinger"
+
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "Oplist servere"
 
-#: View/Elements/global_menu.ctp:127
-#: View/Elements/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
 msgid "List Feeds"
 msgstr "Oplist feeds"
 
-#: View/Elements/global_menu.ctp:136
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/administration.ctp:8
-#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
 #: View/Pages/doc/quickstart.ctp:8
@@ -3433,95 +3852,100 @@ msgstr "Oplist feeds"
 msgid "Administration"
 msgstr "Administration"
 
-#: View/Elements/global_menu.ctp:140
-#: View/Elements/side_menu.ctp:376
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "Oplist brugere"
 
-#: View/Elements/global_menu.ctp:141
-#: View/Elements/side_menu.ctp:375
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
 msgid "Add User"
 msgstr "Tilføj bruger"
 
-#: View/Elements/global_menu.ctp:142
-#: View/Elements/side_menu.ctp:379
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr "Kontakt brugere"
 
-#: View/Elements/global_menu.ctp:144
-#: View/Elements/side_menu.ctp:316;391
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
 msgid "List Organisations"
 msgstr "Oplist organisationer"
 
-#: View/Elements/global_menu.ctp:146
-#: View/Elements/side_menu.ctp:383
-msgid "Add Organisation"
-msgstr "Tilføj organisation"
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:149
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr "Oplist roller"
 
-#: View/Elements/global_menu.ctp:151
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
-msgstr "Tilføj rolle"
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-msgid "Maintenance"
-msgstr "Vedligeholdelse"
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
+msgstr "Serverindstillinger og Vedligehold"
 
-#: View/Elements/global_menu.ctp:158
-#: View/Elements/side_menu.ctp:401
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "Opgaver"
 
-#: View/Elements/global_menu.ctp:160
-#: View/Elements/side_menu.ctp:403
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
 msgstr "Planlagte opgaver"
 
-#: View/Elements/global_menu.ctp:165
-#: View/Elements/side_menu.ctp:407
+#: View/Elements/global_menu.ctp:300
+msgid "Blacklist Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
 msgid "Manage Event Blacklists"
 msgstr "Håndtér begivenhedssortlister"
 
-#: View/Elements/global_menu.ctp:169
+#: View/Elements/global_menu.ctp:314
 msgid "Blacklist Organisation"
 msgstr "Sortlist organisation"
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/side_menu.ctp:411
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
 msgid "Manage Org Blacklists"
 msgstr "Håndtér org. sortlistser"
 
-#: View/Elements/global_menu.ctp:180
+#: View/Elements/global_menu.ctp:327
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr "Revision"
 
-#: View/Elements/global_menu.ctp:184
-#: View/Elements/side_menu.ctp:417
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "Oplist logger"
 
-#: View/Elements/global_menu.ctp:185
-#: View/Elements/side_menu.ctp:418
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "Søg i logs"
 
-#: View/Elements/global_menu.ctp:207;209
+#: View/Elements/global_menu.ctp:362;367
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr "Log ud"
@@ -3542,407 +3966,8 @@ msgstr "Omskift histogram"
 msgid "Attributes per organization"
 msgstr "Attributter pr. organisation"
 
-#: View/Elements/side_menu.ctp:17;78
-msgid "Populate From Template"
-msgstr "Udfyld via skabelon"
-
-#: View/Elements/side_menu.ctp:24
-msgid "Freetext Import Result"
-msgstr "Fritekst importresultat"
-
-#: View/Elements/side_menu.ctp:31
-msgid "View Event"
-msgstr "Vis begivenhed"
-
-#: View/Elements/side_menu.ctp:36;465;540
-msgid "View Correlation Graph"
-msgstr "Vis korrelationsgraf"
-
-#: View/Elements/side_menu.ctp:41
-msgid "View Event History"
-msgstr "Vis begivenhedshistorik"
-
-#: View/Elements/side_menu.ctp:48
-#: View/Events/edit.ctp:8
-msgid "Edit Event"
-msgstr "Redigér begivenhed"
-
-#: View/Elements/side_menu.ctp:50
-msgid "Delete Event"
-msgstr "Slet begivenhed"
-
-#: View/Elements/side_menu.ctp:50;267;298;351;371
-#: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Servers/index.ctp:99
-msgid "Are you sure you want to delete # %s?"
-msgstr "Sikker på, at du vil slette # %s?"
-
-#: View/Elements/side_menu.ctp:61
-msgid "Add Object"
-msgstr "Tilføj objekt"
-
-#: View/Elements/side_menu.ctp:66
-msgid "Add Attachment"
-msgstr "Tilføj vedhæftning"
-
-#: View/Elements/side_menu.ctp:73
-msgid "Populate from..."
-msgstr "Udfyld via..."
-
-#: View/Elements/side_menu.ctp:86
-#: View/Events/ajax/enrich_event.ctp:2
-msgid "Enrich Event"
-msgstr "Berig begivenhed"
-
-#: View/Elements/side_menu.ctp:91
-msgid "Merge attributes from..."
-msgstr "Flet attributter fra..."
-
-#: View/Elements/side_menu.ctp:98
-msgid "Propose Attribute"
-msgstr "Foreslå attribut"
-
-#: View/Elements/side_menu.ctp:103
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr "Foreslå vedhæftning"
-
-#: View/Elements/side_menu.ctp:115
-#: View/Elements/Events/eventIndexTable.ctp:218
-msgid "Publish Event"
-msgstr "Udgiv begivenhed"
-
-#: View/Elements/side_menu.ctp:123
-msgid "Publish (no email)"
-msgstr "Udgiv (ingen e-mail)"
-
-#: View/Elements/side_menu.ctp:132
-msgid "Delegate Publishing"
-msgstr "Uddelegér udgivelse"
-
-#: View/Elements/side_menu.ctp:143
-#: View/EventDelegations/ajax/accept_delegation.ctp:2
-msgid "Accept Delegation Request"
-msgstr "Acceptér delegationsanmodning"
-
-#: View/Elements/side_menu.ctp:151
-msgid "Discard Delegation Request"
-msgstr "Kassér delegeringsanmodning"
-
-#: View/Elements/side_menu.ctp:157
-msgid "Publish event to ZMQ"
-msgstr "Udgiv begivenhed til ZMQ"
-
-#: View/Elements/side_menu.ctp:162
-msgid "Contact Reporter"
-msgstr "Kontakt rapportør"
-
-#: View/Elements/side_menu.ctp:169
-msgid "Download as..."
-msgstr "Download som..."
-
-#: View/Elements/side_menu.ctp:201
-msgid "Import from…"
-msgstr "Importér fra…"
-
-#: View/Elements/side_menu.ctp:224
-msgid "Download results as JSON"
-msgstr "Download resultater som JSON"
-
-#: View/Elements/side_menu.ctp:228
-msgid "Download results as XML"
-msgstr "Download resultater som XML"
-
-#: View/Elements/side_menu.ctp:232
-msgid "Download results as CSV"
-msgstr "Download resultater som CSV"
-
-#: View/Elements/side_menu.ctp:242
-#: View/Pages/doc/general.ctp:39
-msgid "Events with proposals"
-msgstr "Begivenheder med forslag"
-
-#: View/Elements/side_menu.ctp:259
-msgid "List Regexp"
-msgstr "Oplist regexp"
-
-#: View/Elements/side_menu.ctp:261
-msgid "New Regexp"
-msgstr "Nyt regexp"
-
-#: View/Elements/side_menu.ctp:262
-msgid "Perform on existing"
-msgstr "Udfør på eksisterende"
-
-#: View/Elements/side_menu.ctp:266
-msgid "Edit Regexp"
-msgstr "Redigér regexp"
-
-#: View/Elements/side_menu.ctp:267
-msgid "Delete Regexp"
-msgstr "Slet regexp"
-
-#: View/Elements/side_menu.ctp:273
-msgid "View Warninglist"
-msgstr "Vis advarselsliste"
-
-#: View/Elements/side_menu.ctp:276
-msgid "Update Warninglists"
-msgstr "Opdatér advarselsliste"
-
-#: View/Elements/side_menu.ctp:282
-msgid "View Noticelist"
-msgstr "Vis notitsliste"
-
-#: View/Elements/side_menu.ctp:285
-msgid "Update Noticelists"
-msgstr "Opdatér notitslister"
-
-#: View/Elements/side_menu.ctp:291
-msgid "List Whitelist"
-msgstr "Oplist hvidliste"
-
-#: View/Elements/side_menu.ctp:293
-msgid "New Whitelist"
-msgstr "Ny hvidliste"
-
-#: View/Elements/side_menu.ctp:297
-msgid "Edit Whitelist"
-msgstr "Redigér hvidliste"
-
-#: View/Elements/side_menu.ctp:298
-msgid "Delete Whitelist"
-msgstr "Slet Whitelist"
-
-#: View/Elements/side_menu.ctp:305
-#: View/Users/edit.ctp:4
-msgid "Edit My Profile"
-msgstr "Redigér min profil"
-
-#: View/Elements/side_menu.ctp:306
-#: View/Pages/doc/administration.ctp:126
-#: View/Users/admin_edit.ctp:70
-#: View/Users/change_pw.ctp:4
-msgid "Change Password"
-msgstr "Skift adgangskode"
-
-#: View/Elements/side_menu.ctp:321;389
-msgid "View Organisation"
-msgstr "Se Organisation"
-
-#: View/Elements/side_menu.ctp:328
-#: View/SharingGroups/edit.ctp:3
-msgid "Edit Sharing Group"
-msgstr "Redigér delingsgruppe"
-
-#: View/Elements/side_menu.ctp:329
-msgid "View Sharing Group"
-msgstr "Vis delingsgrupper"
-
-#: View/Elements/side_menu.ctp:342
-msgid "Explore Remote Event"
-msgstr "Udforsk fjernbegivenhed"
-
-#: View/Elements/side_menu.ctp:343
-msgid "Fetch This Event"
-msgstr "Hent denne begivenhed"
-
-#: View/Elements/side_menu.ctp:343
-#: View/Feeds/preview_index.ctp:65
-#: View/Servers/preview_index.ctp:147
-msgid "Are you sure you want to fetch and save this event on your instance?"
-msgstr "Sikker på, at du vil hente og gemme denne begivenhed i din instans?"
-
-#: View/Elements/side_menu.ctp:344;347
-msgid "Explore Remote Server"
-msgstr "Udforsk fjernserver"
-
-#: View/Elements/side_menu.ctp:350
-#: View/Servers/edit.ctp:4
-msgid "Edit Server"
-msgstr "Redigér server"
-
-#: View/Elements/side_menu.ctp:356
-msgid "New Server"
-msgstr "Ny server"
-
-#: View/Elements/side_menu.ctp:363
-msgid "View User"
-msgstr "Se bruger"
-
-#: View/Elements/side_menu.ctp:364
-msgid "Reset Password"
-msgstr "Nulstil adgangskode"
-
-#: View/Elements/side_menu.ctp:365
-msgid "Edit User"
-msgstr "Redigér bruger"
-
-#: View/Elements/side_menu.ctp:366
-msgid "Delete User"
-msgstr "Slet bruger"
-
-#: View/Elements/side_menu.ctp:366
-#: View/Elements/Users/userIndexTable.ctp:91
-msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
-msgstr "Sikker på, at du vil slette # %s? Det anbefales kraftigt aldrig at slette brugere, men at deaktivere dem i stedet."
-
-#: View/Elements/side_menu.ctp:370
-#: View/Roles/admin_edit.ctp:4
-msgid "Edit Role"
-msgstr "Redigér rolle"
-
-#: View/Elements/side_menu.ctp:371
-msgid "Delete Role"
-msgstr "Slet rolle"
-
-#: View/Elements/side_menu.ctp:385
-#: View/Organisations/admin_edit.ctp:4
-msgid "Edit Organisation"
-msgstr "Redigér organisation"
-
-#: View/Elements/side_menu.ctp:386
-#: View/Organisations/ajax/merge.ctp:5
-msgid "Merge Organisation"
-msgstr "Flet organisation"
-
-#: View/Elements/side_menu.ctp:398
-#: View/Servers/server_settings.ctp:5
-msgid "Server Settings & Maintenance"
-msgstr "Serverindstillinger og Vedligehold"
-
-#: View/Elements/side_menu.ctp:406
-msgid "Blacklists Event"
-msgstr "Sortlistebegivenheder"
-
-#: View/Elements/side_menu.ctp:410
-msgid "Blacklists Organisation"
-msgstr "Sortlisteorganisationer"
-
-#: View/Elements/side_menu.ctp:426;433
-msgid "View Thread"
-msgstr "Vis tråd"
-
-#: View/Elements/side_menu.ctp:427
-#: View/Posts/add.ctp:4
-msgid "Add Post"
-msgstr "Tilføj indlæg"
-
-#: View/Elements/side_menu.ctp:434
-#: View/Posts/edit.ctp:4
-msgid "Edit Post"
-msgstr "Redigér indlæg"
-
-#: View/Elements/side_menu.ctp:439
-msgid "List Threads"
-msgstr "Oplist tråde"
-
-#: View/Elements/side_menu.ctp:440
-msgid "New Thread"
-msgstr "Ny tråd"
-
-#: View/Elements/side_menu.ctp:445
-msgid "List Favourite Tags"
-msgstr "Oplist favorit-tags"
-
-#: View/Elements/side_menu.ctp:455
-msgid "Edit Tag"
-msgstr "Redigér tag"
-
-#: View/Elements/side_menu.ctp:461;473
-msgid "View Taxonomy"
-msgstr "Vis taksonomi"
-
-#: View/Elements/side_menu.ctp:474
-msgid "Delete Taxonomy"
-msgstr "Slet taksonomi"
-
-#: View/Elements/side_menu.ctp:492
-msgid "View Template"
-msgstr "Vis skabelon"
-
-#: View/Elements/side_menu.ctp:494
-#: View/Templates/edit.ctp:6
-msgid "Edit Template"
-msgstr "Redigér skabelon"
-
-#: View/Elements/side_menu.ctp:502
-msgid "Add Feed"
-msgstr "Tilføj feed"
-
-#: View/Elements/side_menu.ctp:503
-msgid "Import Feeds from JSON"
-msgstr "Importér feeds fra JSON"
-
-#: View/Elements/side_menu.ctp:504
-#: View/Feeds/compare_feeds.ctp:7
-msgid "Feed overlap analysis matrix"
-msgstr "Feedoverlapningsanalysematrix"
-
-#: View/Elements/side_menu.ctp:505
-msgid "Export Feed settings"
-msgstr "Eksportér feedindstillinger"
-
-#: View/Elements/side_menu.ctp:507
-msgid "Edit Feed"
-msgstr "Redigér feed"
-
-#: View/Elements/side_menu.ctp:509
-msgid "PreviewIndex"
-msgstr "PreviewIndex"
-
-#: View/Elements/side_menu.ctp:511
-msgid "PreviewEvent"
-msgstr "PreviewEvent"
-
-#: View/Elements/side_menu.ctp:516
-msgid "View News"
-msgstr "Se Nyheder"
-
-#: View/Elements/side_menu.ctp:520
-#: View/News/add.ctp:6
-msgid "Add News Item"
-msgstr "Tilføj nyhedselement"
-
-#: View/Elements/side_menu.ctp:522
-#: View/News/edit.ctp:6
-msgid "Edit News Item"
-msgstr "Redigér nyhedselement"
-
-#: View/Elements/side_menu.ctp:533
-msgid "Update Galaxies"
-msgstr "Opdater Galaxies"
-
-#: View/Elements/side_menu.ctp:533
-msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr "Sikker på, at du vil genimportere alle galakser fra undermodulet?"
-
-#: View/Elements/side_menu.ctp:534
-msgid "Force Update Galaxies"
-msgstr "Gennemtving galakseopdateringer"
-
-#: View/Elements/side_menu.ctp:534
-msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr "Sikker på, at du vil genimportere alle galakser fra undermodulet?"
-
-#: View/Elements/side_menu.ctp:538;546
-msgid "View Galaxy"
-msgstr "Vis galakse"
-
-#: View/Elements/side_menu.ctp:539
-msgid "View Cluster"
-msgstr "Vis formation"
-
-#: View/Elements/side_menu.ctp:556
-msgid "Update Objects"
-msgstr "Opdater Objekter"
-
-#: View/Elements/side_menu.ctp:561
-msgid "View Object Template"
-msgstr "Vis objektskabelon"
-
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:84
+#: View/Layouts/default.ctp:87
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr "Indlæser"
@@ -3977,8 +4002,11 @@ msgid "Display"
 msgstr "Vis"
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Jobs/index.ctp:62
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
 #: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr "Filtre"
 
@@ -3991,12 +4019,12 @@ msgstr "Historie"
 msgid "Toggle fullscreen"
 msgstr "Skift til fuldskærm"
 
-#: View/Elements/view_mitre_attack_matrix.ctp:27
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
 msgstr "Vis alle"
 
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all events on current page"
 msgstr "Vælg alle events på denne side"
 
@@ -4036,35 +4064,58 @@ msgstr "Post antal"
 msgid "#Posts"
 msgstr "#Opslag"
 
-#: View/Elements/Events/eventIndexTable.ctp:167
-msgid " correlation(s)"
-msgstr " korrelation(er)"
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/dashboard/dashboard_events.ctp:4;5
+#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
+#: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/preview_index.ctp:174
+#: View/Taxonomies/index.ctp:47
+#: View/Warninglists/index.ctp:60
+msgid "View"
+msgstr "Se"
 
-#: View/Elements/Events/eventIndexTable.ctp:177;182
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
 msgid " proposal(s)"
 msgstr " forslag"
 
-#: View/Elements/Events/eventIndexTable.ctp:187
+#: View/Elements/Events/eventIndexTable.ctp:190
 msgid "NEW"
 msgstr "NY"
 
-#: View/Elements/Events/eventIndexTable.ctp:207
-#: View/Jobs/index.ctp:15;63
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-msgid "All"
-msgstr "Alle"
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
+msgstr "Udgiv begivenhed"
 
-#: View/Elements/Events/eventIndexTable.ctp:218
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:12
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
 msgid "Are you sure this event is complete and everyone should be informed?"
 msgstr "Er du sikker på at du er færdig med denne event, og alle skal informeres?"
 
-#: View/Elements/Events/eventIndexTable.ctp:219
+#: View/Elements/Events/eventIndexTable.ctp:222
 msgid "Not published"
 msgstr "Ikke offentliggjort"
 
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr "Sikker på, at du vil slette # %s?"
+
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid "Show "
 msgstr "Vis "
@@ -4074,51 +4125,66 @@ msgid " more..."
 msgstr " mere..."
 
 #: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:295
+#: View/Events/view.ctp:346
 msgid "Collapse…"
 msgstr "Minimer…"
 
-#: View/Elements/Events/View/row_attribute.ctp:262
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr "- Begræns kun til egen organisation."
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr "Avancerede observationer"
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:343
 msgid "Restore attribute"
 msgstr "Gendan attribut"
 
-#: View/Elements/Events/View/row_attribute.ctp:263;303
+#: View/Elements/Events/View/row_attribute.ctp:344;384
 msgid "Permanently delete attribute"
 msgstr "Slet attribut permanent"
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Query enrichment"
 msgstr "Berigelse af forespørgsel"
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Propose enrichment"
 msgstr "Foreslå berigelse"
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Query Cortex"
 msgstr "Forespørg Cortex"
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Propose enrichment through Cortex"
 msgstr "Anbefal berigelse igennem Cortex"
 
-#: View/Elements/Events/View/row_attribute.ctp:279
+#: View/Elements/Events/View/row_attribute.ctp:360
 msgid "Propose Edit"
 msgstr "Foreslå ændring"
 
-#: View/Elements/Events/View/row_attribute.ctp:280
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Propose Deletion"
 msgstr "Foreslå sletning"
 
-#: View/Elements/Events/View/row_attribute.ctp:290;295
+#: View/Elements/Events/View/row_attribute.ctp:371;376
 msgid "Add enrichment"
 msgstr "Tilføj berigelse"
 
-#: View/Elements/Events/View/row_attribute.ctp:295
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Add enrichment via Cortex"
 msgstr "Tilføj berigelse via Cortex"
 
-#: View/Elements/Events/View/row_attribute.ctp:307
+#: View/Elements/Events/View/row_attribute.ctp:388
 msgid "Soft-delete attribute"
 msgstr "Soft-delete attribut"
 
@@ -4140,24 +4206,36 @@ msgid "Expand or Collapse"
 msgstr "Udvid eller Collapse"
 
 #: View/Elements/Events/View/row_object.ctp:69
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
+msgstr "UUID"
+
+#: View/Elements/Events/View/row_object.ctp:70
 msgid "Meta-category: "
 msgstr "Meta-kategori: "
 
-#: View/Elements/Events/View/row_object.ctp:70
+#: View/Elements/Events/View/row_object.ctp:71
 #: View/Elements/Feeds/View/row_object.ctp:21
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Events/View/row_object.ctp:72
 #: View/Elements/Feeds/View/row_object.ctp:22
 msgid "Template: "
 msgstr "Skabelon: "
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Permanently delete object"
 msgstr "Slet objekt permanent"
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Soft delete object"
 msgstr "Soft delete objekt"
 
@@ -4198,6 +4276,7 @@ msgstr "Kasser forslag"
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
 #: View/Sightings/ajax/advanced.ctp:10
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 msgid "Add sighting"
 msgstr "Tilføj sighting"
 
@@ -4206,7 +4285,6 @@ msgid "Mark as false-positive"
 msgstr "Marker som falsk-positiv"
 
 #: View/Elements/Events/View/sighting_field.ctp:14
-#: View/Events/view.ctp:203
 msgid "Advanced sightings"
 msgstr "Avancerede observationer"
 
@@ -4234,7 +4312,7 @@ msgstr " værdi"
 
 #: View/Elements/Feeds/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object.ctp:20
-#: View/ObjectTemplates/view.ctp:19
+#: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:23
 msgid "Meta-category"
 msgstr "Meta-kategori"
@@ -4249,7 +4327,7 @@ msgid "all"
 msgstr "alle"
 
 #: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/view.ctp:126
+#: View/Events/view.ctp:131
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
 #: View/Servers/preview_event.ctp:36
 #: View/Sightings/ajax/list_sightings.ctp:5
@@ -4275,12 +4353,13 @@ msgstr "Status"
 #: View/Elements/Servers/View/row_attribute.ctp:93
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/healthElements/files.ctp:61
-#: View/Elements/healthElements/workers.ctp:61;62;63
-#: View/Events/automation.ctp:403;410;417;438;445
+#: View/Elements/healthElements/workers.ctp:66;67;68
+#: View/Events/automation.ctp:234;241;248;269;276
 #: View/Events/export.ctp:68;88
-#: View/Taxonomies/view.ctp:96;107;152
-#: View/Users/admin_view.ctp:83;92;122
-#: View/Users/view.ctp:62
+#: View/Events/legacy_automation.ctp:403;410;417;438;445
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
 msgid "N/A"
 msgstr "N/A"
 
@@ -4289,23 +4368,24 @@ msgstr "N/A"
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
 #: View/Galaxies/view.ctp:14
-#: View/ObjectTemplates/view.ctp:11
+#: View/ObjectTemplates/view.ctp:4
 #: View/Objects/revise_object.ctp:19
 #: View/Organisations/ajax/merge.ctp:57;64
 #: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/view.ctp:9
-#: View/SharingGroups/add.ctp:11;31;51
-#: View/SharingGroups/edit.ctp:11;31;59
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
 #: View/SharingGroups/view.ctp:42;67
 #: View/Templates/view.ctp:9
 #: View/Users/statistics_orgs.ctp:31
-#: View/Warninglists/view.ctp:9
+#: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "Navn"
 
 #: View/Elements/Servers/View/row_object.ctp:21
 #: View/Elements/healthElements/files.ctp:8
-#: View/Elements/healthElements/settings_tab.ctp:16
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:10
 #: View/Elements/templateElements/populateTemplateDescription.ctp:12
 #: View/Elements/templateElements/populateTemplateFile.ctp:10
@@ -4313,19 +4393,19 @@ msgstr "Navn"
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:27
 #: View/Galaxies/view.ctp:20
-#: View/ObjectTemplates/view.ctp:21
+#: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:16;94
-#: View/Organisations/view.ctp:32;89;90
+#: View/Organisations/view.ctp:15;58;59
 #: View/Pages/doc/administration.ctp:48;241
-#: View/Pages/doc/categories_and_types.ctp:50;67
+#: View/Pages/doc/categories_and_types.ctp:44;61
 #: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
 #: View/Servers/preview_event.ctp:65
-#: View/SharingGroups/add.ctp:15
-#: View/SharingGroups/edit.ctp:15
-#: View/SharingGroups/index.ctp:28
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
 #: View/Taxonomies/view.ctp:14
 #: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:14
+#: View/Warninglists/view.ctp:11
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -4344,11 +4424,17 @@ msgstr "Referencer"
 msgid "Referenced by"
 msgstr "Refereret af"
 
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr "Er du sikker på, at du vil slette \"%s\"?"
+
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:2
+#: View/Roles/view.ctp:24
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_view.ctp:19
-#: View/Users/view.ctp:19
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
 msgstr "Rolle"
 
@@ -4359,7 +4445,7 @@ msgstr "Seneste login"
 #: View/Elements/Users/userIndexTable.ctp:17
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:54
+#: View/ShadowAttributes/index.ctp:64
 msgid "Created"
 msgstr "Tilføjet"
 
@@ -4371,6 +4457,11 @@ msgstr "Initier en opdatering af kodeord"
 msgid "Create new credentials and inform user"
 msgstr "Opret nyt login og informer brugeren"
 
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr "Sikker på, at du vil slette # %s? Det anbefales kraftigt aldrig at slette brugere, men at deaktivere dem i stedet."
+
 #: View/Elements/dashboard/dashboard_events.ctp:2
 msgid "Changes since last visit"
 msgstr "Ændringer siden sidste besøg"
@@ -4399,6 +4490,417 @@ msgstr "Events med forslag: "
 msgid "Delegation requests: "
 msgstr "Anmodninger om delegation: "
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr "Udfyld via skabelon"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr "Fritekst importresultat"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr "Vis begivenhed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr "Vis korrelationsgraf"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr "Vis begivenhedshistorik"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr "Redigér begivenhed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr "Slet begivenhed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr "Tilføj objekt"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr "Tilføj vedhæftning"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr "Udfyld via..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr "Berig begivenhed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr "Flet attributter fra..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr "Foreslå attribut"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr "Foreslå vedhæftning"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr "Udgiv (ingen e-mail)"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr "Uddelegér udgivelse"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr "Acceptér delegationsanmodning"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr "Kassér delegeringsanmodning"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr "Udgiv begivenhed til ZMQ"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr "Kontakt rapportør"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr "Download som..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr "Importér fra…"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr "Oplist regexp"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr "Nyt regexp"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr "Udfør på eksisterende"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr "Redigér regexp"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr "Slet regexp"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr "Vis advarselsliste"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr "Opdatér advarselsliste"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr "Vis notitsliste"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr "Opdatér notitslister"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr "Oplist hvidliste"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr "Ny hvidliste"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr "Redigér hvidliste"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr "Slet Whitelist"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr "Redigér min profil"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr "Skift adgangskode"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr "Nulstil adgangskode"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr "Se Organisation"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr "Redigér delingsgruppe"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr "Vis delingsgrupper"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr "Udforsk fjernserver"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr "Udforsk fjernbegivenhed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr "Hent denne begivenhed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr "Sikker på, at du vil hente og gemme denne begivenhed i din instans?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr "Redigér server"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr "Se bruger"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr "Redigér bruger"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr "Slet bruger"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr "Redigér rolle"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr "Slet rolle"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr "Tilføj organisation"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr "Redigér organisation"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr "Flet organisation"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr "Tilføj rolle"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr "Sortlistebegivenheder"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr "Sortlisteorganisationer"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr "Vis tråd"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr "Tilføj indlæg"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr "Redigér indlæg"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr "Oplist tråde"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr "Ny tråd"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr "Oplist favorit-tags"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr "Redigér tag"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr "Vis taksonomi"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr "Slet taksonomi"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr "Vis skabelon"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr "Redigér skabelon"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr "Tilføj feed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr "Importér feeds fra JSON"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr "Feedoverlapningsanalysematrix"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr "Eksportér feedindstillinger"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr "Redigér feed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr "PreviewIndex"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr "PreviewEvent"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr "Se Nyheder"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr "Tilføj nyhedselement"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr "Redigér nyhedselement"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr "Opdater Galaxies"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr "Sikker på, at du vil genimportere alle galakser fra undermodulet?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr "Gennemtving galakseopdateringer"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr "Sikker på, at du vil genimportere alle galakser fra undermodulet?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr "Vis galakse"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr "Vis formation"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr "Opdater Objekter"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr "Vis objektskabelon"
+
 #: View/Elements/healthElements/diagnostics.ctp:5
 msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
 msgstr "Forkert database encoding indstilling: Din database forbindelse er i øjeblikket IKKE sat til UTF-8. Sørg for at fjerne udkommenteringen af linjen 'encoding' => 'utf8' i "
@@ -4423,11 +4925,10 @@ msgstr "Kommende udvikler version"
 msgid "Outdated version"
 msgstr "Forældet version"
 
-#: View/Elements/healthElements/diagnostics.ctp:26;156;170;195
-#: View/Elements/healthElements/workers.ctp:18;71
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
+#: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
-#: View/Users/admin_view.ctp:81
 msgid "OK"
 msgstr "OK"
 
@@ -4447,131 +4948,135 @@ msgstr "Status…"
 msgid "Current branch…"
 msgstr "Nuværende branch…"
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Pull the latest MISP version from github"
 msgstr "Hent seneste MISP verison fra github"
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Update MISP"
 msgstr "Opdater MISP"
 
-#: View/Elements/healthElements/diagnostics.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "Writeable Directories and files"
 msgstr "Skrivbare mapper og filer"
 
-#: View/Elements/healthElements/diagnostics.ctp:67
+#: View/Elements/healthElements/diagnostics.ctp:65
 msgid "The following directories and files have to be writeable for MISP to function properly. Make sure that the apache user has write privileges for the directories below."
 msgstr "De følgende mapper og filer skal være skrivbare for at MISP fungerer korrekt. Sørg for, at apache brugeren har skriverettigheder til nedenstående mapper."
 
-#: View/Elements/healthElements/diagnostics.ctp:68
+#: View/Elements/healthElements/diagnostics.ctp:66
 msgid "Directories"
 msgstr "Mapper"
 
-#: View/Elements/healthElements/diagnostics.ctp:75
+#: View/Elements/healthElements/diagnostics.ctp:73
 msgid "Directory "
 msgstr "Mappe "
 
-#: View/Elements/healthElements/diagnostics.ctp:83
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Writeable Files"
 msgstr "Skrivbare filer"
 
-#: View/Elements/healthElements/diagnostics.ctp:90;104
+#: View/Elements/healthElements/diagnostics.ctp:88;102
 msgid "File "
 msgstr "Fil "
 
-#: View/Elements/healthElements/diagnostics.ctp:97
+#: View/Elements/healthElements/diagnostics.ctp:95
 msgid "Readable Files"
 msgstr "Læsbare filer"
 
-#: View/Elements/healthElements/diagnostics.ctp:112
+#: View/Elements/healthElements/diagnostics.ctp:110
 msgid "PHP Settings"
 msgstr "PHP indstillinger"
 
-#: View/Elements/healthElements/diagnostics.ctp:115;127
+#: View/Elements/healthElements/diagnostics.ctp:113;125
 msgid "Up to date"
 msgstr "Seneste version"
 
-#: View/Elements/healthElements/diagnostics.ctp:121
-#: View/Elements/healthElements/workers.ctp:78;80
-#: View/Organisations/view.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:119
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: View/Elements/healthElements/diagnostics.ctp:123
+#: View/Elements/healthElements/diagnostics.ctp:121
 msgid "Issues determining version"
 msgstr "Problemer med at bestemme version"
 
-#: View/Elements/healthElements/diagnostics.ctp:130;139
+#: View/Elements/healthElements/diagnostics.ctp:128;137
 msgid "Update highly recommended"
 msgstr "Opdatering kraftigt anbefalet"
 
-#: View/Elements/healthElements/diagnostics.ctp:133;142
+#: View/Elements/healthElements/diagnostics.ctp:131;140
 msgid "Version unsupported, update ASAP"
 msgstr "Version ikke supporteret, opdater hurtigst muligt"
 
-#: View/Elements/healthElements/diagnostics.ctp:146
+#: View/Elements/healthElements/diagnostics.ctp:144
 msgid "PHP ini path"
 msgstr "PHP ini sti"
 
-#: View/Elements/healthElements/diagnostics.ctp:147
+#: View/Elements/healthElements/diagnostics.ctp:145
 msgid "PHP Version"
 msgstr "PHP Version"
 
-#: View/Elements/healthElements/diagnostics.ctp:147;148
+#: View/Elements/healthElements/diagnostics.ctp:145;146
 msgid "recommended"
 msgstr "anbefalet"
 
-#: View/Elements/healthElements/diagnostics.ctp:148
+#: View/Elements/healthElements/diagnostics.ctp:146
 msgid "PHP CLI Version"
 msgstr "PHP CLI Version"
 
-#: View/Elements/healthElements/diagnostics.ctp:149
+#: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
 msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
 msgstr "De følgende indstillinger kan have en negativ indvirkning på visse funktionaliteter af MISP med deres nuværende og anbefalede minimums indstillinger. Du kan justere disse i din php.ini. Husk at anbefalingerne ikke er krav, men blot anbefalinger. Afhængigt af brugen kan der være behov for at overstige de anbefalede værdier."
 
-#: View/Elements/healthElements/diagnostics.ctp:156
+#: View/Elements/healthElements/diagnostics.ctp:155
 #: View/Events/filter_event_index.ctp:32;190
 #: View/Pages/doc/using_the_system.ctp:66;171
 msgid "Low"
 msgstr "Lav"
 
-#: View/Elements/healthElements/diagnostics.ctp:160
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP Extensions"
 msgstr "PHP udvidelser"
 
-#: View/Elements/healthElements/diagnostics.ctp:170
+#: View/Elements/healthElements/diagnostics.ctp:169
 msgid "Not loaded"
 msgstr "Ikke indlæst"
 
-#: View/Elements/healthElements/diagnostics.ctp:175
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr "Problemer med at læse PHP-indstillinger. Dette kan skyldes, at test værktøjet ikke kan læses."
 
-#: View/Elements/healthElements/diagnostics.ctp:183
+#: View/Elements/healthElements/diagnostics.ctp:182
 msgid "Advanced attachment handler"
 msgstr "Avanceret håndtering af vedhæftelser"
 
-#: View/Elements/healthElements/diagnostics.ctp:184
+#: View/Elements/healthElements/diagnostics.ctp:183
 msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
 msgstr "De avancerede vedhæftnings værktøjer anvendes af vedhæftnings-funktionaliteten for at udtrække yderligere data om den uploadede prøve."
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PyMISP"
 msgstr "PyMISP"
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "Not installed or version outdated."
 msgstr "Ikke installeret eller version for gammel."
 
-#: View/Elements/healthElements/diagnostics.ctp:201
+#: View/Elements/healthElements/diagnostics.ctp:200
 msgid "STIX and Cybox libraries"
 msgstr "STIX og Cybox biblioteker"
 
-#: View/Elements/healthElements/diagnostics.ctp:202
+#: View/Elements/healthElements/diagnostics.ctp:201
 msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
 msgstr "Mitre's STIX og CyBox python libs skal være installeret for at MISP's STIX eksport virker. Du skal sikre dig at du har installeret disse (som beskrevet i MISP installations vejledningen) hvis du får fejl i nedenstående."
 
-#: View/Elements/healthElements/diagnostics.ctp:203
+#: View/Elements/healthElements/diagnostics.ctp:202
 msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
 msgstr "Hvis du løber ind i problemer, skal du sikre dig, at både STIX og CyBox er installeret som beskrevet i filen INSTALL.txt. De krævede versioner er"
 
@@ -4808,72 +5313,35 @@ msgid "Permissions"
 msgstr "Rettigheder"
 
 #: View/Elements/healthElements/files.ctp:73
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
 #: View/Roles/admin_index.ctp:67
-#: View/SharingGroups/index.ctp:68
+#: View/SharingGroups/index.ctp:87
 msgid "Are you sure you want to delete %s?"
 msgstr "Er du sikker på at du vil slette %s?"
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
 msgstr "Kritisk, din MISP installation har brug for øjeblikkelig opmærksomhed."
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
 msgstr "Der er identificeret problemer, der anbefales løst."
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:5
 msgid "Good, but there are some optional settings that are incorrect / not set."
 msgstr "Godt, men der er nogle valgfri indstillinger der ikke er korrekte eller ikke udfyldt."
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:6
 msgid "In perfect health."
 msgstr "Perfekt helbredstilstand."
 
 #: View/Elements/healthElements/overview.ctp:15
-msgid "Overall health"
-msgstr "Generelt helbred"
+msgid "Test"
+msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:17
-msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr "Den generelle helbredstilstand i din MISP instans afhænger af at der ikke er alvorlige uløste problemer."
-
-#: View/Elements/healthElements/overview.ctp:26
-msgid " settings incorrectly or not set"
-msgstr " indstillingerne er forkerte eller ikke sat"
-
-#: View/Elements/healthElements/overview.ctp:27
-msgid " incorrect settings."
-msgstr " ukorrekte indstillinger."
-
-#: View/Elements/healthElements/overview.ctp:33
-msgid "Critical issues revealed by the diagnostics"
-msgstr "Kritiske problemer fundet af diagnosticering"
-
-#: View/Elements/healthElements/overview.ctp:34
-msgid " issues detected."
-msgstr " problemer identificeret."
-
-#: View/Elements/healthElements/overview.ctp:35
-msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
-msgstr "Fejl vist her kan skyldes forkerte rettigheder til en mappe, eller ikke korrekt installerede afhængigheder."
-
-#: View/Elements/healthElements/settings_tab.ctp:9
-msgid "Toggle subgroup"
-msgstr "Skifte undergruppe"
-
-#: View/Elements/healthElements/settings_tab.ctp:13
-#: View/Pages/doc/administration.ctp:45
-msgid "Priority"
-msgstr "Prioritet"
-
-#: View/Elements/healthElements/settings_tab.ctp:14
-#: View/Pages/doc/administration.ctp:46
-msgid "Setting"
-msgstr "Indstilling"
-
-#: View/Elements/healthElements/settings_tab.ctp:15
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
 #: View/Events/filter_event_index.ctp:134
 #: View/Events/resolved_attributes.ctp:45
 #: View/Events/show_i_o_c_results.ctp:13
@@ -4888,128 +5356,166 @@ msgstr "Indstilling"
 msgid "Value"
 msgstr "Værdi"
 
-#: View/Elements/healthElements/settings_tab.ctp:17
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr "Generelt helbred"
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr "Den generelle helbredstilstand i din MISP instans afhænger af at der ikke er alvorlige uløste problemer."
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr " indstillingerne er forkerte eller ikke sat"
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr "Kritiske problemer fundet af diagnosticering"
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr "Fejl vist her kan skyldes forkerte rettigheder til en mappe, eller ikke korrekt installerede afhængigheder."
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr "Prioritet"
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr "Indstilling"
+
+#: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
 msgstr "Fejlmeddelelse"
 
-#: View/Elements/healthElements/tabs.ctp:3;15;27;36
-#: View/Events/index.ctp:30;58
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
-#: View/Users/admin_index.ctp:28
-msgid "Modify filters"
-msgstr "Ændre filtre"
-
-#: View/Elements/healthElements/tabs.ctp:3
+#: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
 msgstr "Overblik"
 
-#: View/Elements/healthElements/tabs.ctp:28
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:34
 #: View/Pages/doc/administration.ctp:38
 msgid "Diagnostics"
 msgstr "Diagnosticering"
 
-#: View/Elements/healthElements/tabs.ctp:37
-#: View/Pages/doc/administration.ctp:39
-msgid "Workers"
-msgstr "Workers"
-
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
 msgstr "Administrer filer"
 
-#: View/Elements/healthElements/tabs.ctp:48
+#: View/Elements/healthElements/tabs.ctp:50;65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
 msgstr "Download rapport"
 
-#: View/Elements/healthElements/workers.ctp:5
-msgid "Warning"
-msgstr "Advarsel"
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
+msgstr "Workers"
 
 #: View/Elements/healthElements/workers.ctp:5
 msgid "MISP cannot access your /proc directory to check the status of the worker processes, which means that dead workers will not be detected by the diagnostic tool. If you would like to regain this functionality, make sure that the open_basedir directive is not set, or that /proc is included in it."
 msgstr "MISP kan ikke få adgang til /proc folderen for at kontrollere status for worker processerne, hvilket betyder, at workers der fejler ikke vil blive registreret af diagnosticerings værktøjet. Hvis du gerne vil genvinde denne funktionalitet, skal du sørge for, at PHP indstillingen open_basedir ikke er sat, eller at /proc er inkluderet heri."
 
 #: View/Elements/healthElements/workers.ctp:10
+msgid "Note:"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "You have set the \"manage_workers\" variable to \"false\", therefore worker controls have been disabled."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:15
 msgid "Issues prevent jobs from being processed. Please resolve them below."
 msgstr "Problemer forhindrer jobs i at blive behandlet. Venligst løs dem nedenfor."
 
-#: View/Elements/healthElements/workers.ctp:15
+#: View/Elements/healthElements/workers.ctp:20
 msgid "Worker started with the correct user, but the current status is unknown."
 msgstr "Worker started med den korrekte bruger, men status er ukendt."
 
-#: View/Elements/healthElements/workers.ctp:24
+#: View/Elements/healthElements/workers.ctp:29
 msgid "There are issues with the worker(s), but at least one healthy worker is monitoring the queue."
 msgstr "Der er fejl med worker(s), men der er mindst en worker der fungerer og overvåger køen."
 
-#: View/Elements/healthElements/workers.ctp:30
+#: View/Elements/healthElements/workers.ctp:35
 msgid "Worker type: "
 msgstr "Worker type: "
 
-#: View/Elements/healthElements/workers.ctp:32
+#: View/Elements/healthElements/workers.ctp:37
 msgid "Jobs in the queue: "
 msgstr "Job i kø: "
 
-#: View/Elements/healthElements/workers.ctp:40
+#: View/Elements/healthElements/workers.ctp:45
 msgid "Queue status: "
 msgstr "Kø status: "
 
-#: View/Elements/healthElements/workers.ctp:51
+#: View/Elements/healthElements/workers.ctp:56
 msgid "Worker PID"
 msgstr "Worker PID"
 
-#: View/Elements/healthElements/workers.ctp:52
+#: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
-#: View/Users/admin_view.ctp:7
-#: View/Users/view.ctp:2
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
 msgid "User"
 msgstr "Bruger"
 
-#: View/Elements/healthElements/workers.ctp:53
+#: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr "Worker proces"
 
-#: View/Elements/healthElements/workers.ctp:54
+#: View/Elements/healthElements/workers.ctp:59
 msgid "Information"
 msgstr "Information"
 
-#: View/Elements/healthElements/workers.ctp:64
+#: View/Elements/healthElements/workers.ctp:69
 msgid "Worker not running!"
 msgstr "Worker kører ikke!"
 
-#: View/Elements/healthElements/workers.ctp:72
+#: View/Elements/healthElements/workers.ctp:77
 msgid "The worker appears to be healthy."
 msgstr "Worker processen ser ud til at være i en sund tilstand."
 
-#: View/Elements/healthElements/workers.ctp:75
+#: View/Elements/healthElements/workers.ctp:80
 msgid "The worker was started with a user other than the apache user. MISP cannot check whether the worker is alive or not."
 msgstr "Worker processen blev startet med en anden bruger end apache. MISP har ikke mulighed for at se om workerne kører eller ej."
 
-#: View/Elements/healthElements/workers.ctp:81
+#: View/Elements/healthElements/workers.ctp:86
 msgid "Cannot check whether the worker is alive or dead."
 msgstr "Det er ikke muligt at checke om worker kører eller ej."
 
-#: View/Elements/healthElements/workers.ctp:85
+#: View/Elements/healthElements/workers.ctp:90
 msgid "Dead"
 msgstr "Død"
 
-#: View/Elements/healthElements/workers.ctp:86
+#: View/Elements/healthElements/workers.ctp:91
 msgid "The Worker appears to be dead."
 msgstr "Worker processen ser ud til at være død."
 
-#: View/Elements/healthElements/workers.ctp:100
+#: View/Elements/healthElements/workers.ctp:106
 msgid "Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it."
 msgstr "Stop (hvis stadig kørende) og fjern denne worker. Dette vil straks afslutte alle jobs, der er under udførsel af denne worker."
 
-#: View/Elements/healthElements/workers.ctp:111
+#: View/Elements/healthElements/workers.ctp:119
 msgid "Start a worker"
 msgstr "Start en worker"
 
-#: View/Elements/healthElements/workers.ctp:119
+#: View/Elements/healthElements/workers.ctp:130
 msgid "Restart all workers"
 msgstr "Genstart alle workers"
 
@@ -5140,16 +5646,16 @@ msgstr "Felt"
 #: View/Objects/revise_object.ctp:45
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
-#: View/Pages/doc/categories_and_types.ctp:66
+#: View/Pages/doc/categories_and_types.ctp:60
 #: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
-#: View/ShadowAttributes/index.ctp:36;51
-#: View/SharingGroups/add.ctp:30
-#: View/SharingGroups/edit.ctp:30
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
 #: View/Sightings/ajax/list_sightings.ctp:7
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:35
-#: View/Warninglists/view.ctp:24
+#: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr "Type"
 
@@ -5188,7 +5694,7 @@ msgid "Template Name"
 msgstr "Skabelon navn"
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:60
+#: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr "Lavet af"
@@ -5208,7 +5714,7 @@ msgid "s"
 msgstr "s"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
-#: View/ObjectReferences/ajax/add.ctp:60
+#: View/ObjectReferences/ajax/add.ctp:86
 #: View/Objects/revise_object.ctp:43
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
@@ -5222,9 +5728,9 @@ msgstr "Attribut"
 #: View/Feeds/freetext_index.ctp:31
 #: View/Objects/add.ctp:95
 #: View/Objects/revise_object.ctp:44
-#: View/Pages/doc/categories_and_types.ctp:17;23;37;43;49
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
 #: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
-#: View/ShadowAttributes/index.ctp:48
+#: View/ShadowAttributes/index.ctp:58
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_add_file.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
@@ -5234,7 +5740,7 @@ msgid "Category"
 msgstr "Kategori"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
-#: View/Pages/doc/categories_and_types.ctp:63
+#: View/Pages/doc/categories_and_types.ctp:57
 #: View/Pages/doc/using_the_system.ctp:109
 #: View/Pages/doc/md/categories_and_types.ctp:33
 msgid "Types"
@@ -5463,45 +5969,33 @@ msgstr "EventGraph Sletning"
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr "Er du sikker på du vil slette eventGraph #%s? EventGraph vil være permanent slettede og uoprettelig."
 
-#: View/Events/add.ctp:3
-msgid "The event created %s, but not synchronised to other MISP instances until it is published."
-msgstr "Begivenheden oprettet %s, men synkroniseret ikke til andre forekomster af MISP, indtil det er offentliggjort."
-
-#: View/Events/add.ctp:3
-msgid "will be restricted to your organisation"
-msgstr "vil være begrænset til din organisation"
-
-#: View/Events/add.ctp:3
-msgid "will be visible to the organisations having an account on this platform"
-msgstr "vil være synlig for organisationer der har en konto på denne platform"
-
-#: View/Events/add.ctp:48
+#: View/Events/add.ctp:44
 #: View/Events/edit.ctp:35
 msgid "Threat Level "
 msgstr "Trussels niveau "
 
-#: View/Events/add.ctp:52
+#: View/Events/add.ctp:48
 #: View/Events/edit.ctp:38
 msgid "Analysis "
 msgstr "Analyse "
 
-#: View/Events/add.ctp:56
+#: View/Events/add.ctp:52
 #: View/Events/edit.ctp:43
-#: View/ShadowAttributes/index.ctp:42
+#: View/ShadowAttributes/index.ctp:52
 msgid "Event Info"
 msgstr "Event Informaiton"
 
-#: View/Events/add.ctp:60
+#: View/Events/add.ctp:56
 #: View/Events/edit.ctp:47
 msgid "Quick Event Description or Tracking Info"
 msgstr "Hurtig Event beskrivelse eller sporings information"
 
-#: View/Events/add.ctp:63
+#: View/Events/add.ctp:59
 #: View/Events/edit.ctp:50
 msgid "Extends event"
 msgstr "Udvider event"
 
-#: View/Events/add.ctp:66
+#: View/Events/add.ctp:62
 #: View/Events/edit.ctp:53
 msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr "Event UUID eller ID. Undlad hvis det ikke er relevant."
@@ -5512,7 +6006,8 @@ msgstr "Importer OpenIOC"
 
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
-#: View/Events/upload_stix.ctp:22
+#: View/Events/upload_analysis_file.ctp:22
+#: View/Events/upload_stix.ctp:29
 msgid "Upload"
 msgstr "Upload"
 
@@ -5550,7 +6045,7 @@ msgid "Details"
 msgstr "Detaljer"
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:89
+#: View/Jobs/index.ctp:124
 msgid "Failed"
 msgstr "Fejlet"
 
@@ -5563,787 +6058,678 @@ msgid "Event with this UUID already exists."
 msgstr "Event med denne UUID eksisterer allerede."
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr "Event "
 
 #: View/Events/automation.ctp:3
-msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
-"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
-"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgid "Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.\n"
+"    To to make this functionality available for automated tools an authentication key is used."
 msgstr ""
 
 #: View/Events/automation.ctp:6
-msgid "Make sure you keep that key secret as it gives access to the entire database !"
-msgstr "Sørg for at beskytte nøglen, da denne giver adgang til hele databasen!"
+msgid "Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP."
+msgstr ""
 
-#: View/Events/automation.ctp:7
+#: View/Events/automation.ctp:9
+#: View/Events/legacy_automation.ctp:7
 msgid "Your current key is: <code>%s</code>.\n"
 "    You can %s this key."
 msgstr "Din nuværende nøgle er: <code>%s</code>.\n"
 "Du kan %s denne nøgle."
 
-#: View/Events/automation.ctp:8
+#: View/Events/automation.ctp:10
+#: View/Events/legacy_automation.ctp:8
 msgid "reset"
 msgstr "nulstil"
 
-#: View/Events/automation.ctp:10
-msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
-msgstr "Siden version 2.2 er brugen af auth-nøglen i URL'en forældet. I stedet skal du sende auth-nøglen i en Authorization header i anmodningen. Den gamle mulighed for at have auth-nøglen i webadressen understøttes midlertidigt, men anbefales ikke."
-
-#: View/Events/automation.ctp:11
-msgid "Please use the use the following header"
-msgstr "Brug venligst følgende header"
-
-#: View/Events/automation.ctp:12
-msgid "Authorization"
-msgstr "Bemyndigelse"
-
-#: View/Events/automation.ctp:13
-msgid "XML Export"
-msgstr "XML Eksport"
-
 #: View/Events/automation.ctp:14
-msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
-msgstr "En automatisk eksport af alle events og attributter <small> (undtagen vedhæftede filer)</ small> er tilgængelig via brugerdefineret XML-format."
+#: View/Logs/admin_index.ctp:20;21
+msgid "Search"
+msgstr "Søg"
 
-#: View/Events/automation.ctp:15;47;76
-msgid "You can configure your tools to automatically download the following file"
-msgstr "Du kan konfigurere dit værktøj til automatisk at downloade filen"
+#: View/Events/automation.ctp:16
+#: View/Events/legacy_automation.ctp:264
+msgid "It is possible to search the database for attributes based on a list of criteria."
+msgstr "Det er muligt at søge i databasen for attributter baseret på en liste over kriterier."
 
 #: View/Events/automation.ctp:17
-msgid "If you only want to fetch a specific event append the eventid number"
-msgstr "Hvis du kun ønsker at hente en bestemt event, tilføj eventid nummeret"
+#: View/Events/legacy_automation.ctp:265
+msgid "To return an event or a list of events in a desired format, use the following syntax"
+msgstr "Hvis du vil returnere et event eller en liste over events i et ønsket format, skal du bruge følgende syntaks"
 
-#: View/Events/automation.ctp:19;144
-msgid "You can post an XML or JSON object containing additional parameters in the following formats"
-msgstr "Du kan indsende et XML- eller JSON-objekt, der indeholder yderligere parametre i følgende formater"
+#: View/Events/automation.ctp:18
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
+msgstr ""
 
-#: View/Events/automation.ctp:26
-msgid "The xml download also accepts two additional the following optional parameters in the URL"
-msgstr "XML download accepterer yderligt to valgfrie parametre i webadressen/URL'en"
+#: View/Events/automation.ctp:21
+msgid "Set the return format of the search (Currently supported: json, xml, openioc, suricata, snort - more formats are being moved to restSearch with the goal being that all searches happen through this API). Can be passed as the first parameter after restSearch or via the JSON payload."
+msgstr ""
 
-#: View/Events/automation.ctp:29;52;85
-msgid "Restrict the download to a single event"
-msgstr "Begræns download til en enkelt event"
+#: View/Events/automation.ctp:22
+msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
+msgstr ""
 
-#: View/Events/automation.ctp:30
-msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
-msgstr "Et boolean-felt der afgør, hvorvidt vedhæftninger skal kodes og en 2. parameter, der styrer de kvalificerede tags."
+#: View/Events/automation.ctp:23
+msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
+msgstr ""
 
-#: View/Events/automation.ctp:31;54;87;112;134
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
-msgstr "For at inkludere et tag i resultatet, så skriv dets navn ind i denne parameter. For at udelukke et tag, så sæt et '!' foran.\n"
-"    Du kan også kæde flere tagkommandoer sammen med '&amp;&amp;'. Vær opmærksom på at kolon (:) ikke kan benyttes i tagsøgningen..\n"
-"    Benyt i stedet semikolon (søgningen vil automatisk søge efter kolon i stedet). F.eks.: For at medtage tag1 og tag2, men udelukke tag3, skal du anvende"
+#: View/Events/automation.ctp:24
+#: View/Events/legacy_automation.ctp:268;297
+msgid "Search for the given value in the attributes' value field."
+msgstr "Søg efter den givne værdi i attributternes værdi felt."
 
-#: View/Events/automation.ctp:37;64;91;117;140;203;254;279
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
-msgstr "Begivenheder med en datoangivelse efter den dato, der er angivet i fra-feltet (format: 2015-02-15). Dette filter bruger begivenhedsdatoen."
-
-#: View/Events/automation.ctp:38;65;92;118;141;204;255;280
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
-msgstr "Events med datoen sat til en dato før den angivne i feltet til (format: 2015-02-15). Dette filter bruger begivenhedsdatoen."
-
-#: View/Events/automation.ctp:39;119;142;205;256;281;306
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr "Events offentliggjort inden for den seneste x tid, hvor x kan defineres i dage, timer, minutter (for eksempel 5d eller 12t eller 30m). Dette filter bruger den udgivne tidsstempel for eventen."
-
-#: View/Events/automation.ctp:41;70;97;122;259;290
-msgid "The keywords false or null should be used for optional empty parameters in the URL."
-msgstr "Søgeordene 'false' eller 'null' skal anvendes til valgfrie tomme parametre i webadressen/URL'en."
-
-#: View/Events/automation.ctp:43
-msgid "Also check out the %s to read about the REST API."
-msgstr "Se også følgende %s for at læse omkring REST API."
-
-#: View/Events/automation.ctp:45
-msgid "CSV Export"
-msgstr "CSV Eksport"
-
-#: View/Events/automation.ctp:46
-msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
-msgstr "Automatisk eksportering af attributter er tilgængelig som CSV. Kun attributter der er markeret med \"to_ids\" eksporteres."
-
-#: View/Events/automation.ctp:49
-msgid "You can specify additional flags for CSV exports as follows"
-msgstr "Du kan angive yderligere flag til CSV eksport som følger"
-
-#: View/Events/automation.ctp:53
-msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
-msgstr "Ved at sætte dette flag til 'sandt' vil det inkludere attributter der ikke er markeret \"to_ids\"."
-
-#: View/Events/automation.ctp:58
-msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
-msgstr "Som et eksempel for kun at downloade en CSV genereret af typen \"domain\" og \"Network activity\" kategori attributter alle events undtagen den ene og den anden begrænser den til events, der er mærket \"tag1\" eller \"tag2\" men ikke \"tag3\", og kun tillader attributter, der er identificeret med IDS, brug følgende syntaks"
-
-#: View/Events/automation.ctp:61;270;299
-msgid "The attribute category, any valid MISP attribute category is accepted."
-msgstr "Attribut kategorien, enhver valid MISP attribut kategori, accepteres."
-
-#: View/Events/automation.ctp:62;199;269;298
+#: View/Events/automation.ctp:25
+#: View/Events/legacy_automation.ctp:62;199;269;298
 msgid "The attribute type, any valid MISP attribute type is accepted."
 msgstr "Attribut typen, enhver valid MISP attribut type accepteres."
 
-#: View/Events/automation.ctp:63
-msgid "Include the event data with each attribute."
-msgstr "Inkluder event data sammen med hver attribut."
+#: View/Events/automation.ctp:26
+#: View/Events/legacy_automation.ctp:61;270;299
+msgid "The attribute category, any valid MISP attribute category is accepted."
+msgstr "Attribut kategorien, enhver valid MISP attribut kategori, accepteres."
 
-#: View/Events/automation.ctp:66
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
-msgstr "Events offentliggjort inden for den sidste x tid, hvor x kan defineres i dage, timer, minutter (for eksempel 5d eller 12t eller 30m). Dette filter bruger det publicerede tidsstempel for eventen."
+#: View/Events/automation.ctp:27
+#: View/Events/legacy_automation.ctp:271;300
+msgid "Search by the creator organisation by supplying the organisation identifier."
+msgstr "Søg baseret på oprindelses organisationen ved at levere organisations identifikatoren."
 
-#: View/Events/automation.ctp:67
-msgid "The CSV created when this setting is set to true will not contain the header row.\n"
-"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:71
-msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
-msgstr "For at eksportere attributterne på alle events, der er af typen \"domain\", brug den følgende syntaks"
-
-#: View/Events/automation.ctp:74
-msgid "NIDS rules export"
-msgstr "eksport af NIDS regler"
-
-#: View/Events/automation.ctp:75
-msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr "Automatisk eksport af alle netværksrelaterede attributter er tilgængelig under Snort regel formatet. Kun <em>publicerede</em> events og attributter, der er markeret som <em>IDS-signatur</em> eksporteres."
-
-#: View/Events/automation.ctp:81
-msgid "The full API syntax is as follows"
-msgstr "Det fulde API syntaks ser således ud"
-
-#: View/Events/automation.ctp:84
-msgid "The export format, can be \"suricata\" or \"snort\""
-msgstr "Eksport formatet kan være \"suricata\" eller \"snort\""
-
-#: View/Events/automation.ctp:86
-msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
-msgstr "Nogle udkommenterede forklaringer indrammer data. Årsagen til at deaktivere dette ville være, hvis du gerne vil sammenkæde en liste af eksport fra forskellige udvalgte events for at undgå unødvendig duplikering af kommentarer."
-
-#: View/Events/automation.ctp:93
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr "Events offentliggjort inden for den sidste x tid, hvor x kan defineres i dage, timer, minutter (for eksempel 6d eller 12t eller 30m). Dette filter bruger det publicerede tidsstempel for eventen."
-
-#: View/Events/automation.ctp:94
-msgid "Restrict the export to only use the given types."
-msgstr "Begræns eksporten til kun at anvende de givne typer."
-
-#: View/Events/automation.ctp:95;120;174;206;257
-msgid "All attributes that have a hit on a warninglist will be excluded."
-msgstr "Alle attributter, der har et hit på en warninglist, vil blive ekskluderet."
-
-#: View/Events/automation.ctp:96
-msgid "All tags will be included even if not exportable."
-msgstr "Alle tags vil blive inkluderet, selvom de er sat til ikke at kunne eksporteres."
-
-#: View/Events/automation.ctp:98
-msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
-msgstr "Et eksempel på en suricata-eksport for alle events, men udelukker de der er tagget \"tag1\", uden alle de udkommenterede oplysninger i starten af ​​filen, ville se således ud:"
-
-#: View/Events/automation.ctp:100
-msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
-msgstr "Administrationen kan vedligeholde en white-list indeholdende vært, domænenavn og IP-numre der skal udelukkes fra NIDS-eksporten."
-
-#: View/Events/automation.ctp:102
-msgid "Hash database export"
-msgstr "Hash database eksport"
-
-#: View/Events/automation.ctp:103
-msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr "Automatisk eksport af MD5/SHA1 checksums indeholdt i fil relaterede attributter. Denne liste kan bruges til feeds til forensic software, når du søger efter mistænkelige filer. Kun <em>publicerede</em> events og attributter, der er markeret som <em>IDS-signatur</em> eksporteres."
-
-#: View/Events/automation.ctp:104;188
-msgid "You can configure your tools to automatically download the following files"
-msgstr "Du kan konfigurere dine værktøjer til automatisk at downloade følgende filer"
-
-#: View/Events/automation.ctp:109
-msgid "The API's full format is as follows"
-msgstr "Det fulde API format ser således ud"
-
-#: View/Events/automation.ctp:111
-msgid "The export format, can be \"md5\" or \"sha1\""
-msgstr "Eksport formatet kan være \"md5\" eller \"sha1\""
-
-#: View/Events/automation.ctp:123
-msgid "For example, to only show sha1 values from events tagged tag1, use"
-msgstr "Eksempelvis for kun at vise sha1 værdier fra events tagget tag1 anvend"
-
-#: View/Events/automation.ctp:126
-msgid "STIX export"
-msgstr "STIX eksport"
-
-#: View/Events/automation.ctp:127
-msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
-msgstr "Du kan eksportere MISP events i Mitre's STIX format (for at læse mere om STIX, klik <a href=\"https://stix.mitre.org/\"> her </a>). STIX XML eksport er i øjeblikket meget langsom og kan føre til timeouts med større events eller samlinger af events. JSON versionen lider ikke under disse problemer. Anvendelse"
-
-#: View/Events/automation.ctp:129
-msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
-msgstr "Søge parametre kan sendes til funktionen via URL parametre eller ved POST af et XML eller JSON objekt (afhængigt af returtype). Følgende parametre kan sendes til STIX eksport værktøjet: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Både <code>id</code> og <code>tags</code> kan bruge <code>&amp;&amp;</code> (og) og <code>!</code> forespørgsler. Ved hjælp af URL parametrene er syntaksen som følger"
-
-#: View/Events/automation.ctp:132;171
-msgid "The event's ID"
-msgstr "Event ID"
-
-#: View/Events/automation.ctp:133
-msgid "Encode attachments where applicable"
-msgstr "Encode vedhæftelser hvor relevant"
-
-#: View/Events/automation.ctp:151
-msgid "Various ways to narrow down the search results of the STIX export"
-msgstr "Forskellige måder at indsnævre søge resultaterne af STIX eksporten"
-
-#: View/Events/automation.ctp:152
-msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
-msgstr "Som eksempel kan du hente alle events, der er markeret \"APT1\", men ekskluderer events, der er markeret \"OSINT\" og eksklusive events #51 og #62 uden vedhæftelser"
-
-#: View/Events/automation.ctp:154
-msgid "To export the same events using a POST request use"
-msgstr "For at eksporterer samme events ved brug af POST"
-
-#: View/Events/automation.ctp:156
-msgid "Together with this JSON object in the POST message"
-msgstr "Sammen med dette JSON objekt i POST beskeden"
-
-#: View/Events/automation.ctp:158
-msgid "XML is automagically assumed when using the stix export"
-msgstr "XML anvendes som standard automatisk, når du bruger STIX eksporten"
-
-#: View/Events/automation.ctp:160
-msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
-msgstr "Den samme søgning kunne udføres ved hjælp af følgende POSTede XML objekt (bemærk at ampersand-tegn skal escapes, eller alternativt kan separate ID og tag elementer bruges)"
-
-#: View/Events/automation.ctp:163
-msgid "RPZ export"
-msgstr "RPZ eksport"
-
-#: View/Events/automation.ctp:164
-msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
-msgstr "> Du kan eksportere RPZ zone filer til DNS firewalling ved at bruge RPZ eksport funktionaliteten i MISP. Den genererede fil vil indeholde alle de domæner, der er identificeret med IDS-flag, samt de IP-src/IP-dst attributter, som du har adgang til."
-
-#: View/Events/automation.ctp:165
-msgid "It is possible to further restrict the exported values using the following filters"
-msgstr "Det er muligt at begrænse de eksporterede værdier yderligere ved hjælp af følgende filtre"
-
-#: View/Events/automation.ctp:167
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
-"        "
-msgstr "For at medtage et tag i resultaterne, så skriv dets navn ind i denne parameter. For at udelukke et tag, så sæt et '!' foran..\n"
-"            Du kan også sammenkæde flere tagkommandoer med opratøren '&amp;&amp;'. Bemærk, at kolon (:) ikke kan benyttes i tagsøgningen, når det udgør en del af URL'en.\n"
-"\t        "
-
-#: View/Events/automation.ctp:170
-msgid "Use semicolons instead (the search will automatically search for colons instead)"
-msgstr "Benyt i stedet semikoloner (søgningen vil automatisk søge efter koloner i stedet)"
-
-#: View/Events/automation.ctp:172
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
-msgstr "Begivenheder med datoangivelser efter den, der er angivet i fra-feltet (format: 2015-02-03)"
-
-#: View/Events/automation.ctp:173
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
-msgstr "Begivenheder med datoangivelser før den, der er angivet i til-feltet (format: 2015-02-03)"
-
-#: View/Events/automation.ctp:176
-msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
-msgstr "MISP vil indsætte header værdier i zoner filen samt definere den handling, der er taget for hver af de værdier, der kan overstyres. Disse værdier er som standard enten standard værdier, der leveres sammen med programmet, eller dem, der overstyres af din administrator. Værdierne er som følger"
-
-#: View/Events/automation.ctp:180
-msgid "To override the above values, either use the url parameters as described below"
-msgstr "For at tilsidesætte ovenstående værdier skal du enten bruge URL parametre som beskrevet nedenfor"
-
-#: View/Events/automation.ctp:182
-msgid "or POST an XML or JSON object with the above listed options"
-msgstr "eller POSTe et XML eller JSON objekt med de ovennævnte options"
-
-#: View/Events/automation.ctp:186
-msgid "Text export"
-msgstr "Tekst eksport"
-
-#: View/Events/automation.ctp:187
-msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
-msgstr "> En eksport af alle attributter af en bestemt type til en tekst fil. Som standard eksporteres kun offentliggjorte og IDS-flagede attributter."
-
-#: View/Events/automation.ctp:194
-msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
-msgstr "For at begrænse resultaterne med tags skal du bruge de sædvanlige syntakser. Vær opmærksom på kolon (:) kan ikke bruges i tag søgning. Brug semikolon i stedet (søgningen vil automatisk søge efter kolon i stedet). For at få ip-src værdier fra events tagget tag1 men ikke tag2 brug"
-
-#: View/Events/automation.ctp:197
-msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
-msgstr "Fra version 2.3.38 er det muligt at begrænse tekst eksport med yderligt to flag. Den første giver brugeren mulighed for at begrænse baseret på event ID, mens den anden er en boolean switch, der medtager ikke-IDS-flagede attributter i eksporten. Hvis du vælger \"alle\" i typefeltet, returneres alle matchende attributter."
-
-#: View/Events/automation.ctp:200
+#: View/Events/automation.ctp:28
+#: View/Events/legacy_automation.ctp:200
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'."
 msgstr "For at inkludere et tag i resultaterne, skriv navnene i denne parameter. For at udelukke et tag skal du foranstille det med et '!'."
 
-#: View/Events/automation.ctp:201
-msgid "Only export the attributes of the given event ID"
-msgstr "Eksporter kun attributter fra den pågældende event ID"
+#: View/Events/automation.ctp:29
+#: View/Events/legacy_automation.ctp:278
+msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
+msgstr ""
 
-#: View/Events/automation.ctp:202
-msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
-msgstr "Inkluder attributter, der ikke er markeret med to_ids, selvom de normalt ikke ville blive udelukket. Tilsidesætter også whitelist funktionaliteten."
+#: View/Events/automation.ctp:30;151
+#: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
+msgstr "Begivenheder med en datoangivelse efter den dato, der er angivet i fra-feltet (format: 2015-02-15). Dette filter bruger begivenhedsdatoen."
 
-#: View/Events/automation.ctp:207
-msgid "Include not published Events."
-msgstr "Inkluder events der ikke er publicerede."
+#: View/Events/automation.ctp:31;152
+#: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
+msgstr "Events med datoen sat til en dato før den angivne i feltet til (format: 2015-02-15). Dette filter bruger begivenhedsdatoen."
 
-#: View/Events/automation.ctp:208;275
-msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
-msgstr "Du kan også sammenkæde flere tagkommandoer med &amp;&amp;-operatoren. Vær opmærksom på, at kolon (:) ikke kan benyttes i tag-søgning.\n"
-"    Benyt i stedet somikolon (søgningen vil automatisk søge efter koloner i stedet). For f.eks. at medtage tag1 og tag2, men udelukke tag3, skal du benytte"
+#: View/Events/automation.ctp:32
+#: View/Events/legacy_automation.ctp:282;307
+msgid "The events that should be included / excluded from the search"
+msgstr "De events, der skal medtages/udelukkes fra søgningen"
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:33
+#: View/Events/legacy_automation.ctp:283;308
+msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
+msgstr "Hvis indstillingen er sat, kodes vedhæftede filer / zippede malware prøver som base64 i data feltet inden for hver attribut"
+
+#: View/Events/automation.ctp:34
+#: View/Events/legacy_automation.ctp:284
+msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
+msgstr "Kun metadata (event, tags, relationer) returneres. Attributter og forslag udelades."
+
+#: View/Events/automation.ctp:35
+#: View/Events/legacy_automation.ctp:285;309
+msgid "Restrict the results by uuid."
+msgstr "Begræns resultaterne baseret på UUID."
+
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:37
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:38
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:39
+#: View/Events/legacy_automation.ctp:288;311
+msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
+msgstr "Angiv om publicerede eller upublicerede begivenheder skal returneres. Indstil ikke parameteren, hvis du vil have begge."
+
+#: View/Events/automation.ctp:40
+#: View/Events/legacy_automation.ctp:289;313
+msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
+msgstr "Fjern eventuelle attributter fra resultatet, der ville forårsage et hit på en warninglist post."
+
+#: View/Events/automation.ctp:41
+#: View/Events/legacy_automation.ctp:314
+msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
+msgstr ""
+
+#: View/Events/automation.ctp:42
+#: View/Events/legacy_automation.ctp:315
+msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
+msgstr ""
+
+#: View/Events/automation.ctp:43
+#: View/Events/legacy_automation.ctp:316
+msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
+msgstr "I stedet for blot at inkludere event ID, inkluderer også event UUID i hver af attributterne."
+
+#: View/Events/automation.ctp:44
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:45
+msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
+msgstr ""
+
+#: View/Events/automation.ctp:46
+msgid "Filter on the event's info field."
+msgstr ""
+
+#: View/Events/automation.ctp:47
+msgid "Search for a full or a substring (delimited by % for substrings) in the event info, event tags, attribute tags, attribute values or attribute comment fields."
+msgstr ""
+
+#: View/Events/automation.ctp:48
+msgid "CSV only, select the fields that you wish to include in the CSV export. By setting event level fields additionally, includeContext is not required to get event metadata."
+msgstr ""
+
+#: View/Events/automation.ctp:49
+msgid "CSV only, add additional event level data to the export. The additional fields can be added via requested_attributes too with more granularity."
+msgstr ""
+
+#: View/Events/automation.ctp:79
+msgid "CSV specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:81
+msgid "Limit the list of fields to be returned in the CSV."
+msgstr ""
+
+#: View/Events/automation.ctp:82
+msgid "Include the event level meta-data with each attribute."
+msgstr ""
+
+#: View/Events/automation.ctp:83
+msgid "The CSV created when this setting is set to true will not contain the header row."
+msgstr ""
+
+#: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
+msgid "RPZ specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:95
+#: View/Events/legacy_automation.ctp:164
+msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
+msgstr "> Du kan eksportere RPZ zone filer til DNS firewalling ved at bruge RPZ eksport funktionaliteten i MISP. Den genererede fil vil indeholde alle de domæner, der er identificeret med IDS-flag, samt de IP-src/IP-dst attributter, som du har adgang til."
+
+#: View/Events/automation.ctp:98
+#: View/Events/legacy_automation.ctp:176
+msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
+msgstr "MISP vil indsætte header værdier i zoner filen samt definere den handling, der er taget for hver af de værdier, der kan overstyres. Disse værdier er som standard enten standard værdier, der leveres sammen med programmet, eller dem, der overstyres af din administrator. Værdierne er som følger"
+
+#: View/Events/automation.ctp:102
+#: View/Events/legacy_automation.ctp:180
+msgid "To override the above values, either use the url parameters as described below"
+msgstr "For at tilsidesætte ovenstående værdier skal du enten bruge URL parametre som beskrevet nedenfor"
+
+#: View/Events/automation.ctp:104
+#: View/Events/legacy_automation.ctp:182
+msgid "or POST an XML or JSON object with the above listed options"
+msgstr "eller POSTe et XML eller JSON objekt med de ovennævnte options"
+
+#: View/Events/automation.ctp:108
+#: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr "Bro IDS eksport"
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:109
+#: View/Events/legacy_automation.ctp:212
 msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
 msgstr "En eksport af alle attributter af en bestemt bro type til en formateret tekst fil. Som standard eksporteres kun offentliggjorte og IDS-flagede attributter."
 
-#: View/Events/automation.ctp:213
+#: View/Events/automation.ctp:110
+#: View/Events/legacy_automation.ctp:213
 msgid "You can configure your tools to automatically download a file one of the Bro types."
 msgstr "Du kan konfigurere dine værktøjer til automatisk at downloade en fil, en af Bro typerne."
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:116
+#: View/Events/legacy_automation.ctp:219
 msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
 msgstr "For at begrænse resultaterne med tags skal du anvende de sædvanlige syntakser. Vær opmærksom på kolonerne (:) kan ikke bruges i tag søgning. Brug semikoloner i stedet (søgningen vil automatisk søge efter koloner i stedet). For at få ip værdier fra events tagget tag1 men ikke tag2 brug"
 
-#: View/Events/automation.ctp:222
+#: View/Events/automation.ctp:119
+#: View/Events/legacy_automation.ctp:222
 msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
 msgstr "Det er muligt at begrænse bro eksporten baseret på et sæt filtre. POST et JSON objekt eller et XML imod Bro API'et for at filtrerer resultaterne."
 
-#: View/Events/automation.ctp:240
+#: View/Events/automation.ctp:137
+#: View/Events/legacy_automation.ctp:240
 msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
 msgstr "Alternativt er det også muligt at sende filtre via parametrene i URL'en, selvom det anbefales at bruge POST-anmodninger med JSON objekter i stedet. Formatet er beskrevet nedenfor"
 
-#: View/Events/automation.ctp:242
+#: View/Events/automation.ctp:139
+#: View/Events/legacy_automation.ctp:242
 msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
 msgstr "Bro typen, enhver gyldig Bro type accepteres. Kortlægningen mellem Bro og MISP typer er som følger"
 
-#: View/Events/automation.ctp:249;301
+#: View/Events/automation.ctp:146
+#: View/Events/legacy_automation.ctp:249;301
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
 "    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
 "    Use semicolons instead (the search will automatically search for colons instead)."
 msgstr ""
 
-#: View/Events/automation.ctp:252
+#: View/Events/automation.ctp:149
+#: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr "Begræns resultaterne til de givne Event ID'er."
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:150
+#: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr "Tillad, at attributter der ikke er markeret som \"to_ids\" eksporteres."
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr "Events offentliggjort inden for den seneste x tid, hvor x kan defineres i dage, timer, minutter (for eksempel 5d eller 12t eller 30m). Dette filter bruger den udgivne tidsstempel for eventen."
+
+#: View/Events/automation.ctp:154
+#: View/Events/legacy_automation.ctp:95;120;174;206;257
+msgid "All attributes that have a hit on a warninglist will be excluded."
+msgstr "Alle attributter, der har et hit på en warninglist, vil blive ekskluderet."
+
+#: View/Events/automation.ctp:156
+#: View/Events/legacy_automation.ctp:41;70;97;122;259;290
+msgid "The keywords false or null should be used for optional empty parameters in the URL."
+msgstr "Søgeordene 'false' eller 'null' skal anvendes til valgfrie tomme parametre i webadressen/URL'en."
+
+#: View/Events/automation.ctp:157
+#: View/Events/legacy_automation.ctp:260
 msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
 msgstr "Hvis du f.eks. skal hente alle attributter til event #5, herunder ikke-IDS markerede attributter, skal du bruge følgende linje"
 
-#: View/Events/automation.ctp:263
-msgid "Searches with JSON/XML/OpenIOC results"
-msgstr "Søgninger med JSON/XML/OpenIOC resultater"
-
-#: View/Events/automation.ctp:264
-msgid "It is possible to search the database for attributes based on a list of criteria."
-msgstr "Det er muligt at søge i databasen for attributter baseret på en liste over kriterier."
-
-#: View/Events/automation.ctp:265
-msgid "To return an event or a list of events in a desired format, use the following syntax"
-msgstr "Hvis du vil returnere et event eller en liste over events i et ønsket format, skal du bruge følgende syntaks"
-
-#: View/Events/automation.ctp:267
-msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
-msgstr "Indstil retur formatet for søgningen (For øjeblikket understøttes: JSON, XML, OpenIOC - flere formater kommer snart)."
-
-#: View/Events/automation.ctp:268;297
-msgid "Search for the given value in the attributes' value field."
-msgstr "Søg efter den givne værdi i attributternes værdi felt."
-
-#: View/Events/automation.ctp:271;300
-msgid "Search by the creator organisation by supplying the organisation identifier."
-msgstr "Søg baseret på oprindelses organisationen ved at levere organisations identifikatoren."
-
-#: View/Events/automation.ctp:272
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
-msgstr ""
-
-#: View/Events/automation.ctp:278
-msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
-msgstr ""
-
-#: View/Events/automation.ctp:282;307
-msgid "The events that should be included / excluded from the search"
-msgstr "De events, der skal medtages/udelukkes fra søgningen"
-
-#: View/Events/automation.ctp:283;308
-msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
-msgstr "Hvis indstillingen er sat, kodes vedhæftede filer / zippede malware prøver som base64 i data feltet inden for hver attribut"
-
-#: View/Events/automation.ctp:284
-msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
-msgstr "Kun metadata (event, tags, relationer) returneres. Attributter og forslag udelades."
-
-#: View/Events/automation.ctp:285;309
-msgid "Restrict the results by uuid."
-msgstr "Begræns resultaterne baseret på UUID."
-
-#: View/Events/automation.ctp:286;310
-msgid "Restrict the results by the last publish timestamp (newer than)."
-msgstr "Begræns resultaterne baseret på sidste publicerings tids stempel (nyere end)."
-
-#: View/Events/automation.ctp:287
-msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
-msgstr "Begræns resultaterne ved hjælp af tidsstempel (sidste redigering). Enhver begivenhed med en tidstempel nyere end den givne tidsstempel vil blive returneret. Hvis du beskæftiger dig med / attributter som anvendelsesområde, vil attributets tidsstempel blive brugt til opslaget."
-
-#: View/Events/automation.ctp:288;311
-msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
-msgstr "Angiv om publicerede eller upublicerede begivenheder skal returneres. Indstil ikke parameteren, hvis du vil have begge."
-
-#: View/Events/automation.ctp:289;313
-msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
-msgstr "Fjern eventuelle attributter fra resultatet, der ville forårsage et hit på en warninglist post."
-
-#: View/Events/automation.ctp:291
-msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
-msgstr ""
-
-#: View/Events/automation.ctp:294;320;349
-msgid "POST message payload (json)"
-msgstr "POST besked payload (JSON)"
-
-#: View/Events/automation.ctp:296
-msgid "To just return a list of attributes, use the following syntax"
-msgstr "For kun at returnere en liste af attributter, anvend følgende syntaks"
-
-#: View/Events/automation.ctp:304
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
-msgstr "Events med datoen sat til en dato efter den der blev specificeret i fra feltet (format: 2015-02-15)"
-
-#: View/Events/automation.ctp:305
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
-msgstr "Events med datoen sat til en dato før den angivne i feltet til (format: 2015-02-15)"
-
-#: View/Events/automation.ctp:312
-msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
-msgstr "Begræns resultaterne ved hjælp af tidsstempel (på attributten). Eventuelle attributter med et tidsstempel nyere end den angivne tidsstempel returneres."
-
-#: View/Events/automation.ctp:314
-msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
-msgstr ""
-
-#: View/Events/automation.ctp:315
-msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
-msgstr ""
-
-#: View/Events/automation.ctp:316
-msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
-msgstr "I stedet for blot at inkludere event ID, inkluderer også event UUID i hver af attributterne."
-
-#: View/Events/automation.ctp:317
-msgid "Only return attributes from events that have received a modification after the given timestamp."
-msgstr "Returner kun attributter fra events, der har modtaget en ændring efter den angivne tidsstempel."
-
-#: View/Events/automation.ctp:322
-msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
-msgstr ""
-
-#: View/Events/automation.ctp:324
-msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
-"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:327
-msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
-msgstr ""
-
-#: View/Events/automation.ctp:329
+#: View/Events/automation.ctp:160
+#: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr "Eksporter attributter af event med angivet type som XML"
 
-#: View/Events/automation.ctp:330
+#: View/Events/automation.ctp:161
+#: View/Events/legacy_automation.ctp:330
 msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:332
+#: View/Events/automation.ctp:163
+#: View/Events/legacy_automation.ctp:332
 msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
 "    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
 "    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:168
+#: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr "Download vedhæftning eller malware prøve"
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:169
+#: View/Events/legacy_automation.ctp:338
 msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:340
+#: View/Events/automation.ctp:171
+#: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr "Download malware prøve baseret på hash"
 
-#: View/Events/automation.ctp:341
+#: View/Events/automation.ctp:172
+#: View/Events/legacy_automation.ctp:341
 msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
 msgstr ""
 
-#: View/Events/automation.ctp:342
+#: View/Events/automation.ctp:173
+#: View/Events/legacy_automation.ctp:342
 msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
 msgstr ""
 
-#: View/Events/automation.ctp:343
+#: View/Events/automation.ctp:174
+#: View/Events/legacy_automation.ctp:343
 msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
 msgstr ""
 
-#: View/Events/automation.ctp:345
+#: View/Events/automation.ctp:176
+#: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr "POST besked payload (XML)"
 
-#: View/Events/automation.ctp:353
+#: View/Events/automation.ctp:180
+#: View/Events/legacy_automation.ctp:294;320;349
+msgid "POST message payload (json)"
+msgstr "POST besked payload (JSON)"
+
+#: View/Events/automation.ctp:184
+#: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr "En hurtig beskrivelse af alle parametrene i det anvendte objekt"
 
-#: View/Events/automation.ctp:354
+#: View/Events/automation.ctp:185
+#: View/Events/legacy_automation.ctp:354
 msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
 msgstr "En hash i MD5 format. Hvis allSamples er sat, kan dette være hvilken som helst af følgende: %s"
 
-#: View/Events/automation.ctp:355
+#: View/Events/automation.ctp:186
+#: View/Events/legacy_automation.ctp:355
 msgid "If set, it will return all samples from events that have a match for the hash provided above."
 msgstr ""
 
-#: View/Events/automation.ctp:356
+#: View/Events/automation.ctp:187
+#: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:357
+#: View/Events/automation.ctp:188
+#: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr "Upload malware samples ved brug af \"Upload Sample\" API"
 
-#: View/Events/automation.ctp:359
+#: View/Events/automation.ctp:190
+#: View/Events/legacy_automation.ctp:359
 msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
 msgstr ""
 
-#: View/Events/automation.ctp:360
+#: View/Events/automation.ctp:191
+#: View/Events/legacy_automation.ctp:360
 msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
 msgstr ""
 
-#: View/Events/automation.ctp:361
+#: View/Events/automation.ctp:192
+#: View/Events/legacy_automation.ctp:361
 msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
 msgstr "Event ID er valgfrit. MISP accepterer enten et JSON eller et XML-objekt, der er POST'ed til ovenstående URL."
 
-#: View/Events/automation.ctp:362
+#: View/Events/automation.ctp:193
+#: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr "Den generelle struktur for de forventede objekter er som følger"
 
-#: View/Events/automation.ctp:371
+#: View/Events/automation.ctp:202
+#: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr "Følgende valgfrie parametre forventes"
 
-#: View/Events/automation.ctp:372
+#: View/Events/automation.ctp:203
+#: View/Events/legacy_automation.ctp:372
 msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
 msgstr ""
 
-#: View/Events/automation.ctp:373
+#: View/Events/automation.ctp:204
+#: View/Events/legacy_automation.ctp:373
 msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:374
+#: View/Events/automation.ctp:205
+#: View/Events/legacy_automation.ctp:374
 msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
 msgstr ""
 
-#: View/Events/automation.ctp:375
+#: View/Events/automation.ctp:206
+#: View/Events/legacy_automation.ctp:375
 msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 msgstr ""
 
-#: View/Events/automation.ctp:376
+#: View/Events/automation.ctp:207
+#: View/Events/legacy_automation.ctp:376
 msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
 msgstr ""
 
-#: View/Events/automation.ctp:377
+#: View/Events/automation.ctp:208
+#: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr "Analyse niveauet for den nyoprettede event, hvis det er relevant. [0-2]"
 
-#: View/Events/automation.ctp:378
+#: View/Events/automation.ctp:209
+#: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr "Trussels niveau ID for den nyoprettede event, hvis det er relevant. [0-3]"
 
-#: View/Events/automation.ctp:379
+#: View/Events/automation.ctp:210
+#: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr "Dette vil udfylde kommentarfeltet for alle attributter, der oprettes ved hjælp af denne API."
 
-#: View/Events/automation.ctp:380
+#: View/Events/automation.ctp:211
+#: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr "Tilføj eller fjern tags fra events"
 
-#: View/Events/automation.ctp:381
+#: View/Events/automation.ctp:212
+#: View/Events/legacy_automation.ctp:381
 msgid "You can add or remove an existing tag from an event in the following way"
 msgstr "Du kan tilføje eller fjerne et eksisterende tag fra en event på følgende måde"
 
-#: View/Events/automation.ctp:384
+#: View/Events/automation.ctp:215
+#: View/Events/legacy_automation.ctp:384
 msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
 msgstr ""
 
-#: View/Events/automation.ctp:386
+#: View/Events/automation.ctp:217
+#: View/Events/legacy_automation.ctp:386
 msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:388
+#: View/Events/automation.ctp:219
+#: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr "Forslag og API'en"
 
-#: View/Events/automation.ctp:389
+#: View/Events/automation.ctp:220
+#: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr "Du kan interagere med forslag/input via API direkte siden version 2.3.148"
 
-#: View/Events/automation.ctp:393
+#: View/Events/automation.ctp:224
+#: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr "HTTP"
 
-#: View/Events/automation.ctp:394
+#: View/Events/automation.ctp:225
+#: View/Events/legacy_automation.ctp:394
 #: View/Pages/doc/using_the_system.ctp:445
-#: View/SharingGroups/add.ctp:52
-#: View/SharingGroups/edit.ctp:60
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
 msgid "URL"
 msgstr "URL"
 
-#: View/Events/automation.ctp:395
+#: View/Events/automation.ctp:226
+#: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr "Forklaring"
 
-#: View/Events/automation.ctp:396
+#: View/Events/automation.ctp:227
+#: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr "Forventet Payload"
 
-#: View/Events/automation.ctp:397
-#: View/Servers/rest.ctp:53
+#: View/Events/automation.ctp:228
+#: View/Events/legacy_automation.ctp:397
+#: View/Servers/rest.ctp:115
 msgid "Response"
 msgstr "Svar"
 
-#: View/Events/automation.ctp:402
+#: View/Events/automation.ctp:233
+#: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr "Se et forslag"
 
-#: View/Events/automation.ctp:404;424;425;431;432
+#: View/Events/automation.ctp:235;255;256;262;263
+#: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr "ShadowAttribute objekt"
 
-#: View/Events/automation.ctp:409
+#: View/Events/automation.ctp:240
+#: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr "Se alle forslag for min org's events"
 
-#: View/Events/automation.ctp:411;418
+#: View/Events/automation.ctp:242;249
+#: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr "ShadowAttribute objekter"
 
-#: View/Events/automation.ctp:416
+#: View/Events/automation.ctp:247
+#: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr "Se alle foreslag for et event"
 
-#: View/Events/automation.ctp:423
+#: View/Events/automation.ctp:254
+#: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr "Foreslå en ny attribut til en event"
 
-#: View/Events/automation.ctp:430
+#: View/Events/automation.ctp:261
+#: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr "Foreslå en ændring til en attribut"
 
-#: View/Events/automation.ctp:437
+#: View/Events/automation.ctp:268
+#: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr "Accepter et forslag"
 
-#: View/Events/automation.ctp:439;446
+#: View/Events/automation.ctp:270;277
+#: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
 #: View/Pages/doc/using_the_system.ctp:254
 msgid "Message"
 msgstr "Besked"
 
-#: View/Events/automation.ctp:444
+#: View/Events/automation.ctp:275
+#: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr "Kasser et forslag"
 
-#: View/Events/automation.ctp:449
+#: View/Events/automation.ctp:280
+#: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr "Når du POST'er et skygge attribut objekt, skal du bruge følgende formater"
 
-#: View/Events/automation.ctp:454
+#: View/Events/automation.ctp:285
+#: View/Events/legacy_automation.ctp:454
 msgid "None of the above fields are mandatory, but at least one of them has to be provided."
 msgstr ""
 
-#: View/Events/automation.ctp:456
+#: View/Events/automation.ctp:287
+#: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr "Filtrering af event metadata"
 
-#: View/Events/automation.ctp:457
+#: View/Events/automation.ctp:288
+#: View/Events/legacy_automation.ctp:457
 msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
 msgstr ""
 
-#: View/Events/automation.ctp:461
+#: View/Events/automation.ctp:292
+#: View/Events/legacy_automation.ctp:461
 msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
 "    An example for a valid lookup"
 msgstr ""
 
-#: View/Events/automation.ctp:472
+#: View/Events/automation.ctp:303
+#: View/Events/legacy_automation.ctp:472
 msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
 msgstr ""
 
-#: View/Events/automation.ctp:473
+#: View/Events/automation.ctp:304
+#: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr "Listen over gyldige parametre"
 
-#: View/Events/automation.ctp:474
+#: View/Events/automation.ctp:305
+#: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr "Filtre på publicerede eller ikke publicerede events [0,1] - ikke sammenlignelige"
 
-#: View/Events/automation.ctp:475
+#: View/Events/automation.ctp:306
+#: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr "Filtre på strenge fundet i event informationen - ikke sammenlignelige"
 
-#: View/Events/automation.ctp:476
+#: View/Events/automation.ctp:307
+#: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr "Filtre på vedhæftede tag navne - ikke sammenlignelige"
 
-#: View/Events/automation.ctp:477
+#: View/Events/automation.ctp:308
+#: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr "Filtre på specific event ID'er - ikke sammenlignelige"
 
-#: View/Events/automation.ctp:478
+#: View/Events/automation.ctp:309
+#: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr "Filtre på en given event trussels niveau [1,2,3,4] - ikke sammenlignelige"
 
-#: View/Events/automation.ctp:479
+#: View/Events/automation.ctp:310
+#: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr "Filtre på distributions niveau [0,1,2,3] - ikke sammenlignelige"
 
-#: View/Events/automation.ctp:480
+#: View/Events/automation.ctp:311
+#: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr "Filtre på den givne analyse fase for en event [0,1,2] - ikke sammenlignelige"
 
-#: View/Events/automation.ctp:481
+#: View/Events/automation.ctp:312
+#: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr "Filtre på en indeholdt attribut værdi - ikke sammenlignelige"
 
-#: View/Events/automation.ctp:482
+#: View/Events/automation.ctp:313
+#: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr "Filtre på oprettelses organisationen - ikke sammenlignelige"
 
-#: View/Events/automation.ctp:483
+#: View/Events/automation.ctp:314
+#: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr "Filtre på oprettelses brugerens email adresse (kun admin) - ikke sammenlignelige"
 
-#: View/Events/automation.ctp:484
+#: View/Events/automation.ctp:315
+#: View/Events/legacy_automation.ctp:484
 msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:485
+#: View/Events/automation.ctp:316
+#: View/Events/legacy_automation.ctp:485
 msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr "Filtre på datoen, alt ældre end den givne dato i YYYY-MM-DD-format er taget - non-negatable"
 
+#: View/Events/automation.ctp:319
+msgid "Freetext Import API"
+msgstr ""
+
+#: View/Events/automation.ctp:321
+msgid "The freetext import tool is also exposed to the API."
+msgstr ""
+
+#: View/Events/automation.ctp:322
+msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
+msgstr ""
+
+#: View/Events/automation.ctp:323
+msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:324
+msgid "The contents of the POST body should be the text to be parsed."
+msgstr ""
+
 #: View/Events/contact.ctp:8
 msgid "Contact organization reporting event "
 msgstr "Kontakt organisation der rapporterede event "
@@ -6537,7 +6923,7 @@ msgid "Ongoing"
 msgstr "Igangværende"
 
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:9;101
+#: View/Jobs/index.ctp:9;136
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr "Afsluttet"
@@ -6561,7 +6947,7 @@ msgid "All communities"
 msgstr "Alle communities"
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:53
+#: View/Feeds/index.ctp:103
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr "Mål"
@@ -6613,48 +6999,384 @@ msgstr "Input fil"
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/Organisations/view.ctp:97;98
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:33
 msgid "Events"
 msgstr "Events"
 
-#: View/Events/index.ctp:30
-msgid "Filter events"
-msgstr "Filtrer events"
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
+msgstr "Ændre filtre"
 
-#: View/Events/index.ctp:31
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr "Slet valgte Events"
 
-#: View/Events/index.ctp:44
-msgid "Quickfilter"
-msgstr "Quickfilter"
+#: View/Events/index.ctp:73
+msgid "My events only"
+msgstr "Kun mine events"
 
-#: View/Events/index.ctp:44
-#: View/Organisations/index.ctp:59
-#: View/Servers/preview_index.ctp:45
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr "Mine events"
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr "Kun min organisations events"
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr "Organisations Events"
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
 msgid "Filter"
 msgstr "Filter"
 
-#: View/Events/index.ctp:58
-msgid "My events only"
-msgstr "Kun mine events"
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
+msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My Events"
-msgstr "Mine events"
+#: View/Events/legacy_automation.ctp:3
+msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
+"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgstr ""
 
-#: View/Events/index.ctp:72
-msgid "My organisation's events only"
-msgstr "Kun min organisations events"
+#: View/Events/legacy_automation.ctp:6
+msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgstr "Sørg for at beskytte nøglen, da denne giver adgang til hele databasen!"
 
-#: View/Events/index.ctp:72
-msgid "Org Events"
-msgstr "Organisations Events"
+#: View/Events/legacy_automation.ctp:10
+msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
+msgstr "Siden version 2.2 er brugen af auth-nøglen i URL'en forældet. I stedet skal du sende auth-nøglen i en Authorization header i anmodningen. Den gamle mulighed for at have auth-nøglen i webadressen understøttes midlertidigt, men anbefales ikke."
+
+#: View/Events/legacy_automation.ctp:11
+msgid "Please use the use the following header"
+msgstr "Brug venligst følgende header"
+
+#: View/Events/legacy_automation.ctp:12
+msgid "Authorization"
+msgstr "Bemyndigelse"
+
+#: View/Events/legacy_automation.ctp:13
+msgid "XML Export"
+msgstr "XML Eksport"
+
+#: View/Events/legacy_automation.ctp:14
+msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+msgstr "En automatisk eksport af alle events og attributter <small> (undtagen vedhæftede filer)</ small> er tilgængelig via brugerdefineret XML-format."
+
+#: View/Events/legacy_automation.ctp:15;47;76
+msgid "You can configure your tools to automatically download the following file"
+msgstr "Du kan konfigurere dit værktøj til automatisk at downloade filen"
+
+#: View/Events/legacy_automation.ctp:17
+msgid "If you only want to fetch a specific event append the eventid number"
+msgstr "Hvis du kun ønsker at hente en bestemt event, tilføj eventid nummeret"
+
+#: View/Events/legacy_automation.ctp:19;144
+msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+msgstr "Du kan indsende et XML- eller JSON-objekt, der indeholder yderligere parametre i følgende formater"
+
+#: View/Events/legacy_automation.ctp:26
+msgid "The xml download also accepts two additional the following optional parameters in the URL"
+msgstr "XML download accepterer yderligt to valgfrie parametre i webadressen/URL'en"
+
+#: View/Events/legacy_automation.ctp:29;52;85
+msgid "Restrict the download to a single event"
+msgstr "Begræns download til en enkelt event"
+
+#: View/Events/legacy_automation.ctp:30
+msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+msgstr "Et boolean-felt der afgør, hvorvidt vedhæftninger skal kodes og en 2. parameter, der styrer de kvalificerede tags."
+
+#: View/Events/legacy_automation.ctp:31;54;87;112;134
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr "For at inkludere et tag i resultatet, så skriv dets navn ind i denne parameter. For at udelukke et tag, så sæt et '!' foran.\n"
+"    Du kan også kæde flere tagkommandoer sammen med '&amp;&amp;'. Vær opmærksom på at kolon (:) ikke kan benyttes i tagsøgningen..\n"
+"    Benyt i stedet semikolon (søgningen vil automatisk søge efter kolon i stedet). F.eks.: For at medtage tag1 og tag2, men udelukke tag3, skal du anvende"
+
+#: View/Events/legacy_automation.ctp:43
+msgid "Also check out the %s to read about the REST API."
+msgstr "Se også følgende %s for at læse omkring REST API."
+
+#: View/Events/legacy_automation.ctp:45
+msgid "CSV Export"
+msgstr "CSV Eksport"
+
+#: View/Events/legacy_automation.ctp:46
+msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
+msgstr "Automatisk eksportering af attributter er tilgængelig som CSV. Kun attributter der er markeret med \"to_ids\" eksporteres."
+
+#: View/Events/legacy_automation.ctp:49
+msgid "You can specify additional flags for CSV exports as follows"
+msgstr "Du kan angive yderligere flag til CSV eksport som følger"
+
+#: View/Events/legacy_automation.ctp:53
+msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
+msgstr "Ved at sætte dette flag til 'sandt' vil det inkludere attributter der ikke er markeret \"to_ids\"."
+
+#: View/Events/legacy_automation.ctp:58
+msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
+msgstr "Som et eksempel for kun at downloade en CSV genereret af typen \"domain\" og \"Network activity\" kategori attributter alle events undtagen den ene og den anden begrænser den til events, der er mærket \"tag1\" eller \"tag2\" men ikke \"tag3\", og kun tillader attributter, der er identificeret med IDS, brug følgende syntaks"
+
+#: View/Events/legacy_automation.ctp:63
+msgid "Include the event data with each attribute."
+msgstr "Inkluder event data sammen med hver attribut."
+
+#: View/Events/legacy_automation.ctp:66
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+msgstr "Events offentliggjort inden for den sidste x tid, hvor x kan defineres i dage, timer, minutter (for eksempel 5d eller 12t eller 30m). Dette filter bruger det publicerede tidsstempel for eventen."
+
+#: View/Events/legacy_automation.ctp:67
+msgid "The CSV created when this setting is set to true will not contain the header row.\n"
+"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:71
+msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
+msgstr "For at eksportere attributterne på alle events, der er af typen \"domain\", brug den følgende syntaks"
+
+#: View/Events/legacy_automation.ctp:74
+msgid "NIDS rules export"
+msgstr "eksport af NIDS regler"
+
+#: View/Events/legacy_automation.ctp:75
+msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr "Automatisk eksport af alle netværksrelaterede attributter er tilgængelig under Snort regel formatet. Kun <em>publicerede</em> events og attributter, der er markeret som <em>IDS-signatur</em> eksporteres."
+
+#: View/Events/legacy_automation.ctp:81
+msgid "The full API syntax is as follows"
+msgstr "Det fulde API syntaks ser således ud"
+
+#: View/Events/legacy_automation.ctp:84
+msgid "The export format, can be \"suricata\" or \"snort\""
+msgstr "Eksport formatet kan være \"suricata\" eller \"snort\""
+
+#: View/Events/legacy_automation.ctp:86
+msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
+msgstr "Nogle udkommenterede forklaringer indrammer data. Årsagen til at deaktivere dette ville være, hvis du gerne vil sammenkæde en liste af eksport fra forskellige udvalgte events for at undgå unødvendig duplikering af kommentarer."
+
+#: View/Events/legacy_automation.ctp:93
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr "Events offentliggjort inden for den sidste x tid, hvor x kan defineres i dage, timer, minutter (for eksempel 6d eller 12t eller 30m). Dette filter bruger det publicerede tidsstempel for eventen."
+
+#: View/Events/legacy_automation.ctp:94
+msgid "Restrict the export to only use the given types."
+msgstr "Begræns eksporten til kun at anvende de givne typer."
+
+#: View/Events/legacy_automation.ctp:96
+msgid "All tags will be included even if not exportable."
+msgstr "Alle tags vil blive inkluderet, selvom de er sat til ikke at kunne eksporteres."
+
+#: View/Events/legacy_automation.ctp:98
+msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
+msgstr "Et eksempel på en suricata-eksport for alle events, men udelukker de der er tagget \"tag1\", uden alle de udkommenterede oplysninger i starten af ​​filen, ville se således ud:"
+
+#: View/Events/legacy_automation.ctp:100
+msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
+msgstr "Administrationen kan vedligeholde en white-list indeholdende vært, domænenavn og IP-numre der skal udelukkes fra NIDS-eksporten."
+
+#: View/Events/legacy_automation.ctp:102
+msgid "Hash database export"
+msgstr "Hash database eksport"
+
+#: View/Events/legacy_automation.ctp:103
+msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr "Automatisk eksport af MD5/SHA1 checksums indeholdt i fil relaterede attributter. Denne liste kan bruges til feeds til forensic software, når du søger efter mistænkelige filer. Kun <em>publicerede</em> events og attributter, der er markeret som <em>IDS-signatur</em> eksporteres."
+
+#: View/Events/legacy_automation.ctp:104;188
+msgid "You can configure your tools to automatically download the following files"
+msgstr "Du kan konfigurere dine værktøjer til automatisk at downloade følgende filer"
+
+#: View/Events/legacy_automation.ctp:109
+msgid "The API's full format is as follows"
+msgstr "Det fulde API format ser således ud"
+
+#: View/Events/legacy_automation.ctp:111
+msgid "The export format, can be \"md5\" or \"sha1\""
+msgstr "Eksport formatet kan være \"md5\" eller \"sha1\""
+
+#: View/Events/legacy_automation.ctp:123
+msgid "For example, to only show sha1 values from events tagged tag1, use"
+msgstr "Eksempelvis for kun at vise sha1 værdier fra events tagget tag1 anvend"
+
+#: View/Events/legacy_automation.ctp:126
+msgid "STIX export"
+msgstr "STIX eksport"
+
+#: View/Events/legacy_automation.ctp:127
+msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
+msgstr "Du kan eksportere MISP events i Mitre's STIX format (for at læse mere om STIX, klik <a href=\"https://stix.mitre.org/\"> her </a>). STIX XML eksport er i øjeblikket meget langsom og kan føre til timeouts med større events eller samlinger af events. JSON versionen lider ikke under disse problemer. Anvendelse"
+
+#: View/Events/legacy_automation.ctp:129
+msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
+msgstr "Søge parametre kan sendes til funktionen via URL parametre eller ved POST af et XML eller JSON objekt (afhængigt af returtype). Følgende parametre kan sendes til STIX eksport værktøjet: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Både <code>id</code> og <code>tags</code> kan bruge <code>&amp;&amp;</code> (og) og <code>!</code> forespørgsler. Ved hjælp af URL parametrene er syntaksen som følger"
+
+#: View/Events/legacy_automation.ctp:132;171
+msgid "The event's ID"
+msgstr "Event ID"
+
+#: View/Events/legacy_automation.ctp:133
+msgid "Encode attachments where applicable"
+msgstr "Encode vedhæftelser hvor relevant"
+
+#: View/Events/legacy_automation.ctp:151
+msgid "Various ways to narrow down the search results of the STIX export"
+msgstr "Forskellige måder at indsnævre søge resultaterne af STIX eksporten"
+
+#: View/Events/legacy_automation.ctp:152
+msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
+msgstr "Som eksempel kan du hente alle events, der er markeret \"APT1\", men ekskluderer events, der er markeret \"OSINT\" og eksklusive events #51 og #62 uden vedhæftelser"
+
+#: View/Events/legacy_automation.ctp:154
+msgid "To export the same events using a POST request use"
+msgstr "For at eksporterer samme events ved brug af POST"
+
+#: View/Events/legacy_automation.ctp:156
+msgid "Together with this JSON object in the POST message"
+msgstr "Sammen med dette JSON objekt i POST beskeden"
+
+#: View/Events/legacy_automation.ctp:158
+msgid "XML is automagically assumed when using the stix export"
+msgstr "XML anvendes som standard automatisk, når du bruger STIX eksporten"
+
+#: View/Events/legacy_automation.ctp:160
+msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
+msgstr "Den samme søgning kunne udføres ved hjælp af følgende POSTede XML objekt (bemærk at ampersand-tegn skal escapes, eller alternativt kan separate ID og tag elementer bruges)"
+
+#: View/Events/legacy_automation.ctp:163
+msgid "RPZ export"
+msgstr "RPZ eksport"
+
+#: View/Events/legacy_automation.ctp:165
+msgid "It is possible to further restrict the exported values using the following filters"
+msgstr "Det er muligt at begrænse de eksporterede værdier yderligere ved hjælp af følgende filtre"
+
+#: View/Events/legacy_automation.ctp:167
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
+"        "
+msgstr "For at medtage et tag i resultaterne, så skriv dets navn ind i denne parameter. For at udelukke et tag, så sæt et '!' foran..\n"
+"            Du kan også sammenkæde flere tagkommandoer med opratøren '&amp;&amp;'. Bemærk, at kolon (:) ikke kan benyttes i tagsøgningen, når det udgør en del af URL'en.\n"
+"\t        "
+
+#: View/Events/legacy_automation.ctp:170
+msgid "Use semicolons instead (the search will automatically search for colons instead)"
+msgstr "Benyt i stedet semikoloner (søgningen vil automatisk søge efter koloner i stedet)"
+
+#: View/Events/legacy_automation.ctp:172
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
+msgstr "Begivenheder med datoangivelser efter den, der er angivet i fra-feltet (format: 2015-02-03)"
+
+#: View/Events/legacy_automation.ctp:173
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
+msgstr "Begivenheder med datoangivelser før den, der er angivet i til-feltet (format: 2015-02-03)"
+
+#: View/Events/legacy_automation.ctp:186
+msgid "Text export"
+msgstr "Tekst eksport"
+
+#: View/Events/legacy_automation.ctp:187
+msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
+msgstr "> En eksport af alle attributter af en bestemt type til en tekst fil. Som standard eksporteres kun offentliggjorte og IDS-flagede attributter."
+
+#: View/Events/legacy_automation.ctp:194
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
+msgstr "For at begrænse resultaterne med tags skal du bruge de sædvanlige syntakser. Vær opmærksom på kolon (:) kan ikke bruges i tag søgning. Brug semikolon i stedet (søgningen vil automatisk søge efter kolon i stedet). For at få ip-src værdier fra events tagget tag1 men ikke tag2 brug"
+
+#: View/Events/legacy_automation.ctp:197
+msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
+msgstr "Fra version 2.3.38 er det muligt at begrænse tekst eksport med yderligt to flag. Den første giver brugeren mulighed for at begrænse baseret på event ID, mens den anden er en boolean switch, der medtager ikke-IDS-flagede attributter i eksporten. Hvis du vælger \"alle\" i typefeltet, returneres alle matchende attributter."
+
+#: View/Events/legacy_automation.ctp:201
+msgid "Only export the attributes of the given event ID"
+msgstr "Eksporter kun attributter fra den pågældende event ID"
+
+#: View/Events/legacy_automation.ctp:202
+msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+msgstr "Inkluder attributter, der ikke er markeret med to_ids, selvom de normalt ikke ville blive udelukket. Tilsidesætter også whitelist funktionaliteten."
+
+#: View/Events/legacy_automation.ctp:207
+msgid "Include not published Events."
+msgstr "Inkluder events der ikke er publicerede."
+
+#: View/Events/legacy_automation.ctp:208;275
+msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr "Du kan også sammenkæde flere tagkommandoer med &amp;&amp;-operatoren. Vær opmærksom på, at kolon (:) ikke kan benyttes i tag-søgning.\n"
+"    Benyt i stedet somikolon (søgningen vil automatisk søge efter koloner i stedet). For f.eks. at medtage tag1 og tag2, men udelukke tag3, skal du benytte"
+
+#: View/Events/legacy_automation.ctp:263
+msgid "Searches with JSON/XML/OpenIOC results"
+msgstr "Søgninger med JSON/XML/OpenIOC resultater"
+
+#: View/Events/legacy_automation.ctp:267
+msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
+msgstr "Indstil retur formatet for søgningen (For øjeblikket understøttes: JSON, XML, OpenIOC - flere formater kommer snart)."
+
+#: View/Events/legacy_automation.ctp:272
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr "Begræns resultaterne baseret på sidste publicerings tids stempel (nyere end)."
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr "Begræns resultaterne ved hjælp af tidsstempel (sidste redigering). Enhver begivenhed med en tidstempel nyere end den givne tidsstempel vil blive returneret. Hvis du beskæftiger dig med / attributter som anvendelsesområde, vil attributets tidsstempel blive brugt til opslaget."
+
+#: View/Events/legacy_automation.ctp:291
+msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:296
+msgid "To just return a list of attributes, use the following syntax"
+msgstr "For kun at returnere en liste af attributter, anvend følgende syntaks"
+
+#: View/Events/legacy_automation.ctp:304
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
+msgstr "Events med datoen sat til en dato efter den der blev specificeret i fra feltet (format: 2015-02-15)"
+
+#: View/Events/legacy_automation.ctp:305
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
+msgstr "Events med datoen sat til en dato før den angivne i feltet til (format: 2015-02-15)"
+
+#: View/Events/legacy_automation.ctp:312
+msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
+msgstr "Begræns resultaterne ved hjælp af tidsstempel (på attributten). Eventuelle attributter med et tidsstempel nyere end den angivne tidsstempel returneres."
+
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr "Returner kun attributter fra events, der har modtaget en ændring efter den angivne tidsstempel."
+
+#: View/Events/legacy_automation.ctp:322
+msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:324
+msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
+"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:327
+msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
+msgstr ""
 
 #: View/Events/merge.ctp:4
 msgid "Merge events"
@@ -6679,19 +7401,19 @@ msgid "Proposals"
 msgstr "Forslag"
 
 #: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:93
+#: View/Events/view.ctp:106
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr "Bidragydere"
 
 #: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:113
-#: View/Jobs/index.ctp:65
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
 #: View/Logs/admin_search.ctp:6
 #: View/Pages/doc/administration.ctp:87;104;116;181;195
 #: View/Pages/doc/using_the_system.ctp:166
-#: View/Users/admin_view.ctp:24
-#: View/Users/view.ctp:9
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
 msgid "Email"
 msgstr "Email"
 
@@ -6769,11 +7491,8 @@ msgid "Successfully added attributes"
 msgstr "Korrekte tilføjede attributter"
 
 #: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Events/view.ctp:56
 #: View/Feeds/preview_event.ctp:11
 #: View/Galaxies/view.ctp:18
-#: View/ObjectTemplates/view.ctp:15
-#: View/Organisations/view.ctp:54
 #: View/Organisations/ajax/merge.ctp:58
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
@@ -6796,6 +7515,14 @@ msgstr "Indhold"
 msgid "Visualisation"
 msgstr "Visualisering"
 
+#: View/Events/upload_analysis_file.ctp:6
+msgid "Import analysis file"
+msgstr ""
+
+#: View/Events/upload_analysis_file.ctp:61
+msgid "Create Objects"
+msgstr ""
+
 #: View/Events/upload_stix.ctp:6
 msgid "Import %s file"
 msgstr "Importer %s fil"
@@ -6804,193 +7531,186 @@ msgstr "Importer %s fil"
 msgid "%s file"
 msgstr "%s fil"
 
-#: View/Events/view.ctp:49
-msgid "Extended view"
-msgstr "Udvidet visning"
+#: View/Events/upload_stix.ctp:24
+msgid "Include the original imported file as attachment"
+msgstr ""
 
-#: View/Events/view.ctp:51
+#: View/Events/view.ctp:53
 #: View/Servers/preview_event.ctp:12
 #: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Event ID"
 msgstr "Event ID"
 
-#: View/Events/view.ctp:63
+#: View/Events/view.ctp:57
 msgid "Source Organisation"
 msgstr "Kilde organisation"
 
-#: View/Events/view.ctp:68
+#: View/Events/view.ctp:66
 msgid "Member Organisation"
 msgstr "Medlems organisation"
 
-#: View/Events/view.ctp:83
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
 msgid "Owner org"
 msgstr "Ejer organisation"
 
-#: View/Events/view.ctp:131
+#: View/Events/view.ctp:135
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
 #: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
 msgstr "Trussels niveau"
 
-#: View/Events/view.ctp:139
+#: View/Events/view.ctp:140
 #: View/Feeds/preview_event.ctp:37
 #: View/Pages/doc/using_the_system.ctp:70;177;210
 #: View/Servers/preview_event.ctp:48
 msgid "Analysis"
 msgstr "Analyse"
 
-#: View/Events/view.ctp:159
+#: View/Events/view.ctp:161
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr "Info"
 
-#: View/Events/view.ctp:165;167
+#: View/Events/view.ctp:165
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
 msgstr "Publiceret"
 
-#: View/Events/view.ctp:169
+#: View/Events/view.ctp:173
 msgid "#Attributes"
 msgstr "#Attributter"
 
-#: View/Events/view.ctp:171
+#: View/Events/view.ctp:177
+msgid "First recorded change"
+msgstr ""
+
+#: View/Events/view.ctp:181
 msgid "Last change"
 msgstr "Sidst ændret"
 
-#: View/Events/view.ctp:176
+#: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
 msgid "Extends"
 msgstr "Udvider"
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:210
 msgid "Extended by"
 msgstr "Udvidet af"
 
-#: View/Events/view.ctp:194
-msgid "Currently in "
-msgstr "For øjeblikket i "
+#: View/Events/view.ctp:217
+msgid "extended"
+msgstr ""
 
-#: View/Events/view.ctp:202
-msgid "- restricted to own organisation only."
-msgstr "- Begræns kun til egen organisation."
+#: View/Events/view.ctp:217
+msgid "atomic"
+msgstr ""
 
-#: View/Events/view.ctp:203
-msgid "Advanced Sightings"
-msgstr "Avancerede observationer"
-
-#: View/Events/view.ctp:219
-msgid "you"
-msgstr "du"
-
-#: View/Events/view.ctp:220
-msgid " has"
-msgstr " har"
-
-#: View/Events/view.ctp:223
-msgid "You have"
-msgstr "Du har"
-
-#: View/Events/view.ctp:226
+#: View/Events/view.ctp:265
 msgid "Delegation request"
 msgstr "Delegations forespørgsel"
 
-#: View/Events/view.ctp:227
-msgid "%s requested that %s take over this event."
-msgstr "%s anmodeder om, at %s overtager denne event."
-
-#: View/Events/view.ctp:227
+#: View/Events/view.ctp:277
 msgid "View request details"
 msgstr "Se anmodnings detaljer"
 
-#: View/Events/view.ctp:232
-msgid "Correlation"
-msgstr "Korrelation"
-
-#: View/Events/view.ctp:238;247
-#: View/Users/admin_view.ctp:125
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
 msgid "Disabled"
 msgstr "Deaktiveret"
 
-#: View/Events/view.ctp:238
-msgid "enable"
-msgstr "aktiver"
-
-#: View/Events/view.ctp:242;249
-#: View/ObjectTemplates/index.ctp:32
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
 #: View/Taxonomies/view.ctp:24
-#: View/Warninglists/view.ctp:38
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: View/Events/view.ctp:242
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr "aktiver"
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr "deaktiveret"
 
-#: View/Events/view.ctp:277
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr "Udvidet visning"
+
+#: View/Events/view.ctp:328
 msgid "Show (%s more)"
 msgstr "Vis (%s mere)"
 
-#: View/Events/view.ctp:335
+#: View/Events/view.ctp:386;415
 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."
+#: View/Events/view.ctp:387;416
+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
+#: View/Events/view.ctp:424
 msgid "Warning: Potential false positives"
 msgstr "Advarsel: Potentielle falsk-positiver"
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Toggle pivot graph"
 msgstr "Skift pivotgraf"
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Pivots"
 msgstr "Pivots"
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Toggle galaxies"
 msgstr "Skift galaxies"
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Galaxy"
 msgstr "Galaxy"
 
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Toggle Event graph"
 msgstr "Skift event graf"
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Toggle Correlation graph"
 msgstr "Skift korrelations graf"
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Correlation graph"
 msgstr "Korrelations graf"
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "Toggle ATT&CK matrix"
 msgstr "Skift ATT&CK matrix"
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "ATT&CK matrix"
 msgstr "ATT&CK matrix"
 
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 msgid "Toggle attributes"
 msgstr "Skift attributter"
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Toggle discussions"
 msgstr "Skift diskussioner"
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Discussion"
 msgstr "Diskussion"
 
@@ -7026,16 +7746,24 @@ msgstr "Er du sikker på at du ønsker at slette "
 msgid " Event #"
 msgstr " Event #"
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:7
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:6
 msgid "Publish Event%s"
 msgstr "Publicer Event%s"
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:8
+msgid "Unpublish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:20
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr "Publicer men send IKKE alert mail? Anvendes kun til mindre ændringer!"
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
-#: View/Feeds/index.ctp:54
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Feeds/index.ctp:104
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -7045,10 +7773,6 @@ msgstr "Publicer"
 msgid "Choose the format that you wish to download the event in"
 msgstr "Vælg det format som du ønsker at downloade eventen i"
 
-#: View/Events/ajax/exportChoice.ctp:17;18;27;28
-msgid "Export as %s"
-msgstr "Eksporter som %s"
-
 #: View/Events/ajax/importChoice.ctp:2
 msgid "Choose the format that you would like to use for the import"
 msgstr "Vælg det format som ønskes anvendt ved import"
@@ -7219,7 +7943,7 @@ msgstr "Hvis markeret, vil IDS flagene altid blive fjernet når du henter dette
 
 #: View/Feeds/add.ctp:156
 #: View/Feeds/edit.ctp:153
-#: View/Feeds/index.ctp:55
+#: View/Feeds/index.ctp:105
 msgid "Delta Merge"
 msgstr "Delta Flet"
 
@@ -7260,16 +7984,16 @@ msgstr "Events med følgende organisation er blokeret"
 
 #: View/Feeds/add.ctp:196
 #: View/Feeds/edit.ctp:191
-#: View/Servers/add.ctp:113
-#: View/Servers/edit.ctp:152;158
+#: View/Servers/add.ctp:102
+#: View/Servers/edit.ctp:147;153
 msgid "Modify"
 msgstr "Ændre"
 
-#: View/Feeds/compare_feeds.ctp:58
+#: View/Feeds/compare_feeds.ctp:66
 msgid "None or less than 1% of the data of %s is contained in %s (%s matching values)"
 msgstr "Ingen eller mindre en 1% af data i %s er også i %s (%s matching værdier)"
 
-#: View/Feeds/compare_feeds.ctp:59
+#: View/Feeds/compare_feeds.ctp:67
 msgid "%s\\% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
@@ -7290,53 +8014,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr "Basis URL'en til den eksterne server, du ønsker at synkronisere med. Eksempel: https://misppriv.circl.lu"
 
 #: View/Feeds/edit.ctp:207
-#: View/Servers/add.ctp:143
-#: View/Servers/edit.ctp:186
+#: View/Servers/add.ctp:132
+#: View/Servers/edit.ctp:181
 msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
 msgstr "Et navn, der gør det klart for dine brugere, hvad denne instans er. For eksempel: Organisation A's instans"
 
 #: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:185
+#: View/Servers/add.ctp:133
+#: View/Servers/edit.ctp:180
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr "Organisationen der har den eksterne server, du vil synkronisere med. Eksempel: BE"
 
 #: View/Feeds/edit.ctp:209
-#: View/Servers/add.ctp:145
-#: View/Servers/edit.ctp:187
+#: View/Servers/add.ctp:134
+#: View/Servers/edit.ctp:182
 msgid "You can find the authentication key on your profile on the external server."
 msgstr "Du kan finde auth-nøglen under din profil på den eksterne server."
 
 #: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:146
-#: View/Servers/edit.ctp:188
+#: View/Servers/add.ctp:135
+#: View/Servers/edit.ctp:183
 msgid "Allow the upload of events and their attributes."
 msgstr "Tillad upload af events og deres attributter."
 
 #: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:189
+#: View/Servers/add.ctp:136
+#: View/Servers/edit.ctp:184
 msgid "Allow the download of events and their attributes from the server."
 msgstr "Tillad download af events og deres attributter fra serveren."
 
 #: View/Feeds/edit.ctp:212
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:185
 msgid "Unpublish new event (working with Push event)."
 msgstr "Unpublish nye events (arbejder med push-events)."
 
 #: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:191
+#: View/Servers/edit.ctp:186
 msgid "Publish new event without email (working with Pull event)."
 msgstr "Publicer nye events uden email (arbejder med Push-events)."
 
 #: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:192
+#: View/Servers/edit.ctp:187
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority."
 msgstr "Du kan også uploade en certifikatfil, hvis den instans, du forsøger at oprette forbindelse til, har sin egen signing authority."
 
 #: View/Feeds/edit.ctp:215
-#: View/Servers/add.ctp:151
-#: View/Servers/edit.ctp:194
+#: View/Servers/add.ctp:140
+#: View/Servers/edit.ctp:189
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr "Klik på dette, hvis du gerne vil tillade en forbindelse til trods for at den anden instans anvender self-signed certifikat (anbefales ikke)."
 
@@ -7388,130 +8112,104 @@ msgstr "Cache MISP feeds"
 msgid "Fetch and store all feed data"
 msgstr "Hent og gem alle feed data"
 
-#: View/Feeds/index.ctp:27
+#: View/Feeds/index.ctp:33
 msgid "Enable selected"
 msgstr "Aktivér valgte"
 
-#: View/Feeds/index.ctp:27
-msgid "Enable Selected"
-msgstr "Aktivér valgte"
-
-#: View/Feeds/index.ctp:28
+#: View/Feeds/index.ctp:39
 msgid "Disable selected"
 msgstr "Deaktiver valgte"
 
-#: View/Feeds/index.ctp:28
-msgid "Disable Selected"
-msgstr "Deaktiver valgte"
-
-#: View/Feeds/index.ctp:29
+#: View/Feeds/index.ctp:45
 msgid "Enable caching for selected"
 msgstr "Aktiver caching for det valgte"
 
-#: View/Feeds/index.ctp:29
-msgid "Enable Caching for Selected"
-msgstr "Aktiver caching for det valgte"
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:51
 msgid "Disable caching for selected"
 msgstr "Deaktiver caching for det valgte"
 
-#: View/Feeds/index.ctp:30
-msgid "Disable Caching for  Selected"
-msgstr "Deaktiver caching for det valgte"
-
-#: View/Feeds/index.ctp:30
-msgid "Default feeds filter"
-msgstr "Standard feed filter"
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:61
 msgid "Default feeds"
 msgstr "Standard feeds"
 
-#: View/Feeds/index.ctp:31
-msgid "Custom feeds filter"
-msgstr "Brugerdefineret feeds filter"
-
-#: View/Feeds/index.ctp:31
+#: View/Feeds/index.ctp:66
 msgid "Custom feeds"
 msgstr "Brugerdefineret feeds"
 
-#: View/Feeds/index.ctp:31
-msgid "Custom Feeds"
-msgstr "Brugerdefineret Feeds"
-
-#: View/Feeds/index.ctp:32
+#: View/Feeds/index.ctp:71
 msgid "All feeds"
 msgstr "Alle Feeds"
 
-#: View/Feeds/index.ctp:32
-msgid "All Feeds"
-msgstr "Alle Feeds"
-
-#: View/Feeds/index.ctp:33
+#: View/Feeds/index.ctp:76
 msgid "Enabled feeds"
 msgstr "Aktiverede feeds"
 
-#: View/Feeds/index.ctp:33
-msgid "Enabled Feeds"
-msgstr "Aktiverede Feeds"
+#: View/Feeds/index.ctp:95
+msgid "Enable pulling the feed into your MISP as events/attributes."
+msgstr ""
 
-#: View/Feeds/index.ctp:48
+#: View/Feeds/index.ctp:96
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:98
 msgid "Feed Format"
 msgstr "Feed Format"
 
-#: View/Feeds/index.ctp:50
-#: View/Jobs/index.ctp:76
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr "Input"
 
-#: View/Feeds/index.ctp:56
+#: View/Feeds/index.ctp:106
 msgid "Override IDS"
 msgstr "Override IDS"
 
-#: View/Feeds/index.ctp:60
+#: View/Feeds/index.ctp:110
 msgid "Caching"
 msgstr "Caching"
 
-#: View/Feeds/index.ctp:108
-#: View/Servers/index.ctp:73;74
+#: View/Feeds/index.ctp:158
+#: View/Servers/index.ctp:74;75
 msgid "Rules"
 msgstr "Regler"
 
-#: View/Feeds/index.ctp:135
+#: View/Feeds/index.ctp:185
 msgid "Error: Invalid event!"
 msgstr "Fejl: Ugyldig event!"
 
-#: View/Feeds/index.ctp:140
+#: View/Feeds/index.ctp:190
 msgid "Fixed event %s"
 msgstr "Rettet event %s"
 
-#: View/Feeds/index.ctp:143
+#: View/Feeds/index.ctp:193
 msgid "New fixed event"
 msgstr "Ny rettet event"
 
-#: View/Feeds/index.ctp:195
+#: View/Feeds/index.ctp:245
+#: View/Servers/index.ctp:94
 msgid "Age: "
 msgstr "Alder: "
 
-#: View/Feeds/index.ctp:197
+#: View/Feeds/index.ctp:247
+#: View/Servers/index.ctp:102
 msgid "Not cached"
 msgstr "Ikke cached"
 
-#: View/Feeds/index.ctp:208
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr "Udforsk eventen eksternt"
 
-#: View/Feeds/index.ctp:210
+#: View/Feeds/index.ctp:260
 msgid "Fetch all events"
 msgstr "Hent alle events"
 
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 msgid "Are you sure you want to permanently remove the feed (%s)?"
 msgstr "Er du sikker på, at du permanent vil fjerne feedet (%s)?"
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:267
 msgid "Download feed metadata as JSON"
 msgstr "Download feed metadata som JSON"
 
@@ -7533,47 +8231,31 @@ msgid "Namespace"
 msgstr "Namespace"
 
 #: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:17
+#: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:19
+#: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr "Version"
 
-#: View/Galaxies/ajax/cluster_choice.ctp:2
-msgid "Select Cluster"
-msgstr "Vælg Cluster"
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
+msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:11
-msgid "search clusters…"
-msgstr "søg clusters…"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "Galaxy Cluster Deletion"
+msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:28
-msgid "Back to Galaxy Selection"
-msgstr "Tilbage til Galaxy valg"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies."
+msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:2
-msgid "Select Cluster Source"
-msgstr "Vælg Cluster kilde"
+#: View/GalaxyClusters/ajax/index.ctp:82
+msgid "Delete galaxy cluster"
+msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All clusters"
-msgstr "Alle clusters"
-
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All Galaxies"
-msgstr "Alle Galaxies"
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:2
-msgid "Select Galaxy Namespace Source"
-msgstr "Vælg Galaxy Namespace kilde"
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All namespaces"
-msgstr "Alle namespaces"
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All Namespaces"
-msgstr "Alle namespaces"
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
+msgstr ""
 
 #: View/Jobs/index.ctp:12
 msgid "Are you sure you want to purge all completed job entries? Job entries are considered as log entries and have no impact on actual job execution."
@@ -7587,37 +8269,37 @@ msgstr "Er du sikker på at du vil fjerne alle job linjer? Job linjer nævnt her
 msgid "Completed."
 msgstr "Færdig."
 
-#: View/Jobs/index.ctp:63
+#: View/Jobs/index.ctp:68;98
 msgid "Show all queues"
 msgstr "Vis alle køer"
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:74;99
 msgid "Show default queue"
 msgstr "Vis standard køen"
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr "Vis email kø"
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr "Vis cache kø"
+
+#: View/Jobs/index.ctp:99
 #: View/Roles/admin_index.ctp:22
 #: View/Roles/index.ctp:22
 msgid "Default"
 msgstr "Standard"
 
-#: View/Jobs/index.ctp:65
-msgid "Show email queue"
-msgstr "Vis email kø"
-
-#: View/Jobs/index.ctp:66
-msgid "Show cache queue"
-msgstr "Vis cache kø"
-
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:101
 msgid "Cache"
 msgstr "Cache"
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:127
 msgid "No worker active"
 msgstr "Ingen worker aktiv"
 
-#: View/Jobs/index.ctp:124
+#: View/Jobs/index.ctp:159
 msgid "View stacktrace"
 msgstr "Vis stacktrace"
 
@@ -7637,10 +8319,6 @@ msgstr "Klik her for at gemme stack trace"
 msgid "No error data found. Generally job error data is purged from Redis after 24 hours, however, you can still view the errors in the log files in \"/app/tmp/logs\"."
 msgstr "Ingen fejldata fundet. Generelt bliver job fejldata renset fra Redis efter 24 timer, men du kan fortsat se fejlene i logfilerne i \"/app/tmp/logs\"."
 
-#: View/Jobs/ajax/error.ctp:34
-msgid "Close"
-msgstr "Luk"
-
 #: View/Logs/admin_index.ctp:2
 #: View/Logs/event_index.ctp:6
 msgid "Logs"
@@ -7682,22 +8360,20 @@ msgstr "inkluderet ændringen"
 msgid "from IP"
 msgstr "fra IP"
 
-#: View/Logs/admin_index.ctp:20;21
-msgid "Search"
-msgstr "Søg"
-
-#: View/Logs/admin_index.ctp:59
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr "Model ID"
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:50
-#: View/ObjectTemplates/view.ctp:13
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/Templates/view.ctp:33
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
 msgstr "Organisation"
 
@@ -7783,12 +8459,12 @@ msgstr "Relations type"
 msgid "Target UUID"
 msgstr "Mål UUID"
 
-#: View/ObjectReferences/ajax/add.ctp:53
+#: View/ObjectReferences/ajax/add.ctp:54
 #: View/Objects/orphaned_object_diagnostics.ctp:38
 msgid "Object"
 msgstr "Objekt"
 
-#: View/ObjectReferences/ajax/add.ctp:68
+#: View/ObjectReferences/ajax/add.ctp:120
 msgid "Target Details"
 msgstr "Mål Detaljer"
 
@@ -7809,7 +8485,7 @@ msgid " The Attribute will be permanently deleted and unrecoverable. Also, this
 msgstr " Attributten bliver permanent slettet. Dette forhindrer også, at sletningen overføres til andre instanser."
 
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:24
-#: View/Pages/doc/categories_and_types.ctp:46
+#: View/Pages/doc/categories_and_types.ctp:40
 #: View/Pages/doc/md/categories_and_types.ctp:23
 msgid "Categories"
 msgstr "Kategorier"
@@ -7830,43 +8506,35 @@ msgstr "Deaktiver korrelation"
 msgid "Object Template index"
 msgstr "Objekt skabelon indeks"
 
-#: View/ObjectTemplates/index.ctp:54
-#: View/ObjectTemplates/view.ctp:23
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr "Krav"
 
-#: View/ObjectTemplates/index.ctp:107
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr "Er du sikker på, at du vil tvinge en opdatering til skabelon # %s?"
 
-#: View/ObjectTemplates/index.ctp:108
+#: View/ObjectTemplates/index.ctp:119
 msgid "Are you sure you want to delete template # %s?"
 msgstr "Er du sikker på at du vil slette skabelon # %s?"
 
-#: View/ObjectTemplates/view.ctp:7
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr "ID"
+
+#: View/ObjectTemplates/view.ctp:33
 msgid " Object Template"
 msgstr " Objekt skabelon"
 
-#: View/ObjectTemplates/view.ctp:9
-msgid "Object Template ID"
-msgstr "Objekt skabelon ID"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:2
-msgid "Select Object Category"
-msgstr "Vælg objekt kategori"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All meta-categories"
-msgstr "Alle metakategorier"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All Objects"
-msgstr "Alle objekter"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:50
-msgid "Back to categories"
-msgstr "Tilbage til kategorier"
-
 #: View/Objects/add.ctp:6
 msgid " Object"
 msgstr " Objekt"
@@ -7943,15 +8611,6 @@ msgstr "Sørg for, at nedenstående objekt afspejler din forventning, inden du s
 msgid "To IDS"
 msgstr "Til IDS"
 
-#: View/Objects/revise_object.ctp:49
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/ajax/merge.ctp:65
-#: View/SharingGroups/add.ctp:32
-#: View/SharingGroups/edit.ctp:32
-msgid "UUID"
-msgstr "UUID"
-
 #: View/Objects/ajax/delete.ctp:6
 msgid "Object Deletion"
 msgstr "Objekt sletning"
@@ -7973,6 +8632,7 @@ msgid "Simply paste a list of all the organisation UUIDs that you wish to block
 msgstr "Indsæt en liste over alle organisationens UUID'er, som du vil blokere fra at blive indtastet fremover."
 
 #: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr "Organisations navn"
 
@@ -8097,9 +8757,9 @@ msgstr "En organisation med ovenstående UUID eksisterer allerede. Vil du gerne
 msgid "Click here"
 msgstr "Klik her"
 
-#: View/Organisations/index.ctp:5
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:51
+#: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr "Alle organisationer"
@@ -8108,7 +8768,7 @@ msgstr "Alle organisationer"
 msgid ", both local and remote"
 msgstr ", både lokalt og remote"
 
-#: View/Organisations/index.ctp:9
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr "Kendte fjern organisationer"
@@ -8117,7 +8777,7 @@ msgstr "Kendte fjern organisationer"
 msgid " on other instances"
 msgstr " på andre MISP instanser"
 
-#: View/Organisations/index.ctp:13
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr "Lokale organisationer"
@@ -8134,55 +8794,52 @@ msgstr "Sideinddeling"
 msgid "View all"
 msgstr "Se alle"
 
-#: View/Organisations/index.ctp:65
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:30
 msgid "Logo"
 msgstr "Logo"
 
-#: View/Organisations/index.ctp:76
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr "Tilføjet af"
 
-#: View/Organisations/index.ctp:117
+#: View/Organisations/index.ctp:138
 #: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 ""
 
-#: View/Organisations/view.ctp:3
-msgid "Organisation "
-msgstr "Organisation "
-
-#: View/Organisations/view.ctp:7
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:4
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/Users/admin_view.ctp:9
-#: View/Users/view.ctp:4
-#: View/Warninglists/view.ctp:4
-msgid "Id"
-msgstr "ID"
-
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr "Lokal eller fjern"
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:12
 #: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr "Lokal"
 
-#: View/Organisations/view.ctp:26
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr "Fjern"
 
-#: View/Organisations/view.ctp:40
-msgid "E-mail domain restrictions"
-msgstr "E-mail domæne begrænsninger"
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
+msgstr ""
 
-#: View/Organisations/view.ctp:93;94
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr "Organisation "
+
+#: View/Organisations/view.ctp:62;63
 msgid "Members"
 msgstr "Medlemmer"
 
@@ -8195,7 +8852,6 @@ msgid "Available Organisations"
 msgstr "Tilgængelige organisationer"
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
 msgid "Added Organisations"
 msgstr "Tilføjede organisationer"
 
@@ -8260,6 +8916,14 @@ msgstr "Nulstil attribut tæller"
 msgid "Events need to have no validation issues"
 msgstr "Begivenheder må ikke have valideringsproblemer"
 
+#: View/Pages/administration.ctp:15
+msgid "Recorrelate attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:16
+msgid "Recorrelate proposals"
+msgstr ""
+
 #: View/Pages/administration.ctp:18
 msgid "Verify Certificates"
 msgstr "Bekræft certifikater"
@@ -8276,6 +8940,10 @@ msgstr "Udvid organisationens længde"
 msgid "Hotfix 2.3.57: Increase the max length of the organization field when adding a new server connection."
 msgstr "Hotfix 2.3.57: Øg den maksimale længde af organisations feltet, når du tilføjer en ny server forbindelse."
 
+#: View/Pages/administration.ctp:20
+msgid "Convert log fields to text"
+msgstr ""
+
 #: View/Pages/administration.ctp:20
 msgid "Hotfix 2.3.78: Some of the log fields that were varchar(255) ended up truncating the data. This function will change them to \"text\""
 msgstr "Hotfix 2.3.78: Nogle af de log felter, der var varchar(255), endte med at afkorte dataene. Denne funktion vil ændre dem til \"text\""
@@ -8288,18 +8956,34 @@ msgstr "Ret duplikerede UUID'er"
 msgid "Hotfix 2.3.107: it was previously possible to get duplicate attribute UUIDs in the database, this script will remove all duplicates and ensure that duplicates will not be entered into the database in the future."
 msgstr "Hotfix 2.3.107: Det var tidligere muligt at få duplikerede attribut UUID'er i databasen, dette script fjerner alle dubletter og sikrer, at duplikater ikke kan blive indsat i databasen i fremtiden."
 
+#: View/Pages/administration.ctp:22
+msgid "Remove duplicate events (with the same UUID)"
+msgstr ""
+
 #: View/Pages/administration.ctp:22
 msgid "Hotfix 2.3.115: In some rare situations it could occur that a duplicate of an event was created on an instance, with the exact same uuid. This action will remove any such duplicates and make sure that this cannot happen again."
 msgstr "Hotfix 2.3.115: I nogle sjældne tilfælde kan det forekomme, at en dublet af en event blev oprettet i en MISP instans, med nøjagtig samme uuid. Denne handling fjerner sådanne dubletter og sørger for, at det ikke kan ske i fremtiden."
 
+#: View/Pages/administration.ctp:23
+msgid "Prune orphaned attributes"
+msgstr ""
+
 #: View/Pages/administration.ctp:23
 msgid "In some rare occasions it can happen that you end up with some attributes in your database that do not belong to an event - for example during a race condition between an event insert and a delete. This tool will collect and delete any such orphaned attributes. If you ever run into an issue where you cannot add an attribute with a specific valid value, this is probably the reason."
 msgstr "I nogle sjældne tilfælde kan det ske, at du ender med nogle attributter i din database, der ikke tilhører en event - for eksempel under en race-condition mellem en event indsætning og sletning. Dette værktøj samler og sletter sådanne forældreløse attributter. Hvis du nogensinde løber ind i et problem, hvor du ikke kan tilføje en attribut med en bestemt gyldig værdi, er det nok årsagen."
 
+#: View/Pages/administration.ctp:24
+msgid "Clean regex table of potentially malicious entries"
+msgstr ""
+
 #: View/Pages/administration.ctp:24
 msgid "Hotfix 2.3.160: Prior to this version it was possible for a user/admin with Regex permission to create a malicious regular expression that could be used to execute arbitrary code. Since this version it is no longer possible to input such expressions, but already existing malicious entries still have to be cleaned using this tool."
 msgstr "Hotfix 2.3.160: Før denne version var det muligt for en bruger / administrator at få Regex tilladelse til at oprette et ondsindet regulært udtryk, der kunne bruges til at udføre vilkårlig kode. Siden denne version er det ikke længere muligt at indtaste sådanne udtryk, men allerede eksisterende skadelige poster skal stadig rengøres ved hjælp af dette værktøj."
 
+#: View/Pages/administration.ctp:25
+msgid "Remove URL type attribute sanitisation"
+msgstr ""
+
 #: View/Pages/administration.ctp:25
 msgid "Hotfix 2.3.173: Sanitised URLs can cause issues with the NIDS exports and as of this version attributes will be modified on entry to correct this. To correct existing entries, run this script."
 msgstr "Hotfix 2.3.173: Saniterede URLs kan forårsage problemer med NIDS eksporten, fra denne version bliver attributter ændret ved indtastning for at rette dette. For at rette eksisterende poster skal du køre dette script."
@@ -8353,7 +9037,6 @@ msgid "If the migration of your data from 2.4 is not complete this will lead to
 msgstr "Hvis migrering af dine data fra 2.4 ikke er færdig, kan dette føre til tab af data. Det anbefales stærkt at lave backup af databasen. Er du klar til at begynde at fjerne de forældede felter?"
 
 #: View/Pages/doc/administration.ctp:3
-#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:3
 #: View/Pages/doc/general.ctp:3
 #: View/Pages/doc/quickstart.ctp:3;14
@@ -8363,7 +9046,6 @@ msgid "Quick Start"
 msgstr "Hurtig start"
 
 #: View/Pages/doc/administration.ctp:4
-#: View/Pages/doc/categories_and_types.ctp:4
 #: View/Pages/doc/concepts.ctp:4
 #: View/Pages/doc/general.ctp:4;14
 #: View/Pages/doc/quickstart.ctp:4
@@ -8373,7 +9055,6 @@ msgid "General Layout"
 msgstr "Generelt layout"
 
 #: View/Pages/doc/administration.ctp:5
-#: View/Pages/doc/categories_and_types.ctp:5
 #: View/Pages/doc/concepts.ctp:5;14
 #: View/Pages/doc/general.ctp:5
 #: View/Pages/doc/quickstart.ctp:5
@@ -8383,7 +9064,6 @@ msgid "General Concepts"
 msgstr "Generelle begreber"
 
 #: View/Pages/doc/administration.ctp:6
-#: View/Pages/doc/categories_and_types.ctp:6
 #: View/Pages/doc/concepts.ctp:6
 #: View/Pages/doc/general.ctp:6
 #: View/Pages/doc/quickstart.ctp:6
@@ -8393,7 +9073,6 @@ msgid "User Management and Global actions"
 msgstr "Brugerhåndtering og Globale handlinger"
 
 #: View/Pages/doc/administration.ctp:7
-#: View/Pages/doc/categories_and_types.ctp:7
 #: View/Pages/doc/concepts.ctp:7
 #: View/Pages/doc/general.ctp:7
 #: View/Pages/doc/quickstart.ctp:7
@@ -8436,7 +9115,7 @@ msgid "FAQ"
 msgstr "FAQ"
 
 #: View/Pages/doc/administration.ctp:22
-#: View/Pages/doc/categories_and_types.ctp:9
+#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:9
 #: View/Pages/doc/general.ctp:9
 #: View/Pages/doc/quickstart.ctp:9
@@ -8494,6 +9173,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr "Indstillinger, der styrer brute-force beskyttelse og applikationens salt nøgle."
 
 #: View/Pages/doc/administration.ctp:37
+#: View/Servers/edit.ctp:82
 msgid "Misc settings"
 msgstr "Diverse indstillinger"
 
@@ -8713,8 +9393,8 @@ msgstr "Denne mulighed lader den nye bruger modtage e-mails, som genereres, når
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_view.ctp:40
-#: View/Users/view.ctp:34
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
 msgid "Authkey"
 msgstr "Authkey"
 
@@ -8767,8 +9447,8 @@ msgid "The e-mail address (and login name) of the user."
 msgstr "Brugerens e-mail (og loginnavn)."
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_view.ctp:29
-#: View/Users/view.ctp:24
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr "Auto-notifikationer"
 
@@ -8789,8 +9469,6 @@ msgid "Shows the currently assigned NIDS ID."
 msgstr "Viser det aktuelt tildelte NIDS ID."
 
 #: View/Pages/doc/administration.ctp:109;125
-#: View/Users/admin_view.ctp:100
-#: View/Users/view.ctp:55
 msgid "Termsaccepted"
 msgstr "Termsaccepted"
 
@@ -8799,7 +9477,7 @@ msgid "This flag indicates whether the user has accepted the terms of use or not
 msgstr "Denne markør angiver, hvorvidt brugeren har accepteret vilkårene for brug, eller ej."
 
 #: View/Pages/doc/administration.ctp:110
-#: View/Users/admin_view.ctp:120
+#: View/Users/admin_view.ctp:84
 msgid "Newsread"
 msgstr "Newsread"
 
@@ -8861,7 +9539,7 @@ msgstr "Kontakt dine brugere her."
 
 #: View/Pages/doc/administration.ctp:133;184;197
 #: View/Pages/doc/using_the_system.ctp:269
-#: View/Taxonomies/view.ctp:78
+#: View/Taxonomies/view.ctp:89
 msgid "Action"
 msgstr "Handling"
 
@@ -9338,16 +10016,16 @@ msgstr "mit_nye_kodeord"
 msgid "This will create a new password hash using the currently set salt."
 msgstr "Dette vil genererer en ny kodeords hash med den anvendte salt."
 
-#: View/Pages/doc/categories_and_types.ctp:13
+#: View/Pages/doc/categories_and_types.ctp:7
 msgid "Attribute Categories and Types"
 msgstr "Attribut Kategorier og Typer"
 
-#: View/Pages/doc/categories_and_types.ctp:14
+#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/md/categories_and_types.ctp:1
 msgid "Attribute Categories vs. Types"
 msgstr "Attribut Kategorier vs. Typer"
 
-#: View/Pages/doc/categories_and_types.ctp:80
+#: View/Pages/doc/categories_and_types.ctp:74
 msgid "Click here to get the .md version for gitbook generation."
 msgstr "Klik her for at få .md versionen for gitbook genereringen."
 
@@ -9356,7 +10034,7 @@ msgid "Admins and Site Admins"
 msgstr "Admins og Site Admins"
 
 #: View/Pages/doc/concepts.ctp:16
-msgid "There are two types of admins in MISP: Admins (also refered to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
+msgid "There are two types of admins in MISP: Admins (also referred to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:17
@@ -9487,10 +10165,6 @@ msgstr "Hjem knap"
 msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:20
-msgid "Event Actions"
-msgstr "Event handlinger"
-
 #: View/Pages/doc/general.ctp:20
 msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
 msgstr ""
@@ -9499,18 +10173,10 @@ msgstr ""
 msgid "Input filters alter what and how data can be entered into this instance. Apart from the basic validation of attribute entry by type, it is possible for the site administrators to define regular expression replacements and blacklists for certain values in addition to blocking certain values from being exportable. Users can view these replacement and blacklist rules here whilst administrator can alter them."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:22;54
-msgid "Global Actions"
-msgstr "Globale Handlinger"
-
 #: View/Pages/doc/general.ctp:22
 msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:23;66
-msgid "Sync Actions"
-msgstr "Sync handlinger"
-
 #: View/Pages/doc/general.ctp:23
 msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
 msgstr ""
@@ -9636,6 +10302,11 @@ msgstr "Du kan se rolle rettigheder her."
 msgid "A link to this user guide."
 msgstr "Link til bruger vejledning."
 
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr "Vilkår og Betingelser"
+
 #: View/Pages/doc/general.ctp:61
 msgid "View the terms &amp; conditions again."
 msgstr ""
@@ -9901,7 +10572,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:47
+#: View/Users/statistics_data.ctp:53
 msgid "Activity Heatmap"
 msgstr "Aktivitets Heatmap"
 
@@ -10823,12 +11494,6 @@ msgstr ""
 msgid "As described earlier, users with tagging rights can arbitrarily tag events using tags chosen from a pool of available options. If you have tagging privileges and would like to create a new tag, navigate to Event Actions - Add Tag. You'll be presented with the following form"
 msgstr ""
 
-#: View/Pages/doc/using_the_system.ctp:303
-#: View/Templates/add.ctp:17
-#: View/Templates/edit.ctp:17
-msgid "Add tag"
-msgstr "Tilføj tag"
-
 #: View/Pages/doc/using_the_system.ctp:303
 msgid "Enter a name for the tag and click on the color field to be able to pick a colour for it."
 msgstr ""
@@ -11158,8 +11823,8 @@ msgid "Make sure that you enter the authentication key that you have been given
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:397
-#: View/Servers/add.ctp:7
-#: View/Servers/edit.ctp:7
+#: View/Servers/add.ctp:8
+#: View/Servers/edit.ctp:8
 msgid "Base URL"
 msgstr "Basis URL"
 
@@ -11260,7 +11925,7 @@ msgid "Clicking the delete button will delete the link to the instance."
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:418
-#: View/Servers/index.ctp:92
+#: View/Servers/index.ctp:128
 msgid "Push all"
 msgstr "Skub alt"
 
@@ -11269,7 +11934,7 @@ msgid " By clicking this button, all events that are eligible to be pushed on th
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:419
-#: View/Servers/index.ctp:89
+#: View/Servers/index.ctp:125
 msgid "Pull all"
 msgstr "Hent alt"
 
@@ -11423,7 +12088,7 @@ msgstr "ok"
 msgid "remove"
 msgstr "fjern"
 
-#: View/Roles/view.ctp:14
+#: View/Roles/view.ctp:5
 msgid "Permission level"
 msgstr "Rettigheds niveau"
 
@@ -11431,136 +12096,155 @@ msgstr "Rettigheds niveau"
 msgid "Add Server"
 msgstr "Tilføj Server"
 
-#: View/Servers/add.ctp:10
-#: View/Servers/edit.ctp:10
+#: View/Servers/add.ctp:6
+#: View/Servers/edit.ctp:6
+msgid "Instance identification"
+msgstr ""
+
+#: View/Servers/add.ctp:11
+#: View/Servers/edit.ctp:11
 msgid "Instance name"
 msgstr "Instans navn"
 
-#: View/Servers/add.ctp:16
+#: View/Servers/add.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change."
 msgstr "Du kan indstille denne MISP instans som en intern instans ved at markere afkrydsningsfeltet nedenfor. Det betyder, at enhver synkronisering mellem denne instans og remote instansen ikke automatisk \"degrades\" som den ville i et normalt synkroniserings scenarie. Sørg for, at du ejer begge MISP instanser, og at du er okay med denne ellers risikofyldte ændring."
 
-#: View/Servers/add.ctp:19
-#: View/Servers/edit.ctp:19
+#: View/Servers/add.ctp:20
+#: View/Servers/edit.ctp:20
 msgid "Internal instance"
 msgstr "Intern instans"
 
-#: View/Servers/add.ctp:29
+#: View/Servers/add.ctp:30
+#: View/Servers/edit.ctp:31
+msgid "Instance ownership and credentials"
+msgstr ""
+
+#: View/Servers/add.ctp:31
+#: View/Servers/edit.ctp:32
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr "Oplysninger om organisationen, der modtager events, typisk den remote instans' værts organisation."
 
-#: View/Servers/add.ctp:35
+#: View/Servers/add.ctp:37
 msgid "Remote Sync Organisation Type"
 msgstr "Fjern synkroniserings organisaitons type"
 
-#: View/Servers/add.ctp:40
-#: View/Servers/edit.ctp:37
+#: View/Servers/add.ctp:42
+#: View/Servers/edit.ctp:43
 msgid "External Organisation"
 msgstr "Ekstern organisation"
 
-#: View/Servers/add.ctp:46
-#: View/Servers/edit.ctp:48
-msgid "Local Organisation"
-msgstr "Lokal organisation"
+#: View/Servers/add.ctp:48
+msgid "Owner of remote instance"
+msgstr ""
 
-#: View/Servers/add.ctp:52
-#: View/Servers/edit.ctp:59
+#: View/Servers/add.ctp:54
+#: View/Servers/edit.ctp:65
 msgid "Remote Organisation's Name"
 msgstr "Remote organisations navn"
 
-#: View/Servers/add.ctp:56
-#: View/Servers/edit.ctp:63
+#: View/Servers/add.ctp:58
+#: View/Servers/edit.ctp:69
 msgid "Remote Organisation's Uuid"
 msgstr "Remote organisations UUID"
 
-#: View/Servers/add.ctp:97
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:78
+msgid "Enabled synchronisation methods"
+msgstr ""
+
+#: View/Servers/add.ctp:86
 msgid "Server certificate file"
 msgstr "Server certifikat fil"
 
-#: View/Servers/add.ctp:103
+#: View/Servers/add.ctp:92
 msgid "Client certificate file"
 msgstr "Klient certifikat fil"
 
-#: View/Servers/add.ctp:108
-#: View/Servers/edit.ctp:147
+#: View/Servers/add.ctp:97
+#: View/Servers/edit.ctp:142
 msgid "Push rules:"
 msgstr "Push regler:"
 
-#: View/Servers/add.ctp:109;115
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:98;104
+#: View/Servers/edit.ctp:143;149
 msgid "Events with the following tags allowed: "
 msgstr "Events med følgende tags er tilladt: "
 
-#: View/Servers/add.ctp:110;116
-#: View/Servers/edit.ctp:149;155
+#: View/Servers/add.ctp:99;105
+#: View/Servers/edit.ctp:144;150
 msgid "Events with the following tags blocked: "
 msgstr "Events med følgende tags er blokeret: "
 
-#: View/Servers/add.ctp:111;117
-#: View/Servers/edit.ctp:150;156
+#: View/Servers/add.ctp:100;106
+#: View/Servers/edit.ctp:145;151
 msgid "Events with the following organisations allowed: "
 msgstr "Events med følgende organisation er tilladt: "
 
-#: View/Servers/add.ctp:112;118
-#: View/Servers/edit.ctp:151;157
+#: View/Servers/add.ctp:101;107
+#: View/Servers/edit.ctp:146;152
 msgid "Events with the following organisations blocked: "
 msgstr "Events med følgende organisation er blokeret: "
 
-#: View/Servers/add.ctp:114
-#: View/Servers/edit.ctp:153
+#: View/Servers/add.ctp:103
+#: View/Servers/edit.ctp:148
 msgid "Pull rules:"
 msgstr "Pull regler:"
 
-#: View/Servers/add.ctp:142
-#: View/Servers/edit.ctp:184
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:179
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr "Basis URL'en på den eksterne server som der ønskes at synkroniserer med. Eksempelvis https://foo.sig.mil.be"
 
-#: View/Servers/add.ctp:148
+#: View/Servers/add.ctp:137
 msgid "Unpublish new event (working with Pull event)."
 msgstr "Unpublish nye events (Virker med pull events)."
 
-#: View/Servers/add.ctp:149
+#: View/Servers/add.ctp:138
 msgid "Publish new event without email (working with Push event)."
 msgstr "Publicer nye events uden at sende email (Virker på push events)."
 
-#: View/Servers/add.ctp:150
+#: View/Servers/add.ctp:139
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr "Du kan også uploade en certifikat fil, hvis den MISP instans du forsøger at oprette forbindelse til, har sin egen signerings authority. (* .pem)"
 
-#: View/Servers/edit.ctp:16
+#: View/Servers/edit.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change. This also requires that the current instance's host organisation and the remote sync organisation are the same."
 msgstr ""
 
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:37
 msgid "Organisation Type"
 msgstr "Organisations Type"
 
-#: View/Servers/edit.ctp:69
+#: View/Servers/edit.ctp:54
+msgid "Local Organisation"
+msgstr "Lokal organisation"
+
+#: View/Servers/edit.ctp:75
 msgid "Leave empty to use current key"
 msgstr "Efterlad tomt for at anvende nuværende nøgle"
 
-#: View/Servers/edit.ctp:104
+#: View/Servers/edit.ctp:99
 msgid "Server certificate file (*.pem): "
 msgstr "Server certifikat fil (*.pem): "
 
-#: View/Servers/edit.ctp:112;134
+#: View/Servers/edit.ctp:107;129
 msgid "Add certificate file"
 msgstr "Tilføj certifikat fil"
 
-#: View/Servers/edit.ctp:113;135
+#: View/Servers/edit.ctp:108;130
 msgid "Remove certificate file"
 msgstr "Fjern certikat fil"
 
-#: View/Servers/edit.ctp:126
+#: View/Servers/edit.ctp:121
 msgid "Client certificate file: "
 msgstr "Klient certifikat fil: "
 
-#: View/Servers/edit.ctp:193
+#: View/Servers/edit.ctp:188
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr "Du kan også uploade en klient certifikat fil, hvis den MISP instans du forsøger at oprette forbindelse til kræver dette."
 
-#: View/Servers/edit.ctp:250;254
+#: View/Servers/edit.ctp:245;249
 msgid "Not set."
 msgstr "Ikke sat."
 
@@ -11573,8 +12257,8 @@ msgid "Example:"
 msgstr "Eksempel:"
 
 #: View/Servers/filter_event_index.ctp:21
-msgid "Apply filters to the remote instance"
-msgstr "Anvend filtre til den eksterne MISP instans"
+msgid "Apply filters to the remote instance's index"
+msgstr ""
 
 #: View/Servers/index.ctp:2
 msgid "Servers"
@@ -11584,34 +12268,38 @@ msgstr "Servere"
 msgid "Connection test"
 msgstr "Forbindelses test"
 
-#: View/Servers/index.ctp:30
+#: View/Servers/index.ctp:31
 msgid "Remote Organisation"
 msgstr "Fjern Organisation"
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Test the connection to the remote instance"
 msgstr "Test forbindelsen til den eksterne MISP instans"
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Run"
 msgstr "Kør"
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Internal instance that ignores distribution level degradation *WARNING: Only use this setting if you have several internal instances and the sync link is to an internal extension of the current MISP community*"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:86
+#: View/Servers/index.ctp:122
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:88
+#: View/Servers/index.ctp:124
 msgid "Pull updates to events that already exist locally"
 msgstr "Hent opdateringer til events, som allerede eksisterer lokalt"
 
+#: View/Servers/index.ctp:131
+msgid "Cache instance"
+msgstr ""
+
 #: View/Servers/preview_event.ctp:7
 msgid "You are currently viewing an event on the remote instance %s "
 msgstr "Du ser for øjeblikket en event på den eksterne MISP instans %s "
@@ -11628,15 +12316,15 @@ msgstr "Filtrer den eksterne MISP instans ved hjælp af tag: %s"
 msgid "You are currently viewing the event index of the remote instance %s"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr "ikke "
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "published"
 msgstr "publiceret"
 
-#: View/Servers/preview_index.ctp:147
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr "Hent event"
 
@@ -11680,19 +12368,23 @@ msgstr "Successfulde pushes"
 msgid "No succeeded pushes"
 msgstr ""
 
-#: View/Servers/rest.ctp:7;17
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:54
+#: View/Servers/rest.ctp:116
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:55
+#: View/Servers/rest.ctp:117
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:56
+#: View/Servers/rest.ctp:118
 msgid "Headers"
 msgstr ""
 
@@ -11712,6 +12404,10 @@ msgstr "Vælg MISP instans for at tilføje"
 msgid "Available Instances"
 msgstr "Tilgængelige MISP instanser"
 
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
+msgid "Added Instances"
+msgstr ""
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 msgid "Add servers to sharing group"
 msgstr "Tilføj servere til delings gruppe"
@@ -11759,39 +12455,31 @@ msgstr "Foreslå"
 msgid "IDS Signature?"
 msgstr "IDS Signatur?"
 
-#: View/ShadowAttributes/index.ctp:21
-msgid "Only list proposals of my organisation"
-msgstr "Vi kun forslag for min organisation"
-
-#: View/ShadowAttributes/index.ctp:21
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr "Min organisations events"
 
-#: View/ShadowAttributes/index.ctp:26
-msgid "List all proposals"
-msgstr "Vis alle forslag"
-
-#: View/ShadowAttributes/index.ctp:26
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
 msgstr "Alle Events"
 
-#: View/ShadowAttributes/index.ctp:33
+#: View/ShadowAttributes/index.ctp:43
 msgid "Proposal by"
 msgstr "Forslag af"
 
-#: View/ShadowAttributes/index.ctp:39
+#: View/ShadowAttributes/index.ctp:49
 msgid "Event creator"
 msgstr "Event skaber"
 
-#: View/ShadowAttributes/index.ctp:45
+#: View/ShadowAttributes/index.ctp:55
 msgid "Proposed value"
 msgstr "Foreslået værdi"
 
-#: View/ShadowAttributes/index.ctp:71
+#: View/ShadowAttributes/index.ctp:81
 msgid "Attribute edit"
 msgstr "Attribut rediger"
 
-#: View/ShadowAttributes/index.ctp:73
+#: View/ShadowAttributes/index.ctp:83
 msgid "New Attribute"
 msgstr "Ny Attribut"
 
@@ -11819,166 +12507,166 @@ msgstr "Slet forslag"
 msgid "New Sharing Group"
 msgstr "Ny Delings Gruppe"
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
-msgid "General tab"
-msgstr "Generelt faneblad"
-
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
 msgid "General"
 msgstr "Generelt"
 
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr "Generelt faneblad"
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
 msgid "Organisations tab"
 msgstr "Organisations faneblad"
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
-msgid "MISP instances tab"
-msgstr "MISP instans faneblad"
-
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
 msgid "MISP Instances"
 msgstr "MISP Instanser"
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
-msgid "Sharing group summary"
-msgstr "Sharing group opsummering"
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
+msgstr "MISP instans faneblad"
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
 msgstr "Opsummering og Gem"
 
-#: View/SharingGroups/add.ctp:12
-#: View/SharingGroups/edit.ctp:12
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr "Sharing group opsummering"
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
 msgid "Example: Multinational sharing group"
 msgstr "Eksempel: Multinational delings gruppe"
 
-#: View/SharingGroups/add.ctp:13
-#: View/SharingGroups/edit.ctp:13
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
 msgid "Releasable to"
 msgstr "Frigives til"
 
-#: View/SharingGroups/add.ctp:14
-#: View/SharingGroups/edit.ctp:14
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
 msgid "Example: Community1, Organisation1, Organisation2"
 msgstr "Eksempel: Community1, Organisation1, Organisation2"
 
-#: View/SharingGroups/add.ctp:16
-#: View/SharingGroups/edit.ctp:16
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
 msgid "A description of the sharing group."
 msgstr "En beskrivelse af deligs gruppen."
 
-#: View/SharingGroups/add.ctp:18
-#: View/SharingGroups/edit.ctp:18
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
 msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:19
-#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
 msgid "Make the sharing group selectable (active)"
 msgstr "Gør delings grupper valgbare (Aktive)"
 
-#: View/SharingGroups/add.ctp:21;38;59
-#: View/SharingGroups/edit.ctp:21;38;67
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
 msgid "Next page"
 msgstr "Næste side"
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation(s) to the sharing group"
 msgstr "Tilføj lokal(e) organisation(er) til delings gruppen"
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation"
 msgstr "Tilføj lokal organisaiton"
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisations to the sharing group"
 msgstr "Tilføj remote organisation til delings gruppen"
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisation"
 msgstr "Tilføj remote oganisation"
 
-#: View/SharingGroups/add.ctp:33
-#: View/SharingGroups/edit.ctp:33
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
 #: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr "Udvid"
 
-#: View/SharingGroups/add.ctp:37;58;74
-#: View/SharingGroups/edit.ctp:37;66;82
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
 msgid "Previous page"
 msgstr "Forrige side"
 
-#: View/SharingGroups/add.ctp:42
-#: View/SharingGroups/edit.ctp:50
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
 msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:43
-#: View/SharingGroups/edit.ctp:51
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
 msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:47
-#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
 msgid "Add instance"
 msgstr "Tilføj MISP instans"
 
-#: View/SharingGroups/add.ctp:53
-#: View/SharingGroups/edit.ctp:61
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
 #: View/SharingGroups/view.ctp:69
 msgid "All orgs"
 msgstr "Alle organisationer"
 
-#: View/SharingGroups/add.ctp:63
+#: View/SharingGroups/add.ctp:103
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
 msgstr "<span class=\"bold\">Overordnet: </span>Du er igang med at oprette en<span id=\"summarytitle\" class=\"red bold\"></span> delings gruppe, som er beregnet til at frigive til <span id=\"summaryreleasable\" class=\"red bold\"></span>."
 
-#: View/SharingGroups/add.ctp:64
+#: View/SharingGroups/add.ctp:104
 msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr "Lokal organisationer: </span>Det vil være synligt for <span id=\"summarylocal\" class=\"red bold\"></span>, hvor fra <span id=\"summarylocalextend\" class=\"red bold\"></span> kan udvide delings gruppen."
 
-#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/add.ctp:105
 msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr "Eksterne organisationer: </span>Det vil være synligt for <span id=\"summaryexternal\" class=\"red bold\"></span>, hvorfra <span id=\"summaryexternalextend\" class=\"red bold\"></span> kan udvide delings gruppen."
 
-#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/add.ctp:106
 msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr "<span class=\"bold\">Synkronisering: </span>Derudover skubbes events automatisk til: <span id=\"summaryservers\" class=\"red bold\"></span>"
 
-#: View/SharingGroups/add.ctp:67
-#: View/SharingGroups/edit.ctp:75
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
 msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
 msgstr "Du kan redigere disse oplysninger ved at gå tilbage til en af de forgående sider, eller hvis du accepterer ovennævnte oplysninger, skal du klikke på Send for at oprette delings gruppen."
 
-#: View/SharingGroups/add.ctp:75
-#: View/SharingGroups/edit.ctp:83
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
 msgid "Submit and create sharing group"
 msgstr "Indsend og opret delings gruppe"
 
-#: View/SharingGroups/add.ctp:95
+#: View/SharingGroups/add.ctp:135
 msgid "Local instance"
 msgstr "Lokal MISP instans"
 
-#: View/SharingGroups/edit.ctp:71
+#: View/SharingGroups/edit.ctp:111
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
 "                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
 "                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:74
+#: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr "Synkronisering: </span>Derudover skubbes events automatisk til: <span id=\"summaryservers\" class=\"red bold\"></span>"
 
@@ -11986,23 +12674,15 @@ msgstr "Synkronisering: </span>Derudover skubbes events automatisk til: <span id
 msgid "Sharing Groups"
 msgstr "Delings Grupper"
 
-#: View/SharingGroups/index.ctp:20
-msgid "View only active sharing groups"
-msgstr "Vis kun aktive delings grupper"
-
-#: View/SharingGroups/index.ctp:20
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
 msgstr "Aktive Delings Grupper"
 
-#: View/SharingGroups/index.ctp:21
-msgid "View only passive sharing groups"
-msgstr "Vis kun passive delings grupper"
-
-#: View/SharingGroups/index.ctp:21
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
 msgstr "Passive Delings Grupper"
 
-#: View/SharingGroups/index.ctp:61
+#: View/SharingGroups/index.ctp:80
 msgid "Distribution List"
 msgstr "Distributions liste"
 
@@ -12046,6 +12726,18 @@ msgstr "Attribut ID"
 msgid "Delete sighting"
 msgstr "Slet observation"
 
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
+msgid "Add Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
+msgstr ""
+
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
 msgid "Remove Sighting"
 msgstr "Fjern observation"
@@ -12058,6 +12750,26 @@ msgstr "Fjern observation (%s)?"
 msgid "Remove sighting"
 msgstr "Fjern observation"
 
+#: View/TagCollections/add.ctp:8
+msgid "Edit Tag Collection"
+msgstr ""
+
+#: View/TagCollections/add.ctp:16
+msgid "Visible to all orgs"
+msgstr ""
+
+#: View/TagCollections/import.ctp:4
+msgid "Paste tag collection data"
+msgstr ""
+
+#: View/TagCollections/import.ctp:5
+msgid "Paste a MISP tag collection JSON below to add tag collections."
+msgstr ""
+
+#: View/TagCollections/import.ctp:10
+msgid "Tag collection JSON"
+msgstr ""
+
 #: View/Tags/add.ctp:12
 #: View/Tags/edit.ctp:12
 msgid "Restrict tagging to org"
@@ -12068,6 +12780,10 @@ msgstr "Begræns tagging til organisation"
 msgid "Restrict tagging to user"
 msgstr "Begræns tagging til bruger"
 
+#: View/Tags/edit.ctp:31
+msgid "Unselectable Tag"
+msgstr ""
+
 #: View/Tags/index.ctp:10
 msgid "Your Favourite Tags"
 msgstr "Dine favorit Tags"
@@ -12100,57 +12816,6 @@ msgstr "Taggede attributer"
 msgid "Favourite"
 msgstr "Favorit"
 
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr "Er du sikker på, at du vil slette \"%s\"?"
-
-#: View/Tags/ajax/select_tag.ctp:2
-msgid "Select Tag"
-msgstr "Vælg Tag"
-
-#: View/Tags/ajax/select_tag.ctp:16
-#: View/Tags/ajax/taxonomy_choice.ctp:4
-msgid "search tags…"
-msgstr "Søg tags…"
-
-#: View/Tags/ajax/select_tag.ctp:25
-msgid "Attach tag"
-msgstr "Vedhæft tag"
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Return to taxonomy selection"
-msgstr "Gå tilbage til taksonomi udvælgelse"
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Select Taxonomy"
-msgstr "Vælg taksonomi"
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Back to Taxonomy Selection"
-msgstr "Tilbage til taksonomi valg"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:2
-msgid "Select Tag Source"
-msgstr "Vælg Tag Kilde"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:10
-msgid "Favourite Tags"
-msgstr "Favorit Tags"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:14
-msgid "Custom Tags"
-msgstr "Brugerdefinerede Tags"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:17
-msgid "All Tags"
-msgstr "Alle Tags"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:21
-#: View/Taxonomies/view.ctp:2
-msgid "Taxonomy Library"
-msgstr "Taksonomi bibliotek"
-
 #: View/Tasks/index.ctp:4
 msgid "Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks."
 msgstr "Her kan du planlægge forud definerede opgaver, der udføres hver x time. Du kan ændre dato og klokkeslæt for den næste planlagte udførelse, og den frekvens, hvormed den gentages (udtrykt i timer). Hvis du indstiller frekvensen til 0, gentages opgaven ikke. For at ændre ovenstående indstillinger skal du bare klikke på det relevante felt og trykke på opdater, når du er færdig med at redigere de planlagte opgaver."
@@ -12188,7 +12853,8 @@ msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr "Er du sikker på, at du vil aktivere alle tags, der er knyttet til denne taksonomi?"
 
 #: View/Taxonomies/index.ctp:41
-#: View/Taxonomies/view.ctp:29;143
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr "Deaktiver"
 
@@ -12198,7 +12864,8 @@ msgid "Are you sure you want to disable this taxonomy library?"
 msgstr "Er du sikker på, at du vil deaktivere dette taksonomi bibliotek?"
 
 #: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:31;147
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr "Aktiver"
 
@@ -12215,19 +12882,27 @@ msgstr "Slet taksonomi"
 msgid "Create and/or update selected tags"
 msgstr "Opret og/eller rediger valgte tags"
 
-#: View/Taxonomies/view.ctp:116
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
 msgid "Hidden"
 msgstr "Skjult"
 
-#: View/Taxonomies/view.ctp:125
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr "Se graf"
 
-#: View/Taxonomies/view.ctp:142
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
 msgstr "Opdater"
 
-#: View/Taxonomies/view.ctp:147
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr "Opdater eller aktiver"
 
@@ -12255,6 +12930,30 @@ msgstr ""
 msgid "Create / update all taxonomy entries as tags"
 msgstr ""
 
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
 #: View/TemplateElements/ajax/ajaxIndex.ctp:2
 msgid "Template Elements"
 msgstr "Skabelon Elementer"
@@ -12507,6 +13206,8 @@ msgid "Admin Edit User"
 msgstr "Admin Rediger Bruger"
 
 #: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
 msgid "Terms accepted"
 msgstr "Vilkår accepteret"
 
@@ -12573,15 +13274,19 @@ msgstr "En enkelt bruger"
 msgid "All users"
 msgstr "Alle brugere"
 
-#: View/Users/admin_email.ctp:36
+#: View/Users/admin_email.ctp:19
+msgid "All users of the same organisation"
+msgstr ""
+
+#: View/Users/admin_email.ctp:39
 msgid "Enter a custom message"
 msgstr "Indtast en brugerdefineret besked"
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "New user registration"
 msgstr "Registrering af ny bruger"
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "Password reset"
 msgstr "Nulstil kodeord"
 
@@ -12605,10 +13310,6 @@ msgstr "Anvend filtre"
 msgid "Users"
 msgstr "Brugere"
 
-#: View/Users/admin_index.ctp:40
-msgid "Filter user index"
-msgstr ""
-
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr "Kontakt %s"
@@ -12621,42 +13322,48 @@ msgstr ""
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr ""
 
-#: View/Users/admin_view.ctp:35
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
 msgid "Contactalert"
 msgstr "Contactalert"
 
-#: View/Users/admin_view.ctp:46
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr "Anmod om API adgang"
+
+#: View/Users/admin_view.ctp:44
 msgid "Invited By"
 msgstr "Inviteret af"
 
-#: View/Users/admin_view.ctp:51
-msgid "Org admin"
-msgstr "Organisaitons admin"
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
+msgstr ""
 
-#: View/Users/admin_view.ctp:74
-#: View/Users/view.ctp:67
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr "NIDS Start SID"
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr "Kodeord ændret"
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
 msgid "GnuPG fingerprint"
 msgstr "GnuPG fingeraftryk"
 
-#: View/Users/admin_view.ctp:80
-#: View/Users/view.ctp:73
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
 msgid "GnuPG status"
 msgstr "GnuPG status"
 
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:83
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
 msgid "SMIME Public certificate"
 msgstr "SMIME Public certifikat"
 
-#: View/Users/admin_view.ctp:95
-msgid "Nids Sid"
-msgstr ""
-
-#: View/Users/admin_view.ctp:110
-msgid "Password change"
-msgstr "Kodeord ændret"
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr "Fejlede GnuPGs?"
@@ -12689,37 +13396,37 @@ msgid "Proposals active"
 msgstr "Forslag aktive"
 
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:34
+#: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
 msgstr "Diskussions Tråde"
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:39
+#: View/Users/statistics_data.ctp:45
 msgid "Discussion posts"
 msgstr ""
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:48
+#: View/Users/statistics_data.ctp:54
 msgid "A heatmap showing user activity for each day during this month and the 4 months that preceded it. Use the buttons below to only show the heatmap of a specific organisation."
 msgstr ""
 
 #: View/Users/statistics.ctp:60
-#: View/Users/statistics_data.ctp:65
+#: View/Users/statistics_data.ctp:71
 msgid "Go left"
 msgstr "Gå til venstre"
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:71
+#: View/Users/statistics_data.ctp:77
 msgid "Go right"
 msgstr "Gå til højre"
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:118
+#: View/Users/statistics_data.ctp:124
 msgid "The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings."
 msgstr ""
 
 #: View/Users/statistics.ctp:117
-#: View/Users/statistics_data.ctp:122
+#: View/Users/statistics_data.ctp:128
 msgid "The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer."
 msgstr ""
 
@@ -12727,6 +13434,18 @@ msgstr ""
 msgid "A heatmap showing the usage of ATT&CK Tactic."
 msgstr "Et heatmap der viser anvendelse af ATT&CK Taktik."
 
+#: View/Users/statistics_data.ctp:32
+msgid "Users with PGP keys"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:36
+msgid "Local Organisations"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:38
+msgid "Average Users / Org"
+msgstr ""
+
 #: View/Users/statistics_orgs.ctp:17
 msgid "Organisation list"
 msgstr "Organisations liste"
@@ -12795,13 +13514,13 @@ msgstr "Certifikat validering"
 msgid "GnuPG key validation"
 msgstr "GnuPG nøgle validering"
 
-#: View/Users/view.ctp:45
-msgid "Request API access"
-msgstr "Anmod om API adgang"
+#: View/Users/ajax/emailConfirmTemplate.ctp:2
+msgid "Confirm sending"
+msgstr ""
 
-#: View/Users/view.ctp:50
-msgid "NIDS Start SID"
-msgstr "NIDS Start SID"
+#: View/Users/ajax/emailConfirmTemplate.ctp:4
+msgid "You are about to send a mail to %s recipient(s)?"
+msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:2
 msgid "Choose the key that you would like to use"
@@ -12863,7 +13582,7 @@ msgstr "Slet Warninglist"
 msgid "Delete warninglist"
 msgstr "Slet Warninglist"
 
-#: View/Warninglists/view.ctp:29
+#: View/Warninglists/view.ctp:14;16
 msgid "Accepted attribute types"
 msgstr "Accepterede attribut typer"
 
@@ -12939,6 +13658,7 @@ msgstr "boolean"
 #: Model/Attribute.php:validation for field uuid
 #: Model/Event.php:validation for field uuid;validation for field extends_uuid
 #: Model/EventBlacklist.php:validation for field event_uuid
+#: Model/MispObject.php:validation for field uuid
 #: Model/OrgBlacklist.php:validation for field org_uuid
 #: Model/Organisation.php:validation for field uuid
 #: Model/ShadowAttribute.php:validation for field uuid
@@ -12947,6 +13667,7 @@ msgid "Please provide a valid UUID"
 msgstr "Venligst indtast en gyldig UUID"
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/MispObject.php:validation for field uuid
 msgid "The UUID provided is not unique"
 msgstr "Den indtastede UUID er ikke unik"
 
@@ -12966,6 +13687,7 @@ msgstr "Valgmuligheder: Kun din organisation, Kun dette fællesskab, Forbundne f
 #: Model/ServerTag.php:validation for field server_id;validation for field tag_id
 #: Model/SharingGroup.php:validation for field name
 #: Model/Tag.php:validation for field name;validation for field colour
+#: Model/TagCollection.php:validation for field name
 #: Model/TemplateElementAttribute.php:validation for field name;validation for field description
 #: Model/ThreatLevel.php:validation for field name;validation for field description;validation for field form_description
 #: Model/User.php:validation for field org_id;validation for field authkey
@@ -13065,6 +13787,7 @@ msgid "This field is required."
 msgstr "Dette felt er påkrævet."
 
 #: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
 #: Model/Whitelist.php:validation for field name
 msgid "A similar name already exists."
 msgstr "Navnet eksisterer allerede."
diff --git a/app/Locale/default.pot b/app/Locale/default.pot
index 9c7b84ce1..e900c917b 100755
--- a/app/Locale/default.pot
+++ b/app/Locale/default.pot
@@ -16,14 +16,14 @@ msgstr ""
 #: Console/Command/EventShell.php:13
 #: Controller/AttributesController.php:125;129;133
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1029;1380;1384;1388;1431;1854;1930;1934;1938;2160;2197;2261;2343;2873;5068;5236;5240;5249
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
 #: Controller/PostsController.php:56
-#: Model/Galaxy.php:272
+#: Model/Galaxy.php:292
 msgid "Invalid event"
 msgstr ""
 
 #: Console/Command/ServerShell.php:49
-#: Controller/ServersController.php:631
+#: Controller/ServersController.php:632
 msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
 msgstr ""
 
@@ -31,37 +31,37 @@ msgstr ""
 msgid "ERROR: %s"
 msgstr ""
 
-#: Controller/AppController.php:365
+#: Controller/AppController.php:383
 msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
 msgstr ""
 
-#: Controller/AppController.php:583
-#: Controller/AttributesController.php:1995;2104;2154;2237;2323
-#: Controller/EventsController.php:2582;2698;2760;3112;3723;3786
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
 msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
 msgstr ""
 
-#: Controller/AppController.php:592
-#: Controller/AttributesController.php:2158;2241;2327
-#: Controller/EventsController.php:2586;2703;2765;3116;3727;3790
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
 msgid "You have to be logged in to do that."
 msgstr ""
 
-#: Controller/AppController.php:609
+#: Controller/AppController.php:627
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr ""
 
-#: Controller/AppController.php:731
+#: Controller/AppController.php:752
 msgid "All done. attribute_count generated from scratch for "
 msgstr ""
 
-#: Controller/AppController.php:850
-#: Controller/AttributesController.php:2381
-#: Controller/ShadowAttributesController.php:1274
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
+#: Controller/ShadowAttributesController.php:1276
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr ""
 
-#: Controller/AttributesController.php:116;1399
+#: Controller/AttributesController.php:116;1403
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr ""
@@ -72,13 +72,13 @@ msgstr ""
 
 #: Controller/AttributesController.php:139;488;668
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1737;1758;1792
-#: Controller/ObjectsController.php:452
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
 msgid "You do not have permission to do that."
 msgstr ""
 
-#: Controller/AttributesController.php:411;866;871;875;1079;1159;2397;2411;2444;2466;2475;3059;3067;3166;3170
-#: Controller/ShadowAttributesController.php:822;1065;1089;1122;1132
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
 #: Controller/TagsController.php:491
 msgid "Invalid attribute"
 msgstr ""
@@ -92,8 +92,8 @@ msgstr ""
 msgid "Attribute not an attachment or malware-sample"
 msgstr ""
 
-#: Controller/AttributesController.php:485;652;943;1408
-#: Controller/EventsController.php:4420;4434;5017;5031
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
 msgid "Invalid Event."
 msgstr ""
 
@@ -132,167 +132,167 @@ msgstr ""
 msgid "The attribute has been saved"
 msgstr ""
 
-#: Controller/AttributesController.php:992
+#: Controller/AttributesController.php:995
 msgid "The attribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/AttributesController.php:1083
+#: Controller/AttributesController.php:1087
 msgid "Invalid event id."
 msgstr ""
 
-#: Controller/AttributesController.php:1113
-#: Controller/EventsController.php:2082
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
 #: Controller/ShadowAttributesController.php:729
 msgid "Invalid input."
 msgstr ""
 
-#: Controller/AttributesController.php:1118
+#: Controller/AttributesController.php:1122
 msgid "Invalid field."
 msgstr ""
 
-#: Controller/AttributesController.php:1163
+#: Controller/AttributesController.php:1167
 msgid "Invalid attribute id."
 msgstr ""
 
-#: Controller/AttributesController.php:1238;1248
+#: Controller/AttributesController.php:1242;1252
 msgid "Attribute deleted"
 msgstr ""
 
-#: Controller/AttributesController.php:1243;1245
+#: Controller/AttributesController.php:1247;1249
 msgid "Attribute was not deleted"
 msgstr ""
 
-#: Controller/AttributesController.php:1270;2868
-#: Controller/ShadowAttributesController.php:862
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
 msgid "Invalid Attribute"
 msgstr ""
 
-#: Controller/AttributesController.php:1297
+#: Controller/AttributesController.php:1301
 msgid "Could not restore the attribute"
 msgstr ""
 
-#: Controller/AttributesController.php:1318;1325;1329
+#: Controller/AttributesController.php:1322;1329;1333
 msgid "Attribute not found or not authorised."
 msgstr ""
 
-#: Controller/AttributesController.php:1379
+#: Controller/AttributesController.php:1383
 msgid "This function is only accessible via POST requests."
 msgstr ""
 
-#: Controller/AttributesController.php:1434
+#: Controller/AttributesController.php:1438
 msgid "No matching attributes found."
 msgstr ""
 
-#: Controller/AttributesController.php:1468
+#: Controller/AttributesController.php:1472
 msgid "This method can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:1478
+#: Controller/AttributesController.php:1482
 msgid "You are not authorized to edit this event."
 msgstr ""
 
-#: Controller/AttributesController.php:1576
+#: Controller/AttributesController.php:1580
 msgid "No event ID provided."
 msgstr ""
 
-#: Controller/AttributesController.php:1621
-#: Controller/GalaxiesController.php:225
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
 msgid "Synonyms: "
 msgstr ""
 
-#: Controller/AttributesController.php:1990;2097
+#: Controller/AttributesController.php:1997;2104
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr ""
 
-#: Controller/AttributesController.php:2003
+#: Controller/AttributesController.php:2010
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
 msgstr ""
 
-#: Controller/AttributesController.php:2023
+#: Controller/AttributesController.php:2030
 msgid "You don't have access to that event."
 msgstr ""
 
-#: Controller/AttributesController.php:2086
+#: Controller/AttributesController.php:2093
 msgid "No matches."
 msgstr ""
 
-#: Controller/AttributesController.php:2108;2117
+#: Controller/AttributesController.php:2115;2124
 msgid "Invalid attribute or no authorisation to view it."
 msgstr ""
 
-#: Controller/AttributesController.php:2185
+#: Controller/AttributesController.php:2192
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
 msgstr ""
 
-#: Controller/AttributesController.php:2249
+#: Controller/AttributesController.php:2256
 msgid "Invalid event ID format."
 msgstr ""
 
-#: Controller/AttributesController.php:2358
-#: Controller/ShadowAttributesController.php:1252
+#: Controller/AttributesController.php:2365
+#: Controller/ShadowAttributesController.php:1254
 msgid "All done. "
 msgstr ""
 
-#: Controller/AttributesController.php:2390;2437
-#: Controller/ShadowAttributesController.php:1060
+#: Controller/AttributesController.php:2397;2444
+#: Controller/ShadowAttributesController.php:1062
 msgid "Invalid field requested."
 msgstr ""
 
-#: Controller/AttributesController.php:2393;2440
+#: Controller/AttributesController.php:2400;2447
 msgid "This function can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:2505;2513
-#: Controller/EventsController.php:3550;3699
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:2534
+#: Controller/AttributesController.php:2541
 msgid "This action can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:2543;2794;2808;2819
-#: Controller/ServersController.php:618;686
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
 msgid "You are not authorised to do that."
 msgstr ""
 
-#: Controller/AttributesController.php:2648
-#: Controller/EventsController.php:4213
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
 msgid "This functionality requires API key access."
 msgstr ""
 
-#: Controller/AttributesController.php:2656
+#: Controller/AttributesController.php:2663
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr ""
 
-#: Controller/AttributesController.php:2668
+#: Controller/AttributesController.php:2675
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr ""
 
-#: Controller/AttributesController.php:2829
+#: Controller/AttributesController.php:2836
 msgid "Invalid script."
 msgstr ""
 
-#: Controller/AttributesController.php:2894
+#: Controller/AttributesController.php:2901
 msgid "No valid enrichment options found for this attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:2957
+#: Controller/AttributesController.php:2964
 msgid "Invalid type requested."
 msgstr ""
 
-#: Controller/AttributesController.php:3233
-#: Controller/EventsController.php:5013
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr ""
 
-#: Controller/AttributesController.php:3237;3252
+#: Controller/AttributesController.php:3243;3258
 #: Controller/ShadowAttributesController.php:677
 msgid "Invalid Attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:3240;3255
-#: Controller/EventsController.php:5020;5034
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
 msgid "You don't have permission to do that."
 msgstr ""
 
@@ -300,286 +300,286 @@ msgstr ""
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr ""
 
-#: Controller/EventsController.php:820
+#: Controller/EventsController.php:848
 msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:822
+#: Controller/EventsController.php:850
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:828
+#: Controller/EventsController.php:856
 msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:830
+#: Controller/EventsController.php:858
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:1445
+#: Controller/EventsController.php:1559
 msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1577
+#: Controller/EventsController.php:1769
 msgid "You don't have permissions to create events"
 msgstr ""
 
-#: Controller/EventsController.php:1583
+#: Controller/EventsController.php:1775
 msgid "No valid event data received."
 msgstr ""
 
-#: Controller/EventsController.php:1619
+#: Controller/EventsController.php:1811
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr ""
 
-#: Controller/EventsController.php:1623;1627
+#: Controller/EventsController.php:1815;1819
 msgid "Invalid Sharing Group or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:1651
+#: Controller/EventsController.php:1843
 msgid "Event blocked by local blacklist."
 msgstr ""
 
-#: Controller/EventsController.php:1664;1746;2014
+#: Controller/EventsController.php:1856;1933;2197
 msgid "The event has been saved"
 msgstr ""
 
-#: Controller/EventsController.php:1672
+#: Controller/EventsController.php:1864
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr ""
 
-#: Controller/EventsController.php:1683
+#: Controller/EventsController.php:1870
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr ""
 
-#: Controller/EventsController.php:1685;2017
+#: Controller/EventsController.php:1872;2200
 msgid "The event could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/EventsController.php:1725
+#: Controller/EventsController.php:1912
 msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
 msgstr ""
 
-#: Controller/EventsController.php:1772
+#: Controller/EventsController.php:1959
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr ""
 
-#: Controller/EventsController.php:1773
+#: Controller/EventsController.php:1960
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr ""
 
-#: Controller/EventsController.php:1822
+#: Controller/EventsController.php:2009
 msgid "STIX document imported, event's created: "
 msgstr ""
 
-#: Controller/EventsController.php:1825
+#: Controller/EventsController.php:2012
 msgid "STIX document imported."
 msgstr ""
 
-#: Controller/EventsController.php:1828
+#: Controller/EventsController.php:2015
 msgid "Could not import STIX document: "
 msgstr ""
 
-#: Controller/EventsController.php:1835
+#: Controller/EventsController.php:2022
 msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
 msgstr ""
 
-#: Controller/EventsController.php:1859;1944
+#: Controller/EventsController.php:2046;2131
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr ""
 
-#: Controller/EventsController.php:1867
+#: Controller/EventsController.php:2054
 msgid "Invalid event ID entered."
 msgstr ""
 
-#: Controller/EventsController.php:1872
+#: Controller/EventsController.php:2059
 msgid "You are not authorised to read the selected event."
 msgstr ""
 
-#: Controller/EventsController.php:2166;2204;2267
+#: Controller/EventsController.php:2349;2387;2450
 msgid "You don't have the permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:2175
+#: Controller/EventsController.php:2358
 msgid "Event unpublished."
 msgstr ""
 
-#: Controller/EventsController.php:2354
+#: Controller/EventsController.php:2537
 msgid "Email sent to the reporter."
 msgstr ""
 
-#: Controller/EventsController.php:2356
+#: Controller/EventsController.php:2539
 msgid "Sending of email failed"
 msgstr ""
 
-#: Controller/EventsController.php:2495
+#: Controller/EventsController.php:2678
 msgid "This feature is currently disabled"
 msgstr ""
 
-#: Controller/EventsController.php:2537;3800
+#: Controller/EventsController.php:2720;3986
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
 msgstr ""
 
-#: Controller/EventsController.php:2573
+#: Controller/EventsController.php:2756
 msgid "Invalid Event ID."
 msgstr ""
 
-#: Controller/EventsController.php:2620
+#: Controller/EventsController.php:2803
 msgid "No events found that match the passed parameters."
 msgstr ""
 
-#: Controller/EventsController.php:2645
+#: Controller/EventsController.php:2828
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
 msgstr ""
 
-#: Controller/EventsController.php:2720
+#: Controller/EventsController.php:2903
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
 msgstr ""
 
-#: Controller/EventsController.php:2739
-#: Model/Attribute.php:1966
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
 msgid "Invalid hash type."
 msgstr ""
 
-#: Controller/EventsController.php:2842
+#: Controller/EventsController.php:3025
 msgid "Filename not allowed."
 msgstr ""
 
-#: Controller/EventsController.php:2862
+#: Controller/EventsController.php:3045
 msgid "Problem with writing the ioc file. Please report to administrator."
 msgstr ""
 
-#: Controller/EventsController.php:2956
+#: Controller/EventsController.php:3139
 msgid "This is not a valid MISP XML file."
 msgstr ""
 
-#: Controller/EventsController.php:3105
+#: Controller/EventsController.php:3291
 msgid "Not yet implemented"
 msgstr ""
 
-#: Controller/EventsController.php:3123;3127
+#: Controller/EventsController.php:3309;3313
 msgid "Invalid event or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:3147;3217
+#: Controller/EventsController.php:3333;3403
 msgid "You don't have the privileges to access this."
 msgstr ""
 
-#: Controller/EventsController.php:3424
+#: Controller/EventsController.php:3610
 #: Controller/TagCollectionsController.php:307
 msgid "Invalid Tag."
 msgstr ""
 
-#: Controller/EventsController.php:3440
+#: Controller/EventsController.php:3626
 #: Controller/TagCollectionsController.php:323
 msgid "Tag is already attached to this event."
 msgstr ""
 
-#: Controller/EventsController.php:3451;3457
+#: Controller/EventsController.php:3637;3643
 #: Controller/TagCollectionsController.php:330
 msgid "Tag(s) added."
 msgstr ""
 
-#: Controller/EventsController.php:3453
+#: Controller/EventsController.php:3639
 msgid "Tag could not be added."
 msgstr ""
 
-#: Controller/EventsController.php:3459
+#: Controller/EventsController.php:3645
 #: Controller/TagCollectionsController.php:338
 msgid "All tags are already present, nothing to add."
 msgstr ""
 
-#: Controller/EventsController.php:3703;4854;5294;5298
-#: Controller/ObjectsController.php:46;140;144;448
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
 msgid "Invalid event."
 msgstr ""
 
-#: Controller/EventsController.php:3732
+#: Controller/EventsController.php:3918
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
 msgstr ""
 
-#: Controller/EventsController.php:3860;3890;3906
+#: Controller/EventsController.php:4049;4079;4095
 msgid "You do not have the permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:3971;4111
+#: Controller/EventsController.php:4160;4300
 msgid "Invalid ID"
 msgstr ""
 
-#: Controller/EventsController.php:3975;4115
+#: Controller/EventsController.php:4164;4304
 msgid "Event not found or you are not authorised to view it."
 msgstr ""
 
-#: Controller/EventsController.php:4216;4223
+#: Controller/EventsController.php:4405;4412
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4252
+#: Controller/EventsController.php:4441
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4260
+#: Controller/EventsController.php:4449
 msgid "Event not found"
 msgstr ""
 
-#: Controller/EventsController.php:4283
+#: Controller/EventsController.php:4472
 msgid "Event not found."
 msgstr ""
 
-#: Controller/EventsController.php:4293
+#: Controller/EventsController.php:4482
 msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
 msgstr ""
 
-#: Controller/EventsController.php:4318
+#: Controller/EventsController.php:4507
 msgid "The creation of a new event with the supplied information has failed."
 msgstr ""
 
-#: Controller/EventsController.php:4457;4479;4508;4533;4558;4588;4609
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
 msgid "Invalid type."
 msgstr ""
 
-#: Controller/EventsController.php:4670
+#: Controller/EventsController.php:4906
 msgid "Invalid method."
 msgstr ""
 
-#: Controller/EventsController.php:4745
+#: Controller/EventsController.php:4989
 msgid "%s services are not enabled."
 msgstr ""
 
-#: Controller/EventsController.php:4749
+#: Controller/EventsController.php:4993
 msgid "Attribute not found or you are not authorised to see it."
 msgstr ""
 
-#: Controller/EventsController.php:4755
+#: Controller/EventsController.php:4999
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4772
+#: Controller/EventsController.php:5016
 msgid "no valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4794
+#: Controller/EventsController.php:5038
 msgid "%s service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:4806
+#: Controller/EventsController.php:5050
 msgid ": Enriched via the %s"
 msgstr ""
 
-#: Controller/EventsController.php:4940
+#: Controller/EventsController.php:5184
 msgid "Import service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5107
+#: Controller/EventsController.php:5351
 msgid "Invalid ID."
 msgstr ""
 
-#: Controller/EventsController.php:5155
+#: Controller/EventsController.php:5399
 #: Controller/ShadowAttributesController.php:311;316;532
 msgid "Invalid Event"
 msgstr ""
 
-#: Controller/EventsController.php:5176
+#: Controller/EventsController.php:5420
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr ""
 
@@ -587,135 +587,135 @@ msgstr ""
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:202;300
+#: Controller/FeedsController.php:205;303
 msgid "Feed added."
 msgstr ""
 
-#: Controller/FeedsController.php:210
+#: Controller/FeedsController.php:213
 msgid "Feed could not be added. Invalid field: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:235;335;357;479;514;697
+#: Controller/FeedsController.php:238;338;360;482;517;721
 msgid "Invalid feed."
 msgstr ""
 
-#: Controller/FeedsController.php:308
+#: Controller/FeedsController.php:311
 msgid "Feed could not be updated. Invalid fields: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:331
+#: Controller/FeedsController.php:334
 msgid "This action requires a post request."
 msgstr ""
 
-#: Controller/FeedsController.php:364;483
+#: Controller/FeedsController.php:367;486
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr ""
 
-#: Controller/FeedsController.php:377;443
+#: Controller/FeedsController.php:380;446
 msgid "Starting fetch from Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:388
+#: Controller/FeedsController.php:391
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:393;395
+#: Controller/FeedsController.php:396;398
 msgid "Fetching the feed has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:399
+#: Controller/FeedsController.php:402
 msgid "Fetching the feed has successfuly completed."
 msgstr ""
 
-#: Controller/FeedsController.php:460
+#: Controller/FeedsController.php:463
 msgid "Fetching the feed has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:490
+#: Controller/FeedsController.php:493
 msgid "Event added."
 msgstr ""
 
-#: Controller/FeedsController.php:493
+#: Controller/FeedsController.php:496
 msgid "Event already up to date."
 msgstr ""
 
-#: Controller/FeedsController.php:495
+#: Controller/FeedsController.php:498
 msgid "Event updated."
 msgstr ""
 
-#: Controller/FeedsController.php:499
+#: Controller/FeedsController.php:502
 msgid "Could not %s event."
 msgstr ""
 
-#: Controller/FeedsController.php:502
+#: Controller/FeedsController.php:505
 msgid "Download failed."
 msgstr ""
 
-#: Controller/FeedsController.php:573
+#: Controller/FeedsController.php:597
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr ""
 
-#: Controller/FeedsController.php:612;663
+#: Controller/FeedsController.php:636;687
 msgid "Invalid feed type."
 msgstr ""
 
-#: Controller/FeedsController.php:729
+#: Controller/FeedsController.php:753
 msgid "This event is blocked by the Feed filters."
 msgstr ""
 
-#: Controller/FeedsController.php:731
+#: Controller/FeedsController.php:755
 msgid "Could not download the selected Event"
 msgstr ""
 
-#: Controller/FeedsController.php:767;771
+#: Controller/FeedsController.php:791;795
 msgid "Invalid Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:792
+#: Controller/FeedsController.php:816
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: Controller/FeedsController.php:796
+#: Controller/FeedsController.php:820
 msgid "Feed not found."
 msgstr ""
 
-#: Controller/FeedsController.php:805
+#: Controller/FeedsController.php:829
 msgid "Data pulled."
 msgstr ""
 
-#: Controller/FeedsController.php:807
+#: Controller/FeedsController.php:831
 msgid "Could not pull the selected data. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:824
+#: Controller/FeedsController.php:848
 msgid "Starting feed caching."
 msgstr ""
 
-#: Controller/FeedsController.php:839
+#: Controller/FeedsController.php:863
 msgid "Caching the feeds has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:842
+#: Controller/FeedsController.php:866
 msgid "Caching the feeds has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:876
+#: Controller/FeedsController.php:900
 msgid "Invalid feed list received."
 msgstr ""
 
-#: Controller/GalaxiesController.php:112
+#: Controller/GalaxiesController.php:92
 msgid "All clusters"
 msgstr ""
 
-#: Controller/GalaxiesController.php:161
+#: Controller/GalaxiesController.php:135
 msgid "All namespaces"
 msgstr ""
 
-#: Controller/GalaxiesController.php:274
+#: Controller/GalaxiesController.php:250
 msgid "Failed to parse request."
 msgstr ""
 
-#: Controller/GalaxiesController.php:277
+#: Controller/GalaxiesController.php:253
 msgid "No clusters picked."
 msgstr ""
 
@@ -739,34 +739,15 @@ msgstr ""
 msgid "All Objects"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:82
-#: View/Elements/templateElements/templateRowAttribute.ctp:30
-#: View/Elements/templateElements/templateRowFile.ctp:30
-#: View/Events/resolved_attributes.ctp:47
-#: View/Events/show_i_o_c_results.ctp:11
-#: View/Feeds/freetext_index.ctp:31
-#: View/Objects/add.ctp:95
-#: View/Objects/revise_object.ctp:44
-#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
-#: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
-#: View/ShadowAttributes/index.ctp:48
-#: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
-#: View/TemplateElements/ajax/template_element_add_file.ctp:28
-#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
-#: View/TemplateElements/ajax/template_element_edit_file.ctp:28
-#: View/Templates/populate_event_from_template_attributes.ctp:6
-msgid "Category"
-msgstr ""
-
-#: Controller/ObjectTemplatesController.php:106
+#: Controller/ObjectTemplatesController.php:99
 msgid "Invalid object template"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:110
+#: Controller/ObjectTemplatesController.php:103
 msgid "Invalid object template id."
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:150
+#: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
 msgstr ""
 
@@ -787,23 +768,23 @@ msgstr ""
 msgid "Invalid template."
 msgstr ""
 
-#: Controller/ObjectsController.php:309
+#: Controller/ObjectsController.php:311
 msgid "You don't have permissions to edit objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:323;334;437
+#: Controller/ObjectsController.php:325;336;439
 msgid "Invalid object."
 msgstr ""
 
-#: Controller/ObjectsController.php:431
+#: Controller/ObjectsController.php:433
 msgid "You don't have permissions to delete objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:541;548;552
+#: Controller/ObjectsController.php:543;550;554
 msgid "Object not found or not authorised."
 msgstr ""
 
-#: Controller/ObjectsController.php:809
+#: Controller/ObjectsController.php:811
 msgid "%s objects successfully reconstructed."
 msgstr ""
 
@@ -891,7 +872,7 @@ msgstr ""
 msgid "The server could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ServersController.php:392;588;613;622;682;1468
+#: Controller/ServersController.php:392;589;614;623;683;1360
 msgid "Invalid server"
 msgstr ""
 
@@ -899,63 +880,59 @@ msgstr ""
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr ""
 
-#: Controller/ServersController.php:595
+#: Controller/ServersController.php:596
 msgid "Server deleted"
 msgstr ""
 
-#: Controller/ServersController.php:598
+#: Controller/ServersController.php:599
 msgid "Server was not deleted"
 msgstr ""
 
-#: Controller/ServersController.php:625
+#: Controller/ServersController.php:626
 msgid "Pull setting not enabled for this server."
 msgstr ""
 
-#: Controller/ServersController.php:658
+#: Controller/ServersController.php:659
 msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:695
+#: Controller/ServersController.php:696
 msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
 msgstr ""
 
-#: Controller/ServersController.php:708
+#: Controller/ServersController.php:709
 msgid "Push complete. %s events pushed, %s events could not be pushed."
 msgstr ""
 
-#: Controller/ServersController.php:733
+#: Controller/ServersController.php:734
 msgid "Push queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:1327
-msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
-msgstr ""
-
-#: Controller/ServersController.php:1365
+#: Controller/ServersController.php:1257
 msgid "File not found."
 msgstr ""
 
-#: Controller/ServersController.php:1371
+#: Controller/ServersController.php:1263
 msgid "File could not be deleted."
 msgstr ""
 
-#: Controller/ServersController.php:1394;1410
+#: Controller/ServersController.php:1286;1302
 msgid "Upload failed."
 msgstr ""
 
-#: Controller/ServersController.php:1402
+#: Controller/ServersController.php:1294
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr ""
 
-#: Controller/ServersController.php:1856
+#: Controller/ServersController.php:1748
 msgid "Starting server caching."
 msgstr ""
 
-#: Controller/ServersController.php:1871
+#: Controller/ServersController.php:1763
 msgid "Caching the servers has failed."
 msgstr ""
 
-#: Controller/ServersController.php:1874
+#: Controller/ServersController.php:1766
 msgid "Caching the servers has successfully completed."
 msgstr ""
 
@@ -1015,23 +992,23 @@ msgstr ""
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:892;902
+#: Controller/ShadowAttributesController.php:894;904
 msgid "Invalid proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:946
+#: Controller/ShadowAttributesController.php:948
 msgid "No proposals found or invalid event."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:978;1014
+#: Controller/ShadowAttributesController.php:980;1016
 msgid "This feature is only available using the API to Sync users"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:981
+#: Controller/ShadowAttributesController.php:983
 msgid "Invalid UUID"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:1017
+#: Controller/ShadowAttributesController.php:1019
 msgid "This feature is only available using POST requests"
 msgstr ""
 
@@ -1059,15 +1036,15 @@ msgstr ""
 msgid "Attribute not found"
 msgstr ""
 
-#: Controller/SightingsController.php:175
+#: Controller/SightingsController.php:176
 msgid "Invalid request."
 msgstr ""
 
-#: Controller/SightingsController.php:184
+#: Controller/SightingsController.php:185
 msgid "Sighting added."
 msgstr ""
 
-#: Controller/SightingsController.php:186
+#: Controller/SightingsController.php:187
 msgid "Sighting could not be added"
 msgstr ""
 
@@ -1148,7 +1125,7 @@ msgstr ""
 msgid "Taxonomy Library"
 msgstr ""
 
-#: Controller/TagsController.php:772
+#: Controller/TagsController.php:756
 msgid "Includes: "
 msgstr ""
 
@@ -1160,15 +1137,15 @@ msgstr ""
 msgid "Event populated, but "
 msgstr ""
 
-#: Controller/UsersController.php:42;221
+#: Controller/UsersController.php:42;247
 msgid "Invalid user or not authorised."
 msgstr ""
 
-#: Controller/UsersController.php:54;430;657;903
+#: Controller/UsersController.php:54;456;683;929
 msgid "Invalid user"
 msgstr ""
 
-#: Controller/UsersController.php:119;564;728
+#: Controller/UsersController.php:119;590;754
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
@@ -1180,67 +1157,75 @@ msgstr ""
 msgid "The profile could not be updated. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:198
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
 msgid "Password Changed."
 msgstr ""
 
-#: Controller/UsersController.php:203
+#: Controller/UsersController.php:222
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr ""
 
-#: Controller/UsersController.php:575
+#: Controller/UsersController.php:601
 msgid "The user could not be saved. Invalid organisation."
 msgstr ""
 
-#: Controller/UsersController.php:597
+#: Controller/UsersController.php:623
 msgid "The user has been saved."
 msgstr ""
 
-#: Controller/UsersController.php:606;839
+#: Controller/UsersController.php:632;865
 msgid "The user could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:831
+#: Controller/UsersController.php:857
 msgid "The user has been saved"
 msgstr ""
 
-#: Controller/UsersController.php:911
+#: Controller/UsersController.php:937
 msgid "User deleted"
 msgstr ""
 
-#: Controller/UsersController.php:915
+#: Controller/UsersController.php:941
 msgid "User was not deleted"
 msgstr ""
 
-#: Controller/UsersController.php:993
+#: Controller/UsersController.php:1019
 msgid "Invalid username or password, try again"
 msgstr ""
 
-#: Controller/UsersController.php:1076
+#: Controller/UsersController.php:1106
 msgid "Good-Bye"
 msgstr ""
 
-#: Controller/UsersController.php:1117
+#: Controller/UsersController.php:1147
 msgid "New authkey generated."
 msgstr ""
 
-#: Controller/UsersController.php:1226
+#: Controller/UsersController.php:1256
 msgid "You accepted the Terms and Conditions."
 msgstr ""
 
-#: Controller/UsersController.php:1408
+#: Controller/UsersController.php:1438
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1413
+#: Controller/UsersController.php:1443
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1450
+#: Controller/UsersController.php:1480
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr ""
 
-#: Controller/UsersController.php:1452
+#: Controller/UsersController.php:1482
 msgid "E-mails sent."
 msgstr ""
 
@@ -1288,1004 +1273,1020 @@ msgstr ""
 msgid "Could not remove the blacklist entry"
 msgstr ""
 
-#: Model/Attribute.php:588
+#: Model/Attribute.php:591
 msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/Attribute.php:700
+#: Model/Attribute.php:703
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Attribute.php:825
+#: Model/Attribute.php:828
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Attribute.php:950
+#: Model/Attribute.php:953
 msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:957
+#: Model/Attribute.php:960
 msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:964
+#: Model/Attribute.php:967
 msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:975
+#: Model/Attribute.php:978
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:986
+#: Model/Attribute.php:989
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:993
+#: Model/Attribute.php:996
 msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
 msgstr ""
 
-#: Model/Attribute.php:1008
+#: Model/Attribute.php:1011
 msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:1026
+#: Model/Attribute.php:1029
 msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1031
+#: Model/Attribute.php:1034
 msgid "Invalid composite type. The format has to be %s."
 msgstr ""
 
-#: Model/Attribute.php:1042
+#: Model/Attribute.php:1045
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr ""
 
-#: Model/Attribute.php:1050
+#: Model/Attribute.php:1053
 msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1061
+#: Model/Attribute.php:1064
 msgid "Invalid CIDR notation value found."
 msgstr ""
 
-#: Model/Attribute.php:1068;1119
+#: Model/Attribute.php:1071;1122
 msgid "IP address has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1073
+#: Model/Attribute.php:1076
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr ""
 
-#: Model/Attribute.php:1102
+#: Model/Attribute.php:1105
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1122
+#: Model/Attribute.php:1125
 msgid "Domain name has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1135
+#: Model/Attribute.php:1138
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1143
+#: Model/Attribute.php:1146
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr ""
 
-#: Model/Attribute.php:1154
+#: Model/Attribute.php:1157
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr ""
 
-#: Model/Attribute.php:1267
+#: Model/Attribute.php:1272
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr ""
 
-#: Model/Attribute.php:1273
+#: Model/Attribute.php:1278
 msgid "The value has to be a number greater or equal 0."
 msgstr ""
 
-#: Model/Attribute.php:1280
+#: Model/Attribute.php:1285
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:1962;2030
+#: Model/Attribute.php:1968;2036
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2610
+#: Model/Attribute.php:2616
 msgid "This field is mandatory."
 msgstr ""
 
-#: Model/Attribute.php:3062
+#: Model/Attribute.php:3069
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
-#: Model/AttributeTag.php:131;160
-msgid "Invalid attributes"
-msgstr ""
-
-#: Model/Event.php:5198
+#: Model/Event.php:5392
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:5200
+#: Model/Event.php:5394
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:5202
+#: Model/Event.php:5396
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:5205
+#: Model/Event.php:5399
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:5207
+#: Model/Event.php:5401
 msgid "Please "
 msgstr ""
 
-#: Model/Event.php:5209
+#: Model/Event.php:5403
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:5241
+#: Model/Event.php:5435
 msgid "#"
 msgstr ""
 
-#: Model/Event.php:5250
+#: Model/Event.php:5444
 msgid "%s not set"
 msgstr ""
 
-#: Model/Event.php:5471
+#: Model/Event.php:5667
 msgid "Could not add tags."
 msgstr ""
 
-#: Model/Galaxy.php:199;256;266;280
+#: Model/Galaxy.php:219;276;286;300
 msgid "Invalid %s."
 msgstr ""
 
-#: Model/Server.php:119
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
 msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
 msgstr ""
 
-#: Model/Server.php:120
+#: Model/Server.php:122
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:130
+#: Model/Server.php:132
 msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
 msgstr ""
 
-#: Model/Server.php:131
+#: Model/Server.php:133
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:140
+#: Model/Server.php:142
 msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
 msgstr ""
 
-#: Model/Server.php:142
+#: Model/Server.php:144
 msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
 msgstr ""
 
-#: Model/Server.php:148
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:156
+#: Model/Server.php:166
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:166
+#: Model/Server.php:176
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr ""
 
-#: Model/Server.php:175
+#: Model/Server.php:185
 msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
 msgstr ""
 
-#: Model/Server.php:185
+#: Model/Server.php:195
 msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
 msgstr ""
 
-#: Model/Server.php:194
+#: Model/Server.php:204
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:202
+#: Model/Server.php:212
 msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
 msgstr ""
 
-#: Model/Server.php:211
+#: Model/Server.php:221
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:213
+#: Model/Server.php:223
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:219;227;245;269;277;285;293;350;398;406;472
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
 msgid "This setting is deprecated and can be safely removed."
 msgstr ""
 
-#: Model/Server.php:235
+#: Model/Server.php:245
 msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
 msgstr ""
 
-#: Model/Server.php:253
+#: Model/Server.php:263
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:261
+#: Model/Server.php:271
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:301
+#: Model/Server.php:311
 msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:309
+#: Model/Server.php:319
 msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:317
+#: Model/Server.php:327
 msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:325
+#: Model/Server.php:335
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:333
+#: Model/Server.php:343
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:342
+#: Model/Server.php:352
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:344
+#: Model/Server.php:354
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:358
+#: Model/Server.php:368
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:366
+#: Model/Server.php:376
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:374
+#: Model/Server.php:384
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:382
+#: Model/Server.php:392
 msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
 msgstr ""
 
-#: Model/Server.php:390
+#: Model/Server.php:400
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:414
+#: Model/Server.php:424
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:422
+#: Model/Server.php:432
 msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
 msgstr ""
 
-#: Model/Server.php:431
+#: Model/Server.php:441
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:439
+#: Model/Server.php:449
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:447
+#: Model/Server.php:457
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:455
+#: Model/Server.php:465
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr ""
 
-#: Model/Server.php:464
+#: Model/Server.php:474
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:480
+#: Model/Server.php:490
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:488
+#: Model/Server.php:498
 msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
 msgstr ""
 
-#: Model/Server.php:496
+#: Model/Server.php:506
 msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
 msgstr ""
 
-#: Model/Server.php:504
+#: Model/Server.php:514
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:513
+#: Model/Server.php:523
 msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
 msgstr ""
 
-#: Model/Server.php:522
+#: Model/Server.php:532
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:531
+#: Model/Server.php:541
 msgid "The tag collection to be applied to all events created manually."
 msgstr ""
 
-#: Model/Server.php:540
+#: Model/Server.php:550
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:548
+#: Model/Server.php:558
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:557
+#: Model/Server.php:567
 msgid "Used on the login page, before the MISP logo"
 msgstr ""
 
-#: Model/Server.php:565
+#: Model/Server.php:575
 msgid "Used on the login page, after the MISP logo"
 msgstr ""
 
-#: Model/Server.php:573
+#: Model/Server.php:583
 msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:581
+#: Model/Server.php:591
 msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:589
+#: Model/Server.php:599
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:597
+#: Model/Server.php:607
 msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
 msgstr ""
 
-#: Model/Server.php:605
+#: Model/Server.php:615
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:613
+#: Model/Server.php:623
 msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
 msgstr ""
 
-#: Model/Server.php:621
+#: Model/Server.php:631
 msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
 msgstr ""
 
-#: Model/Server.php:629
+#: Model/Server.php:639
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:638
+#: Model/Server.php:648
 msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:647
+#: Model/Server.php:657
 msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:655
+#: Model/Server.php:665
 msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
 msgstr ""
 
-#: Model/Server.php:662
+#: Model/Server.php:672
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:669
+#: Model/Server.php:679
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:678
+#: Model/Server.php:688
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:686
+#: Model/Server.php:696
 msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
 msgstr ""
 
-#: Model/Server.php:695
+#: Model/Server.php:705
 msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
 msgstr ""
 
-#: Model/Server.php:704
+#: Model/Server.php:714
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:713
+#: Model/Server.php:723
 msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:722
+#: Model/Server.php:732
 msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:731
+#: Model/Server.php:741
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:741
+#: Model/Server.php:751
 msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
 msgstr ""
 
-#: Model/Server.php:750
+#: Model/Server.php:760
 msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
 msgstr ""
 
-#: Model/Server.php:759
+#: Model/Server.php:769
 msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
 msgstr ""
 
-#: Model/Server.php:768
+#: Model/Server.php:778
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:777
+#: Model/Server.php:787
 msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
 msgstr ""
 
-#: Model/Server.php:786
+#: Model/Server.php:796
 msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
 msgstr ""
 
-#: Model/Server.php:795
+#: Model/Server.php:805
 msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
 msgstr ""
 
-#: Model/Server.php:804
+#: Model/Server.php:814
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr ""
 
-#: Model/Server.php:813
+#: Model/Server.php:823
 msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
 msgstr ""
 
-#: Model/Server.php:823
+#: Model/Server.php:833
 msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
 msgstr ""
 
-#: Model/Server.php:832
+#: Model/Server.php:842
 msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:840
+#: Model/Server.php:850
 msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:848
+#: Model/Server.php:858
 msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
 msgstr ""
 
-#: Model/Server.php:856
+#: Model/Server.php:866
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:865
+#: Model/Server.php:875
 msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
 msgstr ""
 
-#: Model/Server.php:873
+#: Model/Server.php:883
 msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
 msgstr ""
 
-#: Model/Server.php:881
+#: Model/Server.php:891
 msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
 msgstr ""
 
-#: Model/Server.php:893
+#: Model/Server.php:903
 msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
 msgstr ""
 
-#: Model/Server.php:901
+#: Model/Server.php:911
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:909
+#: Model/Server.php:919
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:917
+#: Model/Server.php:927
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:925
+#: Model/Server.php:935
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:933
+#: Model/Server.php:943
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:942
+#: Model/Server.php:952
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:953
+#: Model/Server.php:963
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr ""
 
-#: Model/Server.php:961
+#: Model/Server.php:971
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:969
+#: Model/Server.php:979
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:977
+#: Model/Server.php:987
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:985
+#: Model/Server.php:995
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:997
+#: Model/Server.php:1007
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:1005
+#: Model/Server.php:1015
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1013
+#: Model/Server.php:1023
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:1021
+#: Model/Server.php:1031
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1029
+#: Model/Server.php:1039
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1040
+#: Model/Server.php:1050
 msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
 msgstr ""
 
-#: Model/Server.php:1049
+#: Model/Server.php:1059
 msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
 msgstr ""
 
-#: Model/Server.php:1058
+#: Model/Server.php:1068
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr ""
 
-#: Model/Server.php:1066
+#: Model/Server.php:1076
 msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 msgstr ""
 
-#: Model/Server.php:1074
+#: Model/Server.php:1084
 msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
 msgstr ""
 
-#: Model/Server.php:1083
+#: Model/Server.php:1093
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1092
+#: Model/Server.php:1102
 msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
 msgstr ""
 
-#: Model/Server.php:1101
+#: Model/Server.php:1111
 msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
 msgstr ""
 
-#: Model/Server.php:1103
+#: Model/Server.php:1113
 msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
 msgstr ""
 
-#: Model/Server.php:1113
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1121
+#: Model/Server.php:1149
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr ""
 
-#: Model/Server.php:1132
+#: Model/Server.php:1160
 msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
 msgstr ""
 
-#: Model/Server.php:1140
+#: Model/Server.php:1168
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr ""
 
-#: Model/Server.php:1148
+#: Model/Server.php:1176
 msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
 msgstr ""
 
-#: Model/Server.php:1157
+#: Model/Server.php:1185
 msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
 msgstr ""
 
-#: Model/Server.php:1165
+#: Model/Server.php:1193
 msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
 msgstr ""
 
-#: Model/Server.php:1176
+#: Model/Server.php:1204
 msgid "The default policy action for the values added to the RPZ."
 msgstr ""
 
-#: Model/Server.php:1185
+#: Model/Server.php:1213
 msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1193
+#: Model/Server.php:1221
 msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
 msgstr ""
 
-#: Model/Server.php:1201
+#: Model/Server.php:1229
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1209
+#: Model/Server.php:1237
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1217
+#: Model/Server.php:1245
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1225
+#: Model/Server.php:1253
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1233
+#: Model/Server.php:1261
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1249
+#: Model/Server.php:1277
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:1257
+#: Model/Server.php:1285
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1265
+#: Model/Server.php:1293
 msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
 msgstr ""
 
-#: Model/Server.php:1274
+#: Model/Server.php:1302
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1283
+#: Model/Server.php:1311
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1292
+#: Model/Server.php:1320
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1301
+#: Model/Server.php:1329
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1310
+#: Model/Server.php:1338
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1319
+#: Model/Server.php:1347
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1328
+#: Model/Server.php:1356
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1336
+#: Model/Server.php:1364
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1344
+#: Model/Server.php:1372
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1352
+#: Model/Server.php:1380
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1360
+#: Model/Server.php:1388
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1368
+#: Model/Server.php:1396
 msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1376
+#: Model/Server.php:1404
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1384
+#: Model/Server.php:1412
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1392
+#: Model/Server.php:1420
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1428
 msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1436
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1416
+#: Model/Server.php:1444
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1424
+#: Model/Server.php:1452
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1432
+#: Model/Server.php:1460
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1440
+#: Model/Server.php:1468
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1448
+#: Model/Server.php:1476
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1456
+#: Model/Server.php:1484
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr ""
 
-#: Model/Server.php:1464
+#: Model/Server.php:1492
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:1472
+#: Model/Server.php:1500
 msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
 msgstr ""
 
-#: Model/Server.php:1481
+#: Model/Server.php:1509
 msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
 msgstr ""
 
-#: Model/Server.php:1489
+#: Model/Server.php:1517
 msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
 msgstr ""
 
-#: Model/Server.php:1497
+#: Model/Server.php:1525
 msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
 msgstr ""
 
-#: Model/Server.php:1507
+#: Model/Server.php:1535
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1516
+#: Model/Server.php:1544
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1525
+#: Model/Server.php:1553
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1534
+#: Model/Server.php:1562
 msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
 msgstr ""
 
-#: Model/Server.php:1543
+#: Model/Server.php:1571
 msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
 msgstr ""
 
-#: Model/Server.php:1552
+#: Model/Server.php:1580
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr ""
 
-#: Model/Server.php:1561
+#: Model/Server.php:1589
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1569
+#: Model/Server.php:1597
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1577
+#: Model/Server.php:1605
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1585;1697
+#: Model/Server.php:1613;1725
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:1593;1714
+#: Model/Server.php:1621;1742
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:1601
+#: Model/Server.php:1629
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1609
+#: Model/Server.php:1637
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1617
+#: Model/Server.php:1645
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1625
+#: Model/Server.php:1653
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1633
+#: Model/Server.php:1661
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:1641
+#: Model/Server.php:1669
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:1649
+#: Model/Server.php:1677
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1657
+#: Model/Server.php:1685
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:1665
+#: Model/Server.php:1693
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1673
+#: Model/Server.php:1701
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1681
+#: Model/Server.php:1709
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:1689
+#: Model/Server.php:1717
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:1705
+#: Model/Server.php:1733
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:1722
+#: Model/Server.php:1750
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:1731
+#: Model/Server.php:1759
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:1740
+#: Model/Server.php:1768
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr ""
 
-#: Model/Server.php:1749
+#: Model/Server.php:1777
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:1758
+#: Model/Server.php:1786
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:1767
+#: Model/Server.php:1795
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:1777
+#: Model/Server.php:1805
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:1786
+#: Model/Server.php:1814
 msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
 msgstr ""
 
-#: Model/Server.php:1919
+#: Model/Server.php:1947
 msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
 msgstr ""
 
-#: Model/Server.php:2026
+#: Model/Server.php:2054
 msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
 msgstr ""
 
-#: Model/Server.php:2028
+#: Model/Server.php:2056
 msgid "Sorry, this is not yet implemented"
 msgstr ""
 
-#: Model/Server.php:2029
+#: Model/Server.php:2057
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2041;2043
+#: Model/Server.php:2069;2071
 msgid "Unknown issue."
 msgstr ""
 
-#: Model/Server.php:2507
+#: Model/Server.php:2535
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:2510
+#: Model/Server.php:2538
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:2518
+#: Model/Server.php:2546
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:2633
+#: Model/Server.php:2661
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3319
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
 msgid "Organisation logos"
 msgstr ""
 
-#: Model/Server.php:3320
+#: Model/Server.php:3476
 msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
 msgstr ""
 
-#: Model/Server.php:3322
+#: Model/Server.php:3478
 msgid "48x48 pixel .png files"
 msgstr ""
 
-#: Model/Server.php:3325;3340
+#: Model/Server.php:3481;3496
 msgid "Filename must be in the following format: *.png"
 msgstr ""
 
-#: Model/Server.php:3329
+#: Model/Server.php:3485
 msgid "Additional image files"
 msgstr ""
 
-#: Model/Server.php:3330
+#: Model/Server.php:3486
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:3337
+#: Model/Server.php:3493
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:3509
+#: Model/Server.php:3665
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:3959
+#: Model/Server.php:4115
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:3960
+#: Model/Server.php:4116
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:3964
+#: Model/Server.php:4120
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:3965
+#: Model/Server.php:4121
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
@@ -2309,7 +2310,7 @@ msgstr ""
 
 #: View/Attributes/add.ctp:7
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr ""
@@ -2393,19 +2394,19 @@ msgstr ""
 #: View/Attributes/attribute_replace.ctp:38
 #: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_mitre_attack_matrix.ctp:17
+#: View/Elements/view_galaxy_matrix.ctp:76;199
 #: View/Events/contact.ctp:29
 #: View/Events/edit.ctp:59
 #: View/Events/free_text_import.ctp:27
 #: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:78
+#: View/ObjectReferences/ajax/add.ctp:130
 #: View/Objects/add.ctp:147
 #: View/Objects/revise_object.ctp:85
 #: View/Organisations/admin_add.ctp:49
 #: View/Organisations/admin_edit.ctp:60
 #: View/Servers/add.ctp:115
 #: View/Servers/edit.ctp:162
-#: View/SharingGroups/add.ctp:75
+#: View/SharingGroups/add.ctp:115
 #: View/TagCollections/add.ctp:21
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
 #: View/TemplateElements/ajax/template_element_add_file.ctp:67
@@ -2426,13 +2427,14 @@ msgstr ""
 #: View/Attributes/add.ctp:92
 #: View/Attributes/attribute_replace.ctp:44
 #: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/exportSearch.ctp:32
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Elements/eventattributecreation.ctp:89
 #: View/Elements/flashErrorMessage.ctp:5
-#: View/Elements/view_mitre_attack_matrix.ctp:127
+#: View/Elements/view_galaxy_matrix.ctp:200
 #: View/Elements/serverRuleElements/pull.ctp:70
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2441,7 +2443,7 @@ msgstr ""
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/ajax/enrich_event.ctp:21
+#: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:15
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:31
@@ -2451,7 +2453,7 @@ msgstr ""
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
-#: View/ObjectReferences/ajax/add.ctp:82
+#: View/ObjectReferences/ajax/add.ctp:134
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/add.ctp:153
 #: View/Objects/revise_object.ctp:87
@@ -2467,10 +2469,12 @@ msgstr ""
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
 #: View/Sightings/ajax/advanced.ctp:17
-#: View/Sightings/ajax/quickAddConfirmationForm.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:6
 #: View/TemplateElements/ajax/template_element_add_file.ctp:73
@@ -2519,8 +2523,6 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:4
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_view.ctp:14
-#: View/Users/view.ctp:14
 msgid "Org"
 msgstr ""
 
@@ -2535,7 +2537,7 @@ msgid "Event date"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:404
+#: View/Events/view.ctp:446
 msgid "Event graph"
 msgstr ""
 
@@ -2563,7 +2565,7 @@ msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:26
 #: View/Noticelists/view.ctp:36
-#: View/Warninglists/view.ctp:54
+#: View/Warninglists/view.ctp:35
 msgid "Values"
 msgstr ""
 
@@ -2610,7 +2612,7 @@ msgstr ""
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:413
+#: View/Events/view.ctp:455
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -2651,46 +2653,46 @@ msgid "Results for all attributes"
 msgstr ""
 
 #: View/Attributes/index.ctp:39;132
-#: View/Elements/eventattribute.ctp:60;267
+#: View/Elements/eventattribute.ctp:60;229
 #: View/Elements/eventdiscussion.ctp:15;126
 #: View/Elements/generic_table.ctp:16
 #: View/Elements/generic_table_row.ctp:16
 #: View/Elements/Feeds/eventattribute.ctp:20;86
 #: View/Elements/Servers/eventattribute.ctp:20;86
 #: View/EventBlacklists/index.ctp:13;54
-#: View/Events/index.ctp:12;89
+#: View/Events/index.ctp:12;115
 #: View/Events/proposal_event_index.ctp:12;95
 #: View/Events/ajax/index.ctp:13;39
 #: View/Feeds/freetext_index.ctp:22;86
-#: View/Feeds/index.ctp:20;232
-#: View/Feeds/preview_index.ctp:14;82
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
 #: View/Galaxies/index.ctp:13;53
 #: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:33;162
-#: View/Logs/admin_index.ctp:37;111
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
 #: View/Logs/event_index.ctp:17;61
 #: View/News/index.ctp:39
 #: View/Noticelists/index.ctp:13;83
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
-#: View/ObjectTemplates/index.ctp:13;126
+#: View/ObjectTemplates/index.ctp:13;137
 #: View/OrgBlacklists/index.ctp:13;52
-#: View/Organisations/index.ctp:42;138
+#: View/Organisations/index.ctp:42;159
 #: View/Regexp/admin_index.ctp:13;51
 #: View/Regexp/index.ctp:13;45
 #: View/Roles/admin_index.ctp:13;82
 #: View/Roles/index.ctp:13;55
 #: View/Servers/index.ctp:13;156
-#: View/Servers/preview_index.ctp:15;164
-#: View/ShadowAttributes/index.ctp:12;108
-#: View/SharingGroups/index.ctp:13;86
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;63
-#: View/Taxonomies/view.ctp:53;171
+#: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:12;56
+#: View/Users/admin_index.ctp:12;86
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -2699,46 +2701,46 @@ msgid "previous"
 msgstr ""
 
 #: View/Attributes/index.ctp:41;134
-#: View/Elements/eventattribute.ctp:62;269
+#: View/Elements/eventattribute.ctp:62;231
 #: View/Elements/eventdiscussion.ctp:17;128
 #: View/Elements/generic_table.ctp:18
 #: View/Elements/generic_table_row.ctp:18
 #: View/Elements/Feeds/eventattribute.ctp:22;88
 #: View/Elements/Servers/eventattribute.ctp:22;88
 #: View/EventBlacklists/index.ctp:15;56
-#: View/Events/index.ctp:14;91
+#: View/Events/index.ctp:14;117
 #: View/Events/proposal_event_index.ctp:14;97
 #: View/Events/ajax/index.ctp:15;41
 #: View/Feeds/freetext_index.ctp:24;88
-#: View/Feeds/index.ctp:22;234
-#: View/Feeds/preview_index.ctp:16;84
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
 #: View/Galaxies/index.ctp:15;55
 #: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:35;164
-#: View/Logs/admin_index.ctp:39;113
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
 #: View/Logs/event_index.ctp:19;63
 #: View/News/index.ctp:41
 #: View/Noticelists/index.ctp:15;85
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
-#: View/ObjectTemplates/index.ctp:15;128
+#: View/ObjectTemplates/index.ctp:15;139
 #: View/OrgBlacklists/index.ctp:15;54
-#: View/Organisations/index.ctp:44;140
+#: View/Organisations/index.ctp:44;161
 #: View/Regexp/admin_index.ctp:15;53
 #: View/Regexp/index.ctp:15;47
 #: View/Roles/admin_index.ctp:15;84
 #: View/Roles/index.ctp:15;57
 #: View/Servers/index.ctp:15;158
-#: View/Servers/preview_index.ctp:17;166
-#: View/ShadowAttributes/index.ctp:14;110
-#: View/SharingGroups/index.ctp:15;88
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;65
-#: View/Taxonomies/view.ctp:55;173
+#: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:14;58
+#: View/Users/admin_index.ctp:14;88
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -2747,17 +2749,17 @@ msgid "next"
 msgstr ""
 
 #: View/Attributes/index.ctp:53
-#: View/Elements/eventattribute.ctp:190
+#: View/Elements/eventattribute.ctp:152
 #: View/Elements/Events/eventIndexTable.ctp:37
 #: View/Elements/Feeds/eventattribute.ctp:45
 #: View/Elements/Servers/eventattribute.ctp:45
 #: View/Events/resolved_attributes.ctp:52
-#: View/Events/view.ctp:121
+#: View/Events/view.ctp:117
 #: View/Feeds/preview_event.ctp:16
 #: View/Noticelists/view.ctp:43
 #: View/Pages/doc/using_the_system.ctp:164;207;318
 #: View/Servers/preview_event.ctp:27
-#: View/Servers/preview_index.ctp:68
+#: View/Servers/preview_index.ctp:94
 #: View/Tags/index.ctp:10
 #: View/Templates/add.ctp:12
 #: View/Templates/edit.ctp:12
@@ -2766,24 +2768,24 @@ msgid "Tags"
 msgstr ""
 
 #: View/Attributes/index.ctp:54
-#: View/Elements/eventattribute.ctp:197
-#: View/Elements/global_menu.ctp:57
-#: View/Events/view.ctp:425
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
 #: View/Events/ajax/ajaxGalaxies.ctp:6
 #: View/Galaxies/index.ctp:2
 msgid "Galaxies"
 msgstr ""
 
 #: View/Attributes/index.ctp:56
-#: View/Elements/eventattribute.ctp:199
+#: View/Elements/eventattribute.ctp:161
 msgid "Correlate"
 msgstr ""
 
 #: View/Attributes/index.ctp:57
-#: View/Elements/eventattribute.ctp:200
+#: View/Elements/eventattribute.ctp:162
 #: View/Elements/Feeds/eventattribute.ctp:47
 #: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:272
+#: View/Events/view.ctp:314
 #: View/Feeds/preview_event.ctp:73
 #: View/Pages/doc/using_the_system.ctp:235
 #: View/Servers/preview_event.ctp:95
@@ -2791,27 +2793,27 @@ msgid "Related Events"
 msgstr ""
 
 #: View/Attributes/index.ctp:58
-#: View/Elements/eventattribute.ctp:201
+#: View/Elements/eventattribute.ctp:163
 #: View/Elements/Feeds/eventattribute.ctp:48
 #: View/Elements/Servers/eventattribute.ctp:48
 msgid "Feed hits"
 msgstr ""
 
 #: View/Attributes/index.ctp:61
-#: View/Elements/eventattribute.ctp:204
-#: View/Events/view.ctp:207
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
 msgid "Sightings"
 msgstr ""
 
 #: View/Attributes/index.ctp:62
-#: View/Elements/eventattribute.ctp:205
-#: View/Events/view.ctp:214
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr ""
 
 #: View/Attributes/index.ctp:63
-#: View/Elements/eventattribute.ctp:206
+#: View/Elements/eventattribute.ctp:168
 #: View/Elements/Users/userIndexTable.ctp:26
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
@@ -2821,22 +2823,22 @@ msgstr ""
 #: View/EventBlacklists/index.ctp:27
 #: View/Events/export.ctp:31
 #: View/Events/resolved_attributes.ctp:53
-#: View/Feeds/index.ctp:61
-#: View/Feeds/preview_index.ctp:38
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
 #: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:55
+#: View/ObjectTemplates/index.ctp:66
 #: View/OrgBlacklists/index.ctp:26
-#: View/Organisations/index.ctp:81
+#: View/Organisations/index.ctp:102
 #: View/Pages/doc/using_the_system.ctp:187;238;286;382
 #: View/Regexp/admin_index.ctp:25
 #: View/Roles/admin_index.ctp:35
 #: View/Servers/index.ctp:37
-#: View/Servers/preview_index.ctp:80
-#: View/SharingGroups/add.ctp:34;54
-#: View/SharingGroups/edit.ctp:34;62
-#: View/SharingGroups/index.ctp:30
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
 #: View/Sightings/ajax/list_sightings.ctp:11
 #: View/Tags/index.ctp:76
 #: View/Taxonomies/index.ctp:27
@@ -2852,38 +2854,38 @@ msgstr ""
 #: View/Elements/generic_table.ctp:53
 #: View/Elements/generic_table_row.ctp:45
 #: View/EventBlacklists/index.ctp:47
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:225
-#: View/Feeds/preview_index.ctp:74
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
 #: View/Galaxies/index.ctp:46
 #: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:155
-#: View/Logs/admin_index.ctp:104
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
 #: View/Logs/event_index.ctp:54
 #: View/News/index.ctp:33
 #: View/Noticelists/index.ctp:76
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:66
-#: View/ObjectTemplates/index.ctp:119
+#: View/ObjectTemplates/index.ctp:130
 #: View/OrgBlacklists/index.ctp:45
-#: View/Organisations/index.ctp:131
+#: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
 #: View/Roles/admin_index.ctp:75
 #: View/Roles/index.ctp:48
 #: View/Servers/index.ctp:149
-#: View/Servers/preview_index.ctp:156
-#: View/ShadowAttributes/index.ctp:101
-#: View/SharingGroups/index.ctp:79
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:56
-#: View/Taxonomies/view.ctp:164
+#: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:49
+#: View/Users/admin_index.ctp:79
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -2963,16 +2965,16 @@ msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90
-#: View/Elements/side_menu.ctp:392
-#: View/Elements/Events/eventIndexTable.ctp:225
+#: View/Elements/Events/eventIndexTable.ctp:229
 #: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:30
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:265
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Roles/admin_index.ctp:67
 #: View/Servers/index.ctp:138
@@ -2982,6 +2984,7 @@ msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
@@ -2995,7 +2998,6 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:56
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:174
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:26
 #: View/Events/ajax/handleSelected.ctp:17
@@ -3005,26 +3007,27 @@ msgstr ""
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:79
 #: View/Servers/ajax/update.ctp:11
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
-#: View/Sightings/ajax/quickAddConfirmationForm.ctp:13
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
 #: View/Templates/view.ctp:41
-#: View/Users/admin_view.ctp:32;37;104;114;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:27
 msgid "Yes"
 msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:21
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
@@ -3038,7 +3041,6 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:58;176
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:166
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/handleSelected.ctp:22
@@ -3049,20 +3051,20 @@ msgstr ""
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:89
 #: View/Servers/ajax/update.ctp:16
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
-#: View/Sightings/ajax/quickAddConfirmationForm.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
 #: View/Templates/view.ctp:42
-#: View/Users/admin_view.ctp:32;37;106;116;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
 msgid "No"
@@ -3071,7 +3073,6 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:5
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:5
 #: View/Attributes/ajax/attributeEditValueForm.ctp:6
 msgid "Accept change"
@@ -3080,7 +3081,6 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:6
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
 msgid "Discard change"
@@ -3097,7 +3097,7 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/view.ctp:143
+#: View/Events/view.ctp:145
 #: View/Feeds/add.ctp:167
 #: View/Feeds/edit.ctp:164
 #: View/Feeds/freetext_index.ctp:36
@@ -3135,6 +3135,34 @@ msgstr ""
 msgid "Clusters to <b>add</b>"
 msgstr ""
 
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
 #: View/Attributes/ajax/attributeRestorationForm.ctp:5
 msgid "Attribute Restoration"
 msgstr ""
@@ -3172,16 +3200,6 @@ msgstr ""
 msgid "Toggle Correlation %s "
 msgstr ""
 
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "on"
-msgstr ""
-
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "off"
-msgstr ""
-
 #: View/Attributes/ajax/toggle_correlation.ctp:11
 msgid "Re-enable the correlation for this attribute."
 msgstr ""
@@ -3219,137 +3237,31 @@ msgstr ""
 msgid "Add a tag"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:71;278
+#: View/Elements/eventattribute.ctp:71;240
 #: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
 #: View/Elements/Servers/eventattribute.ctp:28;31;94;97
 msgid "view all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:117
-#: View/Pages/doc/using_the_system.ctp:86
-msgid "Add attribute"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:118
-msgid "Edit selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:119
-msgid "Tag selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:120
-msgid "Add new cluster to selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:121
-msgid "Delete selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:122
-msgid "Accept selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:123
-msgid "Discard selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:124
-msgid "Sightings display for selected attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:128
-msgid "Populate using a template"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:130
-msgid "Populate using the freetext import tool"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:132
-msgid "Replace all attributes of a category/type combination within the event"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:141;161
-msgid "Show all attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:145
-msgid "Only show %s related attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:149
-msgid "Only show proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:149
-#: View/Logs/event_index.ctp:44
-msgid "Proposal"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Only show correlating attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:151
-msgid "Only show potentially false positive attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:151
-msgid "Warnings"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:153
-msgid "Include deleted attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:153
-msgid "Deleted"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:155
-msgid "Show attribute context fields"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:155
-msgid "Context"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:156
-msgid "Also display the tags derived from correlations"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:156;193
-msgid "Related Tags"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:159
-msgid "Filter on attributes value"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:161
-#: View/Events/index.ctp:41
-#: View/Servers/preview_index.ctp:42
-#: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:37
-msgid "Remove filters"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:172
+#: View/Elements/eventattribute.ctp:134
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:172
+#: View/Elements/eventattribute.ctp:134
 msgid "Select all attributes/proposals on current page"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:247
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:209
 msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\na specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\nattributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:251
+#: View/Elements/eventattribute.ctp:213
 msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
 msgstr ""
 
@@ -3357,6 +3269,140 @@ msgstr ""
 msgid "Create multiple attributes one per line"
 msgstr ""
 
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr ""
+
 #: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr ""
@@ -3366,7 +3412,7 @@ msgid "Deactivated user"
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:222
+#: View/Elements/Events/eventIndexTable.ctp:226
 #: View/Elements/Events/View/row_attribute.ctp:380
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/Feeds/edit.ctp:193
@@ -3401,12 +3447,12 @@ msgid "Insert a link to an event - just enter the event ID between the [event][/
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:189;200
+#: View/Events/view.ctp:196;207
 #: View/Objects/orphaned_object_diagnostics.ctp:21
 #: View/Pages/doc/administration.ctp:167
 #: View/Pages/doc/using_the_system.ctp:200;279
 #: View/Posts/add.ctp:33
-#: View/ShadowAttributes/index.ctp:31
+#: View/ShadowAttributes/index.ctp:41
 msgid "Event"
 msgstr ""
 
@@ -3465,8 +3511,8 @@ msgstr ""
 #: View/Elements/footer.ctp:15
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:60
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
 msgid "GnuPG key"
 msgstr ""
 
@@ -3492,6 +3538,10 @@ msgstr ""
 msgid "View all events containing this cluster."
 msgstr ""
 
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
 #: View/Elements/galaxyQuickView.ctp:24
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
@@ -3524,113 +3574,113 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:178
+#: View/Elements/generic_picker.ctp:205
 msgid "Due to the large number of options, no contextual information is provided."
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:225
+#: View/Elements/generic_picker.ctp:273
 msgid "Nothing to pick"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:20
+#: View/Elements/global_menu.ctp:11
 #: View/Pages/doc/general.ctp:20
 msgid "Event Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/side_menu.ctp:178;221
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:26
-#: View/Elements/side_menu.ctp:183;227
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
 #: View/Events/add.ctp:4
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:28
-#: View/Elements/side_menu.ctp:246
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/side_menu.ctp:251
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:30
-#: View/Elements/side_menu.ctp:239
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
 #: View/Servers/rest.ctp:20
 msgid "REST client"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:32
-#: View/Elements/side_menu.ctp:266
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:33
-#: View/Elements/side_menu.ctp:270
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:35
-#: View/Elements/side_menu.ctp:492
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:36
-#: View/Elements/side_menu.ctp:191
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
 msgid "List Tag Collections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:38
-#: View/Elements/side_menu.ctp:496
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 #: View/Tags/edit.ctp:4
 msgid "Add Tag"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:40
-#: View/Elements/side_menu.ctp:517
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:42
-#: View/Elements/side_menu.ctp:531
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:44
-#: View/Elements/side_menu.ctp:533
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:47
-#: View/Elements/side_menu.ctp:275
+#: View/Elements/global_menu.ctp:78
 #: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:49
-#: View/Elements/side_menu.ctp:281
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -3639,17 +3689,17 @@ msgstr ""
 msgid "Automation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:61
-#: View/Elements/side_menu.ctp:610
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:68
+#: View/Elements/global_menu.ctp:101
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:73;77
+#: View/Elements/global_menu.ctp:104;109
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -3658,7 +3708,7 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:74;78
+#: View/Elements/global_menu.ctp:114;119
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -3667,91 +3717,88 @@ msgstr ""
 msgid "Signature Whitelist"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:80
-#: View/Elements/side_menu.ctp:302
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:81
-#: View/Elements/side_menu.ctp:311
+#: View/Elements/global_menu.ctp:128
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:87
+#: View/Elements/global_menu.ctp:135
 #: View/Pages/doc/general.ctp:22;54
 msgid "Global Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:91
+#: View/Elements/global_menu.ctp:139
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:92
-#: View/Elements/side_menu.ctp:339
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:93;207
-#: View/Elements/side_menu.ctp:340
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:97
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
 #: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:101
-#: View/Elements/side_menu.ctp:353
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:103
-#: View/Elements/side_menu.ctp:633
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:105
-#: View/Elements/side_menu.ctp:359
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:107
-#: View/Elements/side_menu.ctp:360
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:110
-#: View/Elements/side_menu.ctp:362
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
 #: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:111
+#: View/Elements/global_menu.ctp:186
 msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:112
-#: View/Elements/side_menu.ctp:363
-#: View/Pages/doc/general.ctp:61
-#: View/Pages/doc/user_management.ctp:54
-msgid "Terms &amp; Conditions"
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:113
-#: View/Elements/side_menu.ctp:364
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -3764,33 +3811,33 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:115
+#: View/Elements/global_menu.ctp:201
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:116
+#: View/Elements/global_menu.ctp:205
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:123
+#: View/Elements/global_menu.ctp:212
 #: View/Pages/doc/general.ctp:23;66
 msgid "Sync Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:128
-#: View/Elements/side_menu.ctp:397
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:131
-#: View/Elements/side_menu.ctp:550
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:140
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/administration.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
@@ -3800,106 +3847,100 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:144
-#: View/Elements/side_menu.ctp:422
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:145
-#: View/Elements/side_menu.ctp:421
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
 msgid "Add User"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:146
-#: View/Elements/side_menu.ctp:425
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:148
-#: View/Elements/side_menu.ctp:344;437
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
 msgid "List Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:150
-#: View/Elements/side_menu.ctp:429
-msgid "Add Organisation"
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:153
-#: View/Elements/side_menu.ctp:441
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-#: View/Elements/side_menu.ctp:439
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:159
-#: View/Pages/doc/general.ctp:79
-msgid "Server Settings"
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:159
-msgid "Maintenance"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:162
-#: View/Elements/side_menu.ctp:447
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:164
-#: View/Elements/side_menu.ctp:449
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:168
+#: View/Elements/global_menu.ctp:300
 msgid "Blacklist Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:169
-#: View/Elements/side_menu.ctp:453
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
 msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:173
+#: View/Elements/global_menu.ctp:314
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:174
-#: View/Elements/side_menu.ctp:457
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
 msgid "Manage Org Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:184
+#: View/Elements/global_menu.ctp:327
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:188
-#: View/Elements/side_menu.ctp:463
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:189
-#: View/Elements/side_menu.ctp:464
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:211;213
+#: View/Elements/global_menu.ctp:362;367
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -3920,407 +3961,8 @@ msgstr ""
 msgid "Attributes per organization"
 msgstr ""
 
-#: View/Elements/side_menu.ctp:17;74
-msgid "Populate From Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:24
-msgid "Freetext Import Result"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:31
-msgid "View Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:36;511;621
-msgid "View Correlation Graph"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:41
-msgid "View Event History"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:48
-#: View/Events/edit.ctp:8
-msgid "Edit Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:50
-msgid "Delete Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:50;295;326;392;417
-#: View/Elements/Events/eventIndexTable.ctp:225
-#: View/Servers/index.ctp:138
-msgid "Are you sure you want to delete # %s?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:57
-msgid "Add Object"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:62
-msgid "Add Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:69
-msgid "Populate from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:82
-#: View/Events/ajax/enrich_event.ctp:2
-msgid "Enrich Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:87
-msgid "Merge attributes from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:94
-msgid "Propose Attribute"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:99
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:111
-#: View/Elements/Events/eventIndexTable.ctp:217
-msgid "Publish Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:119
-msgid "Publish (no email)"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:127
-msgid "Unpublish"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:136
-msgid "Delegate Publishing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:147
-#: View/EventDelegations/ajax/accept_delegation.ctp:2
-msgid "Accept Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:155
-msgid "Discard Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:161
-msgid "Publish event to ZMQ"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:166
-msgid "Contact Reporter"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:173;260
-msgid "Download as..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:196;201
-#: View/TagCollections/add.ctp:6
-msgid "Add Tag Collection"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:208
-msgid "Export Tag Collections"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:213
-msgid "Import Tag Collections"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:234
-msgid "Import from…"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:287
-msgid "List Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:289
-msgid "New Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:290
-msgid "Perform on existing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:294
-msgid "Edit Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:295
-msgid "Delete Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:301
-msgid "View Warninglist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:304
-msgid "Update Warninglists"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:310
-msgid "View Noticelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:313
-msgid "Update Noticelists"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:319
-msgid "List Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:321
-msgid "New Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:325
-msgid "Edit Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:326
-msgid "Delete Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:333
-#: View/Users/edit.ctp:4
-msgid "Edit My Profile"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:334
-#: View/Pages/doc/administration.ctp:126
-#: View/Users/admin_edit.ctp:70
-#: View/Users/change_pw.ctp:4
-msgid "Change Password"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:349;435
-msgid "View Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:356
-#: View/SharingGroups/edit.ctp:3
-msgid "Edit Sharing Group"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:357
-msgid "View Sharing Group"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:372;385
-msgid "Explore Remote Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:373
-msgid "Explore Remote Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:379
-msgid "Fetch This Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:379
-#: View/Feeds/preview_index.ctp:65
-#: View/Servers/preview_index.ctp:147
-msgid "Are you sure you want to fetch and save this event on your instance?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:391
-#: View/Servers/edit.ctp:4
-msgid "Edit Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:402
-msgid "New Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:409
-msgid "View User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:410
-msgid "Reset Password"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:411
-msgid "Edit User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:412
-msgid "Delete User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:412
-#: View/Elements/Users/userIndexTable.ctp:91
-msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:416
-#: View/Roles/admin_edit.ctp:4
-msgid "Edit Role"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:417
-msgid "Delete Role"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:431
-#: View/Organisations/admin_edit.ctp:4
-msgid "Edit Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:432
-#: View/Organisations/ajax/merge.ctp:5
-msgid "Merge Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:444
-#: View/Servers/server_settings.ctp:5
-msgid "Server Settings & Maintenance"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:452
-msgid "Blacklists Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:456
-msgid "Blacklists Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:472;479
-msgid "View Thread"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:473
-#: View/Posts/add.ctp:4
-msgid "Add Post"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:480
-#: View/Posts/edit.ctp:4
-msgid "Edit Post"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:485
-msgid "List Threads"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:486
-msgid "New Thread"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:491
-msgid "List Favourite Tags"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:501
-msgid "Edit Tag"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:507;519
-msgid "View Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:520
-msgid "Delete Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:538
-msgid "View Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:540
-#: View/Templates/edit.ctp:6
-msgid "Edit Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:556
-msgid "Add Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:561
-msgid "Import Feeds from JSON"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:567
-#: View/Feeds/compare_feeds.ctp:7
-msgid "Feed overlap analysis matrix"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:572
-msgid "Export Feed settings"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:576
-msgid "Edit Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:582
-msgid "PreviewIndex"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:590
-msgid "PreviewEvent"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:597
-msgid "View News"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:601
-#: View/News/add.ctp:6
-msgid "Add News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:603
-#: View/News/edit.ctp:6
-msgid "Edit News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:614
-msgid "Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:614
-msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:615
-msgid "Force Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:615
-msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:619;627
-msgid "View Galaxy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:620
-msgid "View Cluster"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:637
-msgid "Update Objects"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:642
-msgid "View Object Template"
-msgstr ""
-
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:86
+#: View/Layouts/default.ctp:87
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -4355,8 +3997,11 @@ msgid "Display"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Jobs/index.ctp:62
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
 #: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr ""
 
@@ -4369,12 +4014,12 @@ msgstr ""
 msgid "Toggle fullscreen"
 msgstr ""
 
-#: View/Elements/view_mitre_attack_matrix.ctp:30
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all events on current page"
 msgstr ""
 
@@ -4414,51 +4059,58 @@ msgstr ""
 msgid "#Posts"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:82;86;228
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
 #: View/Elements/Users/userIndexTable.ctp:94
 #: View/Elements/dashboard/dashboard_events.ctp:4;5
 #: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
 #: View/Events/proposal_event_index.ctp:45;49
-#: View/Feeds/preview_index.ctp:66
+#: View/Feeds/preview_index.ctp:73
 #: View/Noticelists/index.ctp:66
-#: View/ObjectTemplates/index.ctp:104
-#: View/Organisations/index.ctp:122
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
 #: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/preview_index.ctp:148
+#: View/Servers/preview_index.ctp:174
 #: View/Taxonomies/index.ctp:47
 #: View/Warninglists/index.ctp:60
 msgid "View"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:166
-msgid " correlation(s)"
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:176;181
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:186
+#: View/Elements/Events/eventIndexTable.ctp:190
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:206
-#: View/Jobs/index.ctp:15;63
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-msgid "All"
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:217
+#: View/Elements/Events/eventIndexTable.ctp:221
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:16
 msgid "Are you sure this event is complete and everyone should be informed?"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:218
+#: View/Elements/Events/eventIndexTable.ctp:222
 msgid "Not published"
 msgstr ""
 
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr ""
+
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid "Show "
 msgstr ""
@@ -4468,10 +4120,25 @@ msgid " more..."
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:304
+#: View/Events/view.ctp:346
 msgid "Collapse…"
 msgstr ""
 
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr ""
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
 #: View/Elements/Events/View/row_attribute.ctp:343
 msgid "Restore attribute"
 msgstr ""
@@ -4534,24 +4201,36 @@ msgid "Expand or Collapse"
 msgstr ""
 
 #: View/Elements/Events/View/row_object.ctp:69
-msgid "Meta-category: "
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
 msgstr ""
 
 #: View/Elements/Events/View/row_object.ctp:70
+msgid "Meta-category: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:71
 #: View/Elements/Feeds/View/row_object.ctp:21
 msgid "Description: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Events/View/row_object.ctp:72
 #: View/Elements/Feeds/View/row_object.ctp:22
 msgid "Template: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Soft delete object"
 msgstr ""
 
@@ -4592,7 +4271,7 @@ msgstr ""
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
 #: View/Sightings/ajax/advanced.ctp:10
-#: View/Sightings/ajax/quickAddConfirmationForm.ctp:13
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 msgid "Add sighting"
 msgstr ""
 
@@ -4601,7 +4280,6 @@ msgid "Mark as false-positive"
 msgstr ""
 
 #: View/Elements/Events/View/sighting_field.ctp:14
-#: View/Events/view.ctp:212
 msgid "Advanced sightings"
 msgstr ""
 
@@ -4629,7 +4307,7 @@ msgstr ""
 
 #: View/Elements/Feeds/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object.ctp:20
-#: View/ObjectTemplates/view.ctp:19
+#: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:23
 msgid "Meta-category"
 msgstr ""
@@ -4644,7 +4322,7 @@ msgid "all"
 msgstr ""
 
 #: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/view.ctp:126
+#: View/Events/view.ctp:131
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
 #: View/Servers/preview_event.ctp:36
 #: View/Sightings/ajax/list_sightings.ctp:5
@@ -4662,7 +4340,7 @@ msgid "IDS"
 msgstr ""
 
 #: View/Elements/Servers/Module/type.ctp:11
-#: View/Elements/healthElements/diagnostics.ctp:274
+#: View/Elements/healthElements/diagnostics.ctp:276
 #: View/Pages/doc/administration.ctp:56;228
 msgid "Status"
 msgstr ""
@@ -4671,12 +4349,12 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:226;233;240;261;268
+#: View/Events/automation.ctp:234;241;248;269;276
 #: View/Events/export.ctp:68;88
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
-#: View/Taxonomies/view.ctp:98;109;154
-#: View/Users/admin_view.ctp:83;92;122
-#: View/Users/view.ctp:62
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
 msgid "N/A"
 msgstr ""
 
@@ -4685,23 +4363,24 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
 #: View/Galaxies/view.ctp:14
-#: View/ObjectTemplates/view.ctp:11
+#: View/ObjectTemplates/view.ctp:4
 #: View/Objects/revise_object.ctp:19
 #: View/Organisations/ajax/merge.ctp:57;64
 #: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/view.ctp:9
-#: View/SharingGroups/add.ctp:11;31;51
-#: View/SharingGroups/edit.ctp:11;31;59
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
 #: View/SharingGroups/view.ctp:42;67
 #: View/Templates/view.ctp:9
 #: View/Users/statistics_orgs.ctp:31
-#: View/Warninglists/view.ctp:9
+#: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr ""
 
 #: View/Elements/Servers/View/row_object.ctp:21
 #: View/Elements/healthElements/files.ctp:8
-#: View/Elements/healthElements/settings_tab.ctp:16
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:10
 #: View/Elements/templateElements/populateTemplateDescription.ctp:12
 #: View/Elements/templateElements/populateTemplateFile.ctp:10
@@ -4709,19 +4388,19 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:27
 #: View/Galaxies/view.ctp:20
-#: View/ObjectTemplates/view.ctp:21
+#: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:16;94
-#: View/Organisations/view.ctp:32;89;90
+#: View/Organisations/view.ctp:15;58;59
 #: View/Pages/doc/administration.ctp:48;241
 #: View/Pages/doc/categories_and_types.ctp:44;61
 #: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
 #: View/Servers/preview_event.ctp:65
-#: View/SharingGroups/add.ctp:15
-#: View/SharingGroups/edit.ctp:15
-#: View/SharingGroups/index.ctp:28
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
 #: View/Taxonomies/view.ctp:14
 #: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:14
+#: View/Warninglists/view.ctp:11
 msgid "Description"
 msgstr ""
 
@@ -4747,10 +4426,10 @@ msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:2
+#: View/Roles/view.ctp:24
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_view.ctp:19
-#: View/Users/view.ctp:19
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
 msgstr ""
 
@@ -4761,7 +4440,7 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:17
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:54
+#: View/ShadowAttributes/index.ctp:64
 msgid "Created"
 msgstr ""
 
@@ -4773,6 +4452,11 @@ msgstr ""
 msgid "Create new credentials and inform user"
 msgstr ""
 
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Elements/dashboard/dashboard_events.ctp:2
 msgid "Changes since last visit"
 msgstr ""
@@ -4801,6 +4485,417 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr ""
+
 #: View/Elements/healthElements/diagnostics.ctp:5
 msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
 msgstr ""
@@ -4825,11 +4920,10 @@ msgstr ""
 msgid "Outdated version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:26;154;168;193
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
 #: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
-#: View/Users/admin_view.ctp:81
 msgid "OK"
 msgstr ""
 
@@ -4895,7 +4989,7 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:119
 #: View/Elements/healthElements/workers.ctp:83;85
-#: View/Organisations/view.ctp:66
+#: View/Organisations/view.ctp:26
 msgid "Unknown"
 msgstr ""
 
@@ -4928,251 +5022,255 @@ msgid "PHP CLI Version"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
 msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:154
+#: View/Elements/healthElements/diagnostics.ctp:155
 #: View/Events/filter_event_index.ctp:32;190
 #: View/Pages/doc/using_the_system.ctp:66;171
 msgid "Low"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:158
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP Extensions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:168
+#: View/Elements/healthElements/diagnostics.ctp:169
 msgid "Not loaded"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:173
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:181
+#: View/Elements/healthElements/diagnostics.ctp:182
 msgid "Advanced attachment handler"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:182
+#: View/Elements/healthElements/diagnostics.ctp:183
 msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:187
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PyMISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:187
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:199
+#: View/Elements/healthElements/diagnostics.ctp:200
 msgid "STIX and Cybox libraries"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:200
+#: View/Elements/healthElements/diagnostics.ctp:201
 msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:201
+#: View/Elements/healthElements/diagnostics.ctp:202
 msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:207
+#: View/Elements/healthElements/diagnostics.ctp:209
 msgid "Other versions might work but are not tested / recommended."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:216
+#: View/Elements/healthElements/diagnostics.ctp:218
 msgid "STIX and CyBox"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:216
+#: View/Elements/healthElements/diagnostics.ctp:218
 msgid "Could not read test script (stixtest.py)."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:230
+#: View/Elements/healthElements/diagnostics.ctp:232
 msgid " library version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:247
+#: View/Elements/healthElements/diagnostics.ctp:249
 msgid "GnuPG"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:248
+#: View/Elements/healthElements/diagnostics.ctp:250
 msgid "This tool tests whether your GnuPG is set up correctly or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:256
+#: View/Elements/healthElements/diagnostics.ctp:258
 msgid "GnuPG installation and settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:259
+#: View/Elements/healthElements/diagnostics.ctp:261
 msgid "ZeroMQ"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:260
+#: View/Elements/healthElements/diagnostics.ctp:262
 msgid "This tool tests whether the ZeroMQ extension is installed and functional."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:268
+#: View/Elements/healthElements/diagnostics.ctp:270
 msgid "ZeroMQ settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:272
+#: View/Elements/healthElements/diagnostics.ctp:274
 msgid "Start ZMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:272
+#: View/Elements/healthElements/diagnostics.ctp:274
 msgid "Start ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:272
+#: View/Elements/healthElements/diagnostics.ctp:274
 msgid "Start"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:273
+#: View/Elements/healthElements/diagnostics.ctp:275
 msgid "Stop ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:273
+#: View/Elements/healthElements/diagnostics.ctp:275
 msgid "Stop"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:274
+#: View/Elements/healthElements/diagnostics.ctp:276
 msgid "Check ZeroMQ service status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:276
+#: View/Elements/healthElements/diagnostics.ctp:278
 msgid "Proxy"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:277
+#: View/Elements/healthElements/diagnostics.ctp:279
 msgid "This tool tests whether your HTTP proxy settings are correct."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:285
+#: View/Elements/healthElements/diagnostics.ctp:287
 #: View/Pages/doc/administration.ctp:35
 msgid "Proxy settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:288
+#: View/Elements/healthElements/diagnostics.ctp:290
 msgid "Module System"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:289
+#: View/Elements/healthElements/diagnostics.ctp:291
 msgid "This tool tests the various module systems and whether they are reachable based on the module settings."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:304
+#: View/Elements/healthElements/diagnostics.ctp:306
 msgid " module system"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:310
+#: View/Elements/healthElements/diagnostics.ctp:312
 msgid "Session table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:311
+#: View/Elements/healthElements/diagnostics.ctp:313
 msgid "This tool checks how large your database's session table is. <br />Sessions in CakePHP rely on PHP's garbage collection for clean-up and in certain distributions this can be disabled by default resulting in an ever growing cake session table. <br />If you are affected by this, just click the clean session table button below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:318
+#: View/Elements/healthElements/diagnostics.ctp:320
 msgid "Expired sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:324
+#: View/Elements/healthElements/diagnostics.ctp:326
 msgid "Purge sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:328
+#: View/Elements/healthElements/diagnostics.ctp:330
 msgid "Clean model cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:329
+#: View/Elements/healthElements/diagnostics.ctp:331
 msgid "If you ever run into issues with missing database fields / tables, please run the following script to clean the model cache."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:330
+#: View/Elements/healthElements/diagnostics.ctp:332
 msgid "Clean cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:331
+#: View/Elements/healthElements/diagnostics.ctp:333
 msgid "Overwritten objects"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:332
+#: View/Elements/healthElements/diagnostics.ctp:334
 msgid "Prior to 2.4.89, due to a bug a situation could occur where objects got overwritten on a sync pull. This tool allows you to inspect whether you are affected and if yes, remedy the issue."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:334;337
+#: View/Elements/healthElements/diagnostics.ctp:336;339
 msgid "Orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:335
+#: View/Elements/healthElements/diagnostics.ctp:337
 msgid "In some rare cases attributes can remain in the database after an event is deleted becoming orphaned attributes. This means that they do not belong to any event, which can cause issues with the correlation engine (known cases include event deletion directly in the database without cleaning up the attributes and situations involving a race condition with an event deletion happening before all attributes are synchronised over)."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:337;353
+#: View/Elements/healthElements/diagnostics.ctp:339;355
 msgid "Run the test below"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:339
+#: View/Elements/healthElements/diagnostics.ctp:341
 msgid "Check for orphaned attribute"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:339
+#: View/Elements/healthElements/diagnostics.ctp:341
 msgid "Check for orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:340
+#: View/Elements/healthElements/diagnostics.ctp:342
 msgid "Remove orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:341;343
+#: View/Elements/healthElements/diagnostics.ctp:343;345
 #: View/Pages/administration.ctp:17
 msgid "Verify GnuPG keys"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:342
+#: View/Elements/healthElements/diagnostics.ctp:344
 msgid "Run a full validation of all GnuPG keys within this instance's userbase. The script will try to identify possible issues with each key and report back on the results."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:343
+#: View/Elements/healthElements/diagnostics.ctp:345
 #: View/Pages/administration.ctp:17
 msgid "Check whether every user's GnuPG key is usable"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:344
+#: View/Elements/healthElements/diagnostics.ctp:346
 msgid "Database cleanup scripts"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:345
+#: View/Elements/healthElements/diagnostics.ctp:347
 msgid "If you run into an issue with an infinite upgrade loop (when upgrading from version ~2.4.50) that ends up filling your database with upgrade script log messages, run the following script."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:346
+#: View/Elements/healthElements/diagnostics.ctp:348
 msgid "Prune upgrade logs"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:347;349
+#: View/Elements/healthElements/diagnostics.ctp:349;351
 msgid "Legacy Administrative Tools"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:348
+#: View/Elements/healthElements/diagnostics.ctp:350
 msgid "Click the following button to go to the legacy administrative tools page. There should in general be no need to do this unless you are upgrading a very old MISP instance (<2.4), all updates are done automatically with more current versions."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:350
+#: View/Elements/healthElements/diagnostics.ctp:352
 msgid "Verify bad link on attachments"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:351
+#: View/Elements/healthElements/diagnostics.ctp:353
 msgid "Verify each attachment referenced in database is accessible on filesystem."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:353
+#: View/Elements/healthElements/diagnostics.ctp:355
 msgid "Non existing attachments referenced in Database"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:355
+#: View/Elements/healthElements/diagnostics.ctp:357
 msgid "Check bad link on attachments"
 msgstr ""
 
@@ -5210,72 +5308,35 @@ msgid "Permissions"
 msgstr ""
 
 #: View/Elements/healthElements/files.ctp:73
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
 #: View/Roles/admin_index.ctp:67
-#: View/SharingGroups/index.ctp:68
+#: View/SharingGroups/index.ctp:87
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:5
 msgid "Good, but there are some optional settings that are incorrect / not set."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:6
 msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
-msgid "Overall health"
+msgid "Test"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:17
-msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:26
-msgid " settings incorrectly or not set"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:27
-msgid " incorrect settings."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:33
-msgid "Critical issues revealed by the diagnostics"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:34
-msgid " issues detected."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:35
-msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:9
-msgid "Toggle subgroup"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:13
-#: View/Pages/doc/administration.ctp:45
-msgid "Priority"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:14
-#: View/Pages/doc/administration.ctp:46
-msgid "Setting"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:15
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
 #: View/Events/filter_event_index.ctp:134
 #: View/Events/resolved_attributes.ctp:45
 #: View/Events/show_i_o_c_results.ctp:13
@@ -5290,45 +5351,75 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: View/Elements/healthElements/settings_tab.ctp:17
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:3;15;27;36
-#: View/Events/index.ctp:30;58
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
-#: View/Users/admin_index.ctp:28
-msgid "Modify filters"
-msgstr ""
-
-#: View/Elements/healthElements/tabs.ctp:3
+#: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:28
-#: View/Pages/doc/administration.ctp:38
-msgid "Diagnostics"
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:37
-#: View/Pages/doc/administration.ctp:39
-msgid "Workers"
+#: View/Elements/healthElements/tabs.ctp:34
+#: View/Pages/doc/administration.ctp:38
+msgid "Diagnostics"
 msgstr ""
 
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:48
+#: View/Elements/healthElements/tabs.ctp:50;65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:5
-msgid "Warning"
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:5
@@ -5374,8 +5465,8 @@ msgstr ""
 #: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
-#: View/Users/admin_view.ctp:7
-#: View/Users/view.ctp:2
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
 msgid "User"
 msgstr ""
 
@@ -5552,14 +5643,14 @@ msgstr ""
 #: View/Pages/doc/administration.ctp:237
 #: View/Pages/doc/categories_and_types.ctp:60
 #: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
-#: View/ShadowAttributes/index.ctp:36;51
-#: View/SharingGroups/add.ctp:30
-#: View/SharingGroups/edit.ctp:30
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
 #: View/Sightings/ajax/list_sightings.ctp:7
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:35
-#: View/Warninglists/view.ctp:24
+#: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr ""
 
@@ -5598,7 +5689,7 @@ msgid "Template Name"
 msgstr ""
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:60
+#: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr ""
@@ -5618,13 +5709,31 @@ msgid "s"
 msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
-#: View/ObjectReferences/ajax/add.ctp:60
+#: View/ObjectReferences/ajax/add.ctp:86
 #: View/Objects/revise_object.ctp:43
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
 msgid "Attribute"
 msgstr ""
 
+#: View/Elements/templateElements/templateRowAttribute.ctp:30
+#: View/Elements/templateElements/templateRowFile.ctp:30
+#: View/Events/resolved_attributes.ctp:47
+#: View/Events/show_i_o_c_results.ctp:11
+#: View/Feeds/freetext_index.ctp:31
+#: View/Objects/add.ctp:95
+#: View/Objects/revise_object.ctp:44
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
+#: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
+#: View/ShadowAttributes/index.ctp:58
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
+#: View/TemplateElements/ajax/template_element_add_file.ctp:28
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:28
+#: View/Templates/populate_event_from_template_attributes.ctp:6
+msgid "Category"
+msgstr ""
+
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
 #: View/Pages/doc/categories_and_types.ctp:57
 #: View/Pages/doc/using_the_system.ctp:109
@@ -5867,7 +5976,7 @@ msgstr ""
 
 #: View/Events/add.ctp:52
 #: View/Events/edit.ctp:43
-#: View/ShadowAttributes/index.ctp:42
+#: View/ShadowAttributes/index.ctp:52
 msgid "Event Info"
 msgstr ""
 
@@ -5931,7 +6040,7 @@ msgid "Details"
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:89
+#: View/Jobs/index.ctp:124
 msgid "Failed"
 msgstr ""
 
@@ -5944,7 +6053,7 @@ msgid "Event with this UUID already exists."
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr ""
 
@@ -6027,49 +6136,46 @@ msgstr ""
 msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
 msgstr ""
 
-#: View/Events/automation.ctp:30;143
+#: View/Events/automation.ctp:30;151
 #: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
 msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:31;144
+#: View/Events/automation.ctp:31;152
 #: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
 msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:32;145
-#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:33
+#: View/Events/automation.ctp:32
 #: View/Events/legacy_automation.ctp:282;307
 msgid "The events that should be included / excluded from the search"
 msgstr ""
 
-#: View/Events/automation.ctp:34
+#: View/Events/automation.ctp:33
 #: View/Events/legacy_automation.ctp:283;308
 msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:35
+#: View/Events/automation.ctp:34
 #: View/Events/legacy_automation.ctp:284
 msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
 msgstr ""
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:35
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr ""
 
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
 #: View/Events/automation.ctp:37
-#: View/Events/legacy_automation.ctp:286;310
-msgid "Restrict the results by the last publish timestamp (newer than)."
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
 msgstr ""
 
 #: View/Events/automation.ctp:38
-#: View/Events/legacy_automation.ctp:287
-msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
 msgstr ""
 
 #: View/Events/automation.ctp:39
@@ -6098,8 +6204,7 @@ msgid "Instead of just including the event ID, also include the event UUID in ea
 msgstr ""
 
 #: View/Events/automation.ctp:44
-#: View/Events/legacy_automation.ctp:317
-msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
 msgstr ""
 
 #: View/Events/automation.ctp:45
@@ -6139,339 +6244,352 @@ msgid "The CSV created when this setting is set to true will not contain the hea
 msgstr ""
 
 #: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:87
+#: View/Events/automation.ctp:95
 #: View/Events/legacy_automation.ctp:164
 msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
 msgstr ""
 
-#: View/Events/automation.ctp:90
+#: View/Events/automation.ctp:98
 #: View/Events/legacy_automation.ctp:176
 msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:102
 #: View/Events/legacy_automation.ctp:180
 msgid "To override the above values, either use the url parameters as described below"
 msgstr ""
 
-#: View/Events/automation.ctp:96
+#: View/Events/automation.ctp:104
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr ""
 
-#: View/Events/automation.ctp:100
+#: View/Events/automation.ctp:108
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:101
+#: View/Events/automation.ctp:109
 #: View/Events/legacy_automation.ctp:212
 msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
 msgstr ""
 
-#: View/Events/automation.ctp:102
+#: View/Events/automation.ctp:110
 #: View/Events/legacy_automation.ctp:213
 msgid "You can configure your tools to automatically download a file one of the Bro types."
 msgstr ""
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:116
 #: View/Events/legacy_automation.ctp:219
 msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
 msgstr ""
 
-#: View/Events/automation.ctp:111
+#: View/Events/automation.ctp:119
 #: View/Events/legacy_automation.ctp:222
 msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
 msgstr ""
 
-#: View/Events/automation.ctp:129
+#: View/Events/automation.ctp:137
 #: View/Events/legacy_automation.ctp:240
 msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
 msgstr ""
 
-#: View/Events/automation.ctp:131
+#: View/Events/automation.ctp:139
 #: View/Events/legacy_automation.ctp:242
 msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:138
+#: View/Events/automation.ctp:146
 #: View/Events/legacy_automation.ctp:249;301
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n    Use semicolons instead (the search will automatically search for colons instead)."
 msgstr ""
 
-#: View/Events/automation.ctp:141
+#: View/Events/automation.ctp:149
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:142
+#: View/Events/automation.ctp:150
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:146
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:154
 #: View/Events/legacy_automation.ctp:95;120;174;206;257
 msgid "All attributes that have a hit on a warninglist will be excluded."
 msgstr ""
 
-#: View/Events/automation.ctp:148
+#: View/Events/automation.ctp:156
 #: View/Events/legacy_automation.ctp:41;70;97;122;259;290
 msgid "The keywords false or null should be used for optional empty parameters in the URL."
 msgstr ""
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:157
 #: View/Events/legacy_automation.ctp:260
 msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
 msgstr ""
 
-#: View/Events/automation.ctp:152
+#: View/Events/automation.ctp:160
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:153
+#: View/Events/automation.ctp:161
 #: View/Events/legacy_automation.ctp:330
 msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:155
+#: View/Events/automation.ctp:163
 #: View/Events/legacy_automation.ctp:332
 msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
 msgstr ""
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:168
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:161
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:338
 msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:163
+#: View/Events/automation.ctp:171
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:164
+#: View/Events/automation.ctp:172
 #: View/Events/legacy_automation.ctp:341
 msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
 msgstr ""
 
-#: View/Events/automation.ctp:165
+#: View/Events/automation.ctp:173
 #: View/Events/legacy_automation.ctp:342
 msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
 msgstr ""
 
-#: View/Events/automation.ctp:166
+#: View/Events/automation.ctp:174
 #: View/Events/legacy_automation.ctp:343
 msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
 msgstr ""
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:176
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:172
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr ""
 
-#: View/Events/automation.ctp:176
+#: View/Events/automation.ctp:184
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:177
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:354
 msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
 msgstr ""
 
-#: View/Events/automation.ctp:178
+#: View/Events/automation.ctp:186
 #: View/Events/legacy_automation.ctp:355
 msgid "If set, it will return all samples from events that have a match for the hash provided above."
 msgstr ""
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:187
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:180
+#: View/Events/automation.ctp:188
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:182
+#: View/Events/automation.ctp:190
 #: View/Events/legacy_automation.ctp:359
 msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
 msgstr ""
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:191
 #: View/Events/legacy_automation.ctp:360
 msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
 msgstr ""
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:192
 #: View/Events/legacy_automation.ctp:361
 msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
 msgstr ""
 
-#: View/Events/automation.ctp:185
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:194
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:195
+#: View/Events/automation.ctp:203
 #: View/Events/legacy_automation.ctp:372
 msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
 msgstr ""
 
-#: View/Events/automation.ctp:196
+#: View/Events/automation.ctp:204
 #: View/Events/legacy_automation.ctp:373
 msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:197
+#: View/Events/automation.ctp:205
 #: View/Events/legacy_automation.ctp:374
 msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
 msgstr ""
 
-#: View/Events/automation.ctp:198
+#: View/Events/automation.ctp:206
 #: View/Events/legacy_automation.ctp:375
 msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 msgstr ""
 
-#: View/Events/automation.ctp:199
+#: View/Events/automation.ctp:207
 #: View/Events/legacy_automation.ctp:376
 msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
 msgstr ""
 
-#: View/Events/automation.ctp:200
+#: View/Events/automation.ctp:208
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:209
 #: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:210
 #: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr ""
 
-#: View/Events/automation.ctp:203
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:204
+#: View/Events/automation.ctp:212
 #: View/Events/legacy_automation.ctp:381
 msgid "You can add or remove an existing tag from an event in the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:207
+#: View/Events/automation.ctp:215
 #: View/Events/legacy_automation.ctp:384
 msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
 msgstr ""
 
-#: View/Events/automation.ctp:209
+#: View/Events/automation.ctp:217
 #: View/Events/legacy_automation.ctp:386
 msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:219
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr ""
 
-#: View/Events/automation.ctp:216
+#: View/Events/automation.ctp:224
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:217
+#: View/Events/automation.ctp:225
 #: View/Events/legacy_automation.ctp:394
 #: View/Pages/doc/using_the_system.ctp:445
-#: View/SharingGroups/add.ctp:52
-#: View/SharingGroups/edit.ctp:60
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
 msgid "URL"
 msgstr ""
 
-#: View/Events/automation.ctp:218
+#: View/Events/automation.ctp:226
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:227
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:220
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:397
 #: View/Servers/rest.ctp:115
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:227;247;248;254;255
+#: View/Events/automation.ctp:235;255;256;262;263
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:240
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:234;241
+#: View/Events/automation.ctp:242;249
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:247
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:254
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:261
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:268
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:262;269
+#: View/Events/automation.ctp:270;277
 #: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
@@ -6479,123 +6597,123 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:275
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:272
+#: View/Events/automation.ctp:280
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:277
+#: View/Events/automation.ctp:285
 #: View/Events/legacy_automation.ctp:454
 msgid "None of the above fields are mandatory, but at least one of them has to be provided."
 msgstr ""
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:287
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:280
+#: View/Events/automation.ctp:288
 #: View/Events/legacy_automation.ctp:457
 msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
 msgstr ""
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:292
 #: View/Events/legacy_automation.ctp:461
 msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n    An example for a valid lookup"
 msgstr ""
 
-#: View/Events/automation.ctp:295
+#: View/Events/automation.ctp:303
 #: View/Events/legacy_automation.ctp:472
 msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
 msgstr ""
 
-#: View/Events/automation.ctp:296
+#: View/Events/automation.ctp:304
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:297
+#: View/Events/automation.ctp:305
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:298
+#: View/Events/automation.ctp:306
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:299
+#: View/Events/automation.ctp:307
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:300
+#: View/Events/automation.ctp:308
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:301
+#: View/Events/automation.ctp:309
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:302
+#: View/Events/automation.ctp:310
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:303
+#: View/Events/automation.ctp:311
 #: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:312
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:484
 msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:485
 msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:311
+#: View/Events/automation.ctp:319
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:321
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:322
 msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
 msgstr ""
 
-#: View/Events/automation.ctp:315
+#: View/Events/automation.ctp:323
 msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
 msgstr ""
 
-#: View/Events/automation.ctp:316
+#: View/Events/automation.ctp:324
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
@@ -6777,7 +6895,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:9;101
+#: View/Jobs/index.ctp:9;136
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr ""
@@ -6801,7 +6919,7 @@ msgid "All communities"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:53
+#: View/Feeds/index.ctp:103
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -6853,47 +6971,52 @@ msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/Organisations/view.ctp:97;98
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:33
 msgid "Events"
 msgstr ""
 
-#: View/Events/index.ctp:30
-msgid "Filter events"
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
 msgstr ""
 
-#: View/Events/index.ctp:31
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr ""
 
-#: View/Events/index.ctp:44
-msgid "Quickfilter"
+#: View/Events/index.ctp:73
+msgid "My events only"
 msgstr ""
 
-#: View/Events/index.ctp:44
-#: View/Organisations/index.ctp:59
-#: View/Servers/preview_index.ctp:45
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr ""
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr ""
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr ""
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
 msgid "Filter"
 msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My events only"
-msgstr ""
-
-#: View/Events/index.ctp:58
-msgid "My Events"
-msgstr ""
-
-#: View/Events/index.ctp:72
-msgid "My organisation's events only"
-msgstr ""
-
-#: View/Events/index.ctp:72
-msgid "Org Events"
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
 msgstr ""
 
 #: View/Events/legacy_automation.ctp:3
@@ -7168,6 +7291,14 @@ msgstr ""
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n    To filter on several values for the same parameter, simply use arrays, such as in the following example"
 msgstr ""
 
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr ""
+
 #: View/Events/legacy_automation.ctp:291
 msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
 msgstr ""
@@ -7188,6 +7319,10 @@ msgstr ""
 msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
 msgstr ""
 
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr ""
+
 #: View/Events/legacy_automation.ctp:322
 msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
 msgstr ""
@@ -7223,19 +7358,19 @@ msgid "Proposals"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:93
+#: View/Events/view.ctp:106
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:113
-#: View/Jobs/index.ctp:65
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
 #: View/Logs/admin_search.ctp:6
 #: View/Pages/doc/administration.ctp:87;104;116;181;195
 #: View/Pages/doc/using_the_system.ctp:166
-#: View/Users/admin_view.ctp:24
-#: View/Users/view.ctp:9
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
 msgid "Email"
 msgstr ""
 
@@ -7313,11 +7448,8 @@ msgid "Successfully added attributes"
 msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Events/view.ctp:56
 #: View/Feeds/preview_event.ctp:11
 #: View/Galaxies/view.ctp:18
-#: View/ObjectTemplates/view.ctp:15
-#: View/Organisations/view.ctp:54
 #: View/Organisations/ajax/merge.ctp:58
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
@@ -7360,193 +7492,182 @@ msgstr ""
 msgid "Include the original imported file as attachment"
 msgstr ""
 
-#: View/Events/view.ctp:49
-msgid "Extended view"
-msgstr ""
-
-#: View/Events/view.ctp:51
+#: View/Events/view.ctp:53
 #: View/Servers/preview_event.ctp:12
 #: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Event ID"
 msgstr ""
 
-#: View/Events/view.ctp:63
+#: View/Events/view.ctp:57
 msgid "Source Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:68
+#: View/Events/view.ctp:66
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:83
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
 msgid "Owner org"
 msgstr ""
 
-#: View/Events/view.ctp:131
+#: View/Events/view.ctp:135
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
 #: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
 msgstr ""
 
-#: View/Events/view.ctp:139
+#: View/Events/view.ctp:140
 #: View/Feeds/preview_event.ctp:37
 #: View/Pages/doc/using_the_system.ctp:70;177;210
 #: View/Servers/preview_event.ctp:48
 msgid "Analysis"
 msgstr ""
 
-#: View/Events/view.ctp:159
+#: View/Events/view.ctp:161
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr ""
 
-#: View/Events/view.ctp:165;172
+#: View/Events/view.ctp:165
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:178
+#: View/Events/view.ctp:173
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:180
+#: View/Events/view.ctp:177
+msgid "First recorded change"
+msgstr ""
+
+#: View/Events/view.ctp:181
 msgid "Last change"
 msgstr ""
 
 #: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:196
+#: View/Events/view.ctp:210
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:203
-msgid "Currently in "
+#: View/Events/view.ctp:217
+msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:211
-msgid "- restricted to own organisation only."
+#: View/Events/view.ctp:217
+msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:212
-msgid "Advanced Sightings"
-msgstr ""
-
-#: View/Events/view.ctp:228
-msgid "you"
-msgstr ""
-
-#: View/Events/view.ctp:229
-msgid " has"
-msgstr ""
-
-#: View/Events/view.ctp:232
-msgid "You have"
-msgstr ""
-
-#: View/Events/view.ctp:235
+#: View/Events/view.ctp:265
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:236
-msgid "%s requested that %s take over this event."
-msgstr ""
-
-#: View/Events/view.ctp:236
+#: View/Events/view.ctp:277
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:241
-msgid "Correlation"
-msgstr ""
-
-#: View/Events/view.ctp:247;256
-#: View/Users/admin_view.ctp:125
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:247
-msgid "enable"
-msgstr ""
-
-#: View/Events/view.ctp:251;258
-#: View/ObjectTemplates/index.ctp:32
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
 #: View/Taxonomies/view.ctp:24
-#: View/Warninglists/view.ctp:38
 msgid "Enabled"
 msgstr ""
 
-#: View/Events/view.ctp:251
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr ""
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:286
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr ""
+
+#: View/Events/view.ctp:328
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:344;373
+#: View/Events/view.ctp:386;415
 msgid "This event has "
 msgstr ""
 
-#: View/Events/view.ctp:345;374
+#: View/Events/view.ctp:387;416
 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:382
+#: View/Events/view.ctp:424
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:398
+#: View/Events/view.ctp:440
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:398
+#: View/Events/view.ctp:440
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:401
+#: View/Events/view.ctp:443
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:401
+#: View/Events/view.ctp:443
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:404
+#: View/Events/view.ctp:446
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:407
+#: View/Events/view.ctp:449
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:407
+#: View/Events/view.ctp:449
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:410
+#: View/Events/view.ctp:452
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:410
+#: View/Events/view.ctp:452
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:413
+#: View/Events/view.ctp:455
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:416
+#: View/Events/view.ctp:458
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:416
+#: View/Events/view.ctp:458
 msgid "Discussion"
 msgstr ""
 
@@ -7599,7 +7720,7 @@ msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:26
-#: View/Feeds/index.ctp:54
+#: View/Feeds/index.ctp:104
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -7779,7 +7900,7 @@ msgstr ""
 
 #: View/Feeds/add.ctp:156
 #: View/Feeds/edit.ctp:153
-#: View/Feeds/index.ctp:55
+#: View/Feeds/index.ctp:105
 msgid "Delta Merge"
 msgstr ""
 
@@ -7948,140 +8069,104 @@ msgstr ""
 msgid "Fetch and store all feed data"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
+#: View/Feeds/index.ctp:33
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
-msgid "Enable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:28
+#: View/Feeds/index.ctp:39
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:28
-msgid "Disable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:29
+#: View/Feeds/index.ctp:45
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:29
-msgid "Enable Caching for Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:51
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:30
-msgid "Disable Caching for  Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
-msgid "Default feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:61
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:31
+#: View/Feeds/index.ctp:66
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:32
+#: View/Feeds/index.ctp:71
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:32
-msgid "All Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:33
+#: View/Feeds/index.ctp:76
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:33
-msgid "Enabled Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:45
+#: View/Feeds/index.ctp:95
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:96
 msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
 msgstr ""
 
-#: View/Feeds/index.ctp:48
+#: View/Feeds/index.ctp:98
 msgid "Feed Format"
 msgstr ""
 
-#: View/Feeds/index.ctp:50
-#: View/Jobs/index.ctp:76
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr ""
 
-#: View/Feeds/index.ctp:56
+#: View/Feeds/index.ctp:106
 msgid "Override IDS"
 msgstr ""
 
-#: View/Feeds/index.ctp:60
+#: View/Feeds/index.ctp:110
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:108
+#: View/Feeds/index.ctp:158
 #: View/Servers/index.ctp:74;75
 msgid "Rules"
 msgstr ""
 
-#: View/Feeds/index.ctp:135
+#: View/Feeds/index.ctp:185
 msgid "Error: Invalid event!"
 msgstr ""
 
-#: View/Feeds/index.ctp:140
+#: View/Feeds/index.ctp:190
 msgid "Fixed event %s"
 msgstr ""
 
-#: View/Feeds/index.ctp:143
+#: View/Feeds/index.ctp:193
 msgid "New fixed event"
 msgstr ""
 
-#: View/Feeds/index.ctp:195
+#: View/Feeds/index.ctp:245
 #: View/Servers/index.ctp:94
 msgid "Age: "
 msgstr ""
 
-#: View/Feeds/index.ctp:197
+#: View/Feeds/index.ctp:247
 #: View/Servers/index.ctp:102
 msgid "Not cached"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:210
+#: View/Feeds/index.ctp:260
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:265
 msgid "Are you sure you want to permanently remove the feed (%s)?"
 msgstr ""
 
-#: View/Feeds/index.ctp:217
+#: View/Feeds/index.ctp:267
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -8103,12 +8188,16 @@ msgid "Namespace"
 msgstr ""
 
 #: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:17
+#: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:19
+#: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr ""
 
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -8121,6 +8210,10 @@ msgstr ""
 msgid "Delete galaxy cluster"
 msgstr ""
 
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
+msgstr ""
+
 #: View/Jobs/index.ctp:12
 msgid "Are you sure you want to purge all completed job entries? Job entries are considered as log entries and have no impact on actual job execution."
 msgstr ""
@@ -8133,37 +8226,37 @@ msgstr ""
 msgid "Completed."
 msgstr ""
 
-#: View/Jobs/index.ctp:63
+#: View/Jobs/index.ctp:68;98
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:74;99
 msgid "Show default queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:99
 #: View/Roles/admin_index.ctp:22
 #: View/Roles/index.ctp:22
 msgid "Default"
 msgstr ""
 
-#: View/Jobs/index.ctp:65
-msgid "Show email queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
-msgid "Show cache queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:101
 msgid "Cache"
 msgstr ""
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:127
 msgid "No worker active"
 msgstr ""
 
-#: View/Jobs/index.ctp:124
+#: View/Jobs/index.ctp:159
 msgid "View stacktrace"
 msgstr ""
 
@@ -8224,18 +8317,20 @@ msgstr ""
 msgid "from IP"
 msgstr ""
 
-#: View/Logs/admin_index.ctp:59
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr ""
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:50
-#: View/ObjectTemplates/view.ctp:13
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/Templates/view.ctp:33
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
 msgstr ""
 
@@ -8321,12 +8416,12 @@ msgstr ""
 msgid "Target UUID"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:53
+#: View/ObjectReferences/ajax/add.ctp:54
 #: View/Objects/orphaned_object_diagnostics.ctp:38
 msgid "Object"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:68
+#: View/ObjectReferences/ajax/add.ctp:120
 msgid "Target Details"
 msgstr ""
 
@@ -8368,25 +8463,33 @@ msgstr ""
 msgid "Object Template index"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:54
-#: View/ObjectTemplates/view.ctp:23
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:107
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:108
+#: View/ObjectTemplates/index.ctp:119
 msgid "Are you sure you want to delete template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:7
-msgid " Object Template"
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:9
-msgid "Object Template ID"
+#: View/ObjectTemplates/view.ctp:33
+msgid " Object Template"
 msgstr ""
 
 #: View/Objects/add.ctp:6
@@ -8465,15 +8568,6 @@ msgstr ""
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:49
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/ajax/merge.ctp:65
-#: View/SharingGroups/add.ctp:32
-#: View/SharingGroups/edit.ctp:32
-msgid "UUID"
-msgstr ""
-
 #: View/Objects/ajax/delete.ctp:6
 msgid "Object Deletion"
 msgstr ""
@@ -8495,6 +8589,7 @@ msgid "Simply paste a list of all the organisation UUIDs that you wish to block
 msgstr ""
 
 #: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr ""
 
@@ -8619,7 +8714,7 @@ msgstr ""
 msgid "Click here"
 msgstr ""
 
-#: View/Organisations/index.ctp:5
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
 #: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
@@ -8630,7 +8725,7 @@ msgstr ""
 msgid ", both local and remote"
 msgstr ""
 
-#: View/Organisations/index.ctp:9
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr ""
@@ -8639,7 +8734,7 @@ msgstr ""
 msgid " on other instances"
 msgstr ""
 
-#: View/Organisations/index.ctp:13
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr ""
@@ -8656,54 +8751,51 @@ msgstr ""
 msgid "View all"
 msgstr ""
 
-#: View/Organisations/index.ctp:65
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:30
 msgid "Logo"
 msgstr ""
 
-#: View/Organisations/index.ctp:76
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr ""
 
-#: View/Organisations/index.ctp:117
+#: View/Organisations/index.ctp:138
 #: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 
-#: View/Organisations/view.ctp:3
-msgid "Organisation "
-msgstr ""
-
-#: View/Organisations/view.ctp:7
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:4
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/Users/admin_view.ctp:9
-#: View/Users/view.ctp:4
-#: View/Warninglists/view.ctp:4
-msgid "Id"
-msgstr ""
-
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:12
 #: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr ""
 
-#: View/Organisations/view.ctp:26
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:40
-msgid "E-mail domain restrictions"
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
 msgstr ""
 
-#: View/Organisations/view.ctp:93;94
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr ""
+
+#: View/Organisations/view.ctp:62;63
 msgid "Members"
 msgstr ""
 
@@ -9255,8 +9347,8 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_view.ctp:40
-#: View/Users/view.ctp:34
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
 msgid "Authkey"
 msgstr ""
 
@@ -9309,8 +9401,8 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_view.ctp:29
-#: View/Users/view.ctp:24
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr ""
 
@@ -9331,8 +9423,6 @@ msgid "Shows the currently assigned NIDS ID."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:109;125
-#: View/Users/admin_view.ctp:100
-#: View/Users/view.ctp:55
 msgid "Termsaccepted"
 msgstr ""
 
@@ -9341,7 +9431,7 @@ msgid "This flag indicates whether the user has accepted the terms of use or not
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:110
-#: View/Users/admin_view.ctp:120
+#: View/Users/admin_view.ctp:84
 msgid "Newsread"
 msgstr ""
 
@@ -9403,7 +9493,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:133;184;197
 #: View/Pages/doc/using_the_system.ctp:269
-#: View/Taxonomies/view.ctp:79
+#: View/Taxonomies/view.ctp:89
 msgid "Action"
 msgstr ""
 
@@ -10164,6 +10254,11 @@ msgstr ""
 msgid "A link to this user guide."
 msgstr ""
 
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr ""
+
 #: View/Pages/doc/general.ctp:61
 msgid "View the terms &amp; conditions again."
 msgstr ""
@@ -10212,6 +10307,10 @@ msgstr ""
 msgid "Various tools, upgrade scripts that can help a site-admin run the instance."
 msgstr ""
 
+#: View/Pages/doc/general.ctp:79
+msgid "Server Settings"
+msgstr ""
+
 #: View/Pages/doc/general.ctp:79
 msgid "Set up and diagnose your MISP installation."
 msgstr ""
@@ -11917,7 +12016,7 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
-#: View/Roles/view.ctp:14
+#: View/Roles/view.ctp:5
 msgid "Permission level"
 msgstr ""
 
@@ -12086,7 +12185,7 @@ msgid "Example:"
 msgstr ""
 
 #: View/Servers/filter_event_index.ctp:21
-msgid "Apply filters to the remote instance"
+msgid "Apply filters to the remote instance's index"
 msgstr ""
 
 #: View/Servers/index.ctp:2
@@ -12145,15 +12244,15 @@ msgstr ""
 msgid "You are currently viewing the event index of the remote instance %s"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "published"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:147
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr ""
 
@@ -12197,7 +12296,11 @@ msgstr ""
 msgid "No succeeded pushes"
 msgstr ""
 
-#: View/Servers/rest.ctp:23;33
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
 msgid "Relative path to query"
 msgstr ""
 
@@ -12280,39 +12383,31 @@ msgstr ""
 msgid "IDS Signature?"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:21
-msgid "Only list proposals of my organisation"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:21
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:26
-msgid "List all proposals"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:26
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:33
+#: View/ShadowAttributes/index.ctp:43
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:39
+#: View/ShadowAttributes/index.ctp:49
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:45
+#: View/ShadowAttributes/index.ctp:55
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:71
+#: View/ShadowAttributes/index.ctp:81
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:73
+#: View/ShadowAttributes/index.ctp:83
 msgid "New Attribute"
 msgstr ""
 
@@ -12340,164 +12435,164 @@ msgstr ""
 msgid "New Sharing Group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
-msgid "General tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
 msgid "General"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
 msgid "Organisations tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
-msgid "MISP instances tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
 msgid "MISP Instances"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
-msgid "Sharing group summary"
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:12
-#: View/SharingGroups/edit.ctp:12
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
 msgid "Example: Multinational sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:13
-#: View/SharingGroups/edit.ctp:13
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
 msgid "Releasable to"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:14
-#: View/SharingGroups/edit.ctp:14
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
 msgid "Example: Community1, Organisation1, Organisation2"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:16
-#: View/SharingGroups/edit.ctp:16
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
 msgid "A description of the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:18
-#: View/SharingGroups/edit.ctp:18
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
 msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:19
-#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
 msgid "Make the sharing group selectable (active)"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:21;38;59
-#: View/SharingGroups/edit.ctp:21;38;67
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
 msgid "Next page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation(s) to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisations to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:33
-#: View/SharingGroups/edit.ctp:33
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
 #: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:37;58;74
-#: View/SharingGroups/edit.ctp:37;66;82
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
 msgid "Previous page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:42
-#: View/SharingGroups/edit.ctp:50
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
 msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:43
-#: View/SharingGroups/edit.ctp:51
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
 msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:47
-#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:53
-#: View/SharingGroups/edit.ctp:61
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
 #: View/SharingGroups/view.ctp:69
 msgid "All orgs"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:63
+#: View/SharingGroups/add.ctp:103
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:64
+#: View/SharingGroups/add.ctp:104
 msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/add.ctp:105
 msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/add.ctp:106
 msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:67
-#: View/SharingGroups/edit.ctp:75
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
 msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:75
-#: View/SharingGroups/edit.ctp:83
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
 msgid "Submit and create sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:95
+#: View/SharingGroups/add.ctp:135
 msgid "Local instance"
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:71
+#: View/SharingGroups/edit.ctp:111
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:74
+#: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
@@ -12505,23 +12600,15 @@ msgstr ""
 msgid "Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:20
-msgid "View only active sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:20
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:21
-msgid "View only passive sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:21
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:61
+#: View/SharingGroups/index.ctp:80
 msgid "Distribution List"
 msgstr ""
 
@@ -12570,7 +12657,11 @@ msgid "Add Sighting"
 msgstr ""
 
 #: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
-msgid "Add sighting (%s)?"
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
 msgstr ""
 
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
@@ -12688,7 +12779,8 @@ msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:41
-#: View/Taxonomies/view.ctp:29;145
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr ""
 
@@ -12698,7 +12790,8 @@ msgid "Are you sure you want to disable this taxonomy library?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:31;149
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr ""
 
@@ -12715,19 +12808,27 @@ msgstr ""
 msgid "Create and/or update selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:118
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
 msgid "Hidden"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:127
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:144
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:149
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr ""
 
@@ -12755,6 +12856,30 @@ msgstr ""
 msgid "Create / update all taxonomy entries as tags"
 msgstr ""
 
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
 #: View/TemplateElements/ajax/ajaxIndex.ctp:2
 msgid "Template Elements"
 msgstr ""
@@ -13007,6 +13132,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
 msgid "Terms accepted"
 msgstr ""
 
@@ -13108,10 +13235,6 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: View/Users/admin_index.ctp:40
-msgid "Filter user index"
-msgstr ""
-
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr ""
@@ -13124,42 +13247,48 @@ msgstr ""
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr ""
 
-#: View/Users/admin_view.ctp:35
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
 msgid "Contactalert"
 msgstr ""
 
-#: View/Users/admin_view.ctp:46
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/admin_view.ctp:44
 msgid "Invited By"
 msgstr ""
 
-#: View/Users/admin_view.ctp:51
-msgid "Org admin"
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:74
-#: View/Users/view.ctp:67
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr ""
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:80
-#: View/Users/view.ctp:73
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
 msgid "GnuPG status"
 msgstr ""
 
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:83
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
 msgid "SMIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:95
-msgid "Nids Sid"
-msgstr ""
-
-#: View/Users/admin_view.ctp:110
-msgid "Password change"
-msgstr ""
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr ""
@@ -13310,14 +13439,6 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
-#: View/Users/view.ctp:45
-msgid "Request API access"
-msgstr ""
-
-#: View/Users/view.ctp:50
-msgid "NIDS Start SID"
-msgstr ""
-
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr ""
@@ -13386,7 +13507,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:29
+#: View/Warninglists/view.ctp:14;16
 msgid "Accepted attribute types"
 msgstr ""
 
diff --git a/app/Locale/deu/LC_MESSAGES/default.po b/app/Locale/deu/LC_MESSAGES/default.po
index 54cf04497..2035f4152 100644
--- a/app/Locale/deu/LC_MESSAGES/default.po
+++ b/app/Locale/deu/LC_MESSAGES/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-01-22 21:23\n"
+"PO-Revision-Date: 2019-03-06 02:04\n"
 "Last-Translator: SteveClement <steve@localhost.lu>\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -15,272 +15,285 @@ msgstr ""
 "Language: de_DE\n"
 
 #: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:149;153;157
+#: Controller/AttributesController.php:125;129;133
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1001;1348;1352;1356;1385;1800;1876;1880;1884;2102;2166;2248;2903;5264;5429;5433;5442
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
 #: Controller/PostsController.php:56
+#: Model/Galaxy.php:292
 msgid "Invalid event"
 msgstr "Ungültiges Event"
 
-#: Controller/AppController.php:607
+#: Console/Command/ServerShell.php:49
+#: Controller/ServersController.php:632
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+msgstr "Pull abgeschlossen.%s events synchronisiert %s events könnten nicht synchronisiert werden, %s proposals synchronisiert."
+
+#: Console/Command/ServerShell.php:51
+msgid "ERROR: %s"
+msgstr "FEHLER: %s"
+
+#: Controller/AppController.php:383
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr "Etwas ist schief gelaufen. Das Benutzerkonto, mit dem du dich authentifiziert hast, existiert nicht mehr."
+
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
+msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+msgstr "Diese Authentifizierungs-Schlüssel ist nicht für den Export berechtigt. Wenden Sie sich an Ihren Administrator."
+
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
+msgid "You have to be logged in to do that."
+msgstr "Dafür müssen Sie eingeloggt sein."
+
+#: Controller/AppController.php:627
+msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
+msgstr "Geben Sie die Suchkriterien entweder in der URL an, oder senden Sie ein json mit Filterkriterien via POST."
+
+#: Controller/AppController.php:752
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Fertig. Attribute_count wurde von Grund auf erstellt für "
 
-#: Controller/AppController.php:726
-#: Controller/AttributesController.php:2668
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
 #: Controller/ShadowAttributesController.php:1276
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "Auftrag in der Warteschlange. Sie können den Fortschritt anzeigen, wenn Sie in der Ansicht Aktive Aufträge (Verwaltung-> Aufgaben) navigieren."
 
-#: Controller/AttributesController.php:140;1392
+#: Controller/AttributesController.php:116;1403
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "Keine Event-ID festgelegt."
 
-#: Controller/AttributesController.php:143
+#: Controller/AttributesController.php:119
 msgid "You don't have permissions to create attributes"
 msgstr "Sie haben keine Berechtigung Attribute zu erstellen"
 
-#: Controller/AttributesController.php:163;489;666
+#: Controller/AttributesController.php:139;488;668
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1684;1705;1739
-#: Controller/ObjectsController.php:442
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
 msgid "You do not have permission to do that."
 msgstr "Sie haben keine Berechtigung dies zu tun."
 
-#: Controller/AttributesController.php:414;864;869;873;1072;1152;2684;2698;2731;2753;2762;3309;3313;3409;3413
-#: Controller/ShadowAttributesController.php:824;1067;1091;1124;1134
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
 #: Controller/TagsController.php:491
 msgid "Invalid attribute"
 msgstr "Ungültiges Attribut"
 
-#: Controller/AttributesController.php:424
-#: Controller/ShadowAttributesController.php:500
+#: Controller/AttributesController.php:421
+#: Controller/ShadowAttributesController.php:499
 msgid "You do not have the permission to view this event."
 msgstr "Sie haben keine Berechtigung dieses Event anzuzeigen."
 
-#: Controller/AttributesController.php:472
+#: Controller/AttributesController.php:468
 msgid "Attribute not an attachment or malware-sample"
 msgstr "Attribut ist kein Anhang oder Malware-Sample"
 
-#: Controller/AttributesController.php:504;677
-#: Controller/ShadowAttributesController.php:548
-msgid "PHP says file was not uploaded. Are you attacking me?"
-msgstr "PHP sagt, dass die Datei nicht hochgeladen wurde. Greifen Sie mich an?"
-
-#: Controller/AttributesController.php:680
-#: Controller/ShadowAttributesController.php:551;561
-msgid "There was a problem to upload the file."
-msgstr "Es gab ein Problem, die Datei hochzuladen."
-
-#: Controller/AttributesController.php:824
-msgid "The ThreatConnect data has been imported."
-msgstr "Die ThreatConnect Daten wurden importiert."
-
-#: Controller/AttributesController.php:827
-msgid "%s entries imported."
-msgstr "%s Einträge importiert."
-
-#: Controller/AttributesController.php:831
-msgid "%s entries could not be imported."
-msgstr "%s Einträge konnten nicht importiert werden."
-
-#: Controller/AttributesController.php:881;924;926
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "Ungültiges Attribut."
-
-#: Controller/AttributesController.php:920
-msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
-msgstr "Attribut konnte nicht gespeichert werden: Attribut in der Anforderung nicht neuer als die lokale Kopie."
-
-#: Controller/AttributesController.php:936;1401
-#: Controller/EventsController.php:4635;4648;5213;5227
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
 msgid "Invalid Event."
 msgstr "Ungültiges Event."
 
-#: Controller/AttributesController.php:953
+#: Controller/AttributesController.php:503;679
+#: Controller/ShadowAttributesController.php:546
+msgid "PHP says file was not uploaded. Are you attacking me?"
+msgstr "PHP sagt, dass die Datei nicht hochgeladen wurde. Greifen Sie mich an?"
+
+#: Controller/AttributesController.php:682
+#: Controller/ShadowAttributesController.php:549;559
+msgid "There was a problem to upload the file."
+msgstr "Es gab ein Problem, die Datei hochzuladen."
+
+#: Controller/AttributesController.php:826
+msgid "The ThreatConnect data has been imported."
+msgstr "Die ThreatConnect Daten wurden importiert."
+
+#: Controller/AttributesController.php:829
+msgid "%s entries imported."
+msgstr "%s Einträge importiert."
+
+#: Controller/AttributesController.php:833
+msgid "%s entries could not be imported."
+msgstr "%s Einträge konnten nicht importiert werden."
+
+#: Controller/AttributesController.php:883;931;933
+#: Controller/ShadowAttributesController.php:829
+msgid "Invalid attribute."
+msgstr "Ungültiges Attribut."
+
+#: Controller/AttributesController.php:927
+msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
+msgstr "Attribut konnte nicht gespeichert werden: Attribut in der Anforderung nicht neuer als die lokale Kopie."
+
+#: Controller/AttributesController.php:960
 msgid "The attribute has been saved"
 msgstr "Das Attribut wurde gespeichert"
 
-#: Controller/AttributesController.php:985
+#: Controller/AttributesController.php:995
 msgid "The attribute could not be saved. Please, try again."
 msgstr "Das Attribut konnte nicht gespeichert werden. Bitte versuchen Sie es erneut."
 
-#: Controller/AttributesController.php:1076
+#: Controller/AttributesController.php:1087
 msgid "Invalid event id."
 msgstr "Ungültige Event-Id."
 
-#: Controller/AttributesController.php:1106
-#: Controller/EventsController.php:2023
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
+#: Controller/ShadowAttributesController.php:729
 msgid "Invalid input."
 msgstr "Ungültige Eingabe."
 
-#: Controller/AttributesController.php:1111
+#: Controller/AttributesController.php:1122
 msgid "Invalid field."
 msgstr "Ungültiges Feld."
 
-#: Controller/AttributesController.php:1156
+#: Controller/AttributesController.php:1167
 msgid "Invalid attribute id."
 msgstr "Ungültige Attribut-Id."
 
-#: Controller/AttributesController.php:1231;1241
+#: Controller/AttributesController.php:1242;1252
 msgid "Attribute deleted"
 msgstr "Attribut gelöscht"
 
-#: Controller/AttributesController.php:1236;1238
+#: Controller/AttributesController.php:1247;1249
 msgid "Attribute was not deleted"
 msgstr "Attribut wurde nicht gelöscht"
 
-#: Controller/AttributesController.php:1263;3155
-#: Controller/ShadowAttributesController.php:864
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
 msgid "Invalid Attribute"
 msgstr "Ungültiges Attribut"
 
-#: Controller/AttributesController.php:1290
+#: Controller/AttributesController.php:1301
 msgid "Could not restore the attribute"
 msgstr "Das Attribut konnte nicht wiederhergestellt werden"
 
-#: Controller/AttributesController.php:1311;1318;1322
+#: Controller/AttributesController.php:1322;1329;1333
 msgid "Attribute not found or not authorised."
 msgstr "Attribut wurde nicht gefunden oder nicht zugelassen."
 
-#: Controller/AttributesController.php:1372
+#: Controller/AttributesController.php:1383
 msgid "This function is only accessible via POST requests."
 msgstr "Diese Funktion ist nur zugänglich über POST-Anfragen."
 
-#: Controller/AttributesController.php:1427
+#: Controller/AttributesController.php:1438
 msgid "No matching attributes found."
 msgstr "Keine passenden Attribute gefunden."
 
-#: Controller/AttributesController.php:1461
+#: Controller/AttributesController.php:1472
 msgid "This method can only be accessed via AJAX."
 msgstr "Diese Methode kann nur über AJAX zugegriffen werden."
 
-#: Controller/AttributesController.php:1472
+#: Controller/AttributesController.php:1482
 msgid "You are not authorized to edit this event."
 msgstr "Sie sind nicht berechtigt, dieses Event zu bearbeiten."
 
-#: Controller/AttributesController.php:1537
+#: Controller/AttributesController.php:1580
 msgid "No event ID provided."
 msgstr "Keine Event-ID angegeben."
 
-#: Controller/AttributesController.php:1640
-msgid "Invalid tag"
-msgstr "Ungültiger Tag"
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
+msgid "Synonyms: "
+msgstr "Synonyme: "
 
-#: Controller/AttributesController.php:2107;2282;2391;2441;2524;2610
-#: Controller/EventsController.php:2484;2600;2662;2720;3079;3301;3993;4011
-msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
-msgstr "Diese Authentifizierungs-Schlüssel ist nicht für den Export berechtigt. Wenden Sie sich an Ihren Administrator."
-
-#: Controller/AttributesController.php:2112;2277;2384
-#: Controller/EventsController.php:3084
+#: Controller/AttributesController.php:1997;2104
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr "Sie sind nicht berechtigt. Bitte senden Sie den Authorization-Header mit Ihrem Auth Schlüssel zusammen mit einem Accept-Header für die Anwendung/Xml."
 
-#: Controller/AttributesController.php:2123
-msgid "Content type and parameter mismatch. Expecting JSON."
-msgstr "Content-Typ und Parameter stimmen nicht überein. JSON wird erwartet."
-
-#: Controller/AttributesController.php:2128
-msgid "Content type and parameter mismatch. Expecting XML."
-msgstr "Content-Typ und Parameter stimmen nicht überein. XML wird erwartet."
-
-#: Controller/AttributesController.php:2132;2290
+#: Controller/AttributesController.php:2010
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
 msgstr "Geben Sie die Suchbegriffe entweder in der Url an oder senden Sie per POST ein Json-Array / Xml-Dokument (mit Root-Element \"request\" und geben Sie die richtige \"accept\" und Content-Type-Header an)."
 
-#: Controller/AttributesController.php:2310
+#: Controller/AttributesController.php:2030
 msgid "You don't have access to that event."
 msgstr "Sie haben keinen Zugriff auf dieses Event."
 
-#: Controller/AttributesController.php:2373
+#: Controller/AttributesController.php:2093
 msgid "No matches."
 msgstr "Keine Übereinstimmungen."
 
-#: Controller/AttributesController.php:2395;2404
+#: Controller/AttributesController.php:2115;2124
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Ungültiges Attribut oder keine Berechtigung es anzuzeigen."
 
-#: Controller/AttributesController.php:2445;2528;2614
-#: Controller/EventsController.php:2488;2605;2667;2724;3305;3997;4015
-msgid "You have to be logged in to do that."
-msgstr "Dafür müssen Sie eingeloggt sein."
-
-#: Controller/AttributesController.php:2472
+#: Controller/AttributesController.php:2192
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
 msgstr "Geben Sie die Suchbegriffe entweder in der Url an oder senden Sie per POST ein Json-Array / Xml-Dokument (mit Root-Element \"request\" und geben Sie die richtige \"accept\" und Content-Type-Header an."
 
-#: Controller/AttributesController.php:2536
+#: Controller/AttributesController.php:2256
 msgid "Invalid event ID format."
 msgstr "Ungültiges Event-ID-Format."
 
-#: Controller/AttributesController.php:2645
+#: Controller/AttributesController.php:2365
 #: Controller/ShadowAttributesController.php:1254
 msgid "All done. "
 msgstr "Fertig. "
 
-#: Controller/AttributesController.php:2677;2724
+#: Controller/AttributesController.php:2397;2444
 #: Controller/ShadowAttributesController.php:1062
 msgid "Invalid field requested."
 msgstr "Ungültiges Feld angefordert."
 
-#: Controller/AttributesController.php:2680;2727
+#: Controller/AttributesController.php:2400;2447
 msgid "This function can only be accessed via AJAX."
 msgstr "Diese Methode kann nur über AJAX zugegriffen werden."
 
-#: Controller/AttributesController.php:2792;2800
-#: Controller/EventsController.php:3689;3967
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "Event nicht gefunden oder Sie haben nicht die Berechtigung Attribute anzulegen"
 
-#: Controller/AttributesController.php:2821
+#: Controller/AttributesController.php:2541
 msgid "This action can only be accessed via AJAX."
 msgstr "Diese Methode kann nur über AJAX zugegriffen werden."
 
-#: Controller/AttributesController.php:2830;3081;3095;3106
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
 msgid "You are not authorised to do that."
 msgstr "Sie haben keine Berechtigung dies zu tun."
 
-#: Controller/AttributesController.php:2935
-#: Controller/EventsController.php:4431
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
 msgid "This functionality requires API key access."
 msgstr "Diese Funktionalität erfordert Zugang über einen API Schlüssel."
 
-#: Controller/AttributesController.php:2943
+#: Controller/AttributesController.php:2663
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr "Diese Aktion ist nur für die API. Entnehmen Sie bitte der Automatisierung-Seite Informationen darüber wie man sie benutzt."
 
-#: Controller/AttributesController.php:2955
+#: Controller/AttributesController.php:2675
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "Kein Hash oder Event-ID erhalten. Sie müssen mindestens eines der beiden angeben."
 
-#: Controller/AttributesController.php:3116
+#: Controller/AttributesController.php:2836
 msgid "Invalid script."
 msgstr "Ungültige Skript."
 
-#: Controller/AttributesController.php:3181
+#: Controller/AttributesController.php:2901
 msgid "No valid enrichment options found for this attribute."
 msgstr "Keine gültige Optionen zur Anreicherung dieses Attributs gefunden."
 
-#: Controller/AttributesController.php:3245
+#: Controller/AttributesController.php:2964
 msgid "Invalid type requested."
 msgstr "Ungültiger Typ angefordert."
 
-#: Controller/AttributesController.php:3476
-#: Controller/EventsController.php:5209
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "Deaktivieren die Korrelation ist in dieser Instanz nicht zulässig."
 
-#: Controller/AttributesController.php:3480;3495
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3243;3258
+#: Controller/ShadowAttributesController.php:677
 msgid "Invalid Attribute."
 msgstr "Ungültiges Attribut."
 
-#: Controller/AttributesController.php:3483;3498
-#: Controller/EventsController.php:5216;5230
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
 msgid "You don't have permission to do that."
 msgstr "Sie haben keine Berechtigung dies zu tun."
 
@@ -288,254 +301,286 @@ msgstr "Sie haben keine Berechtigung dies zu tun."
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "Event-Blacklisting ist zurzeit in dieser Instanz nicht aktiviert."
 
-#: Controller/EventsController.php:804
+#: Controller/EventsController.php:848
 msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
 msgstr "Kein x509 Zertifikat oder GnuPG-Schlüssel im Profil angegeben. Um E-Mails zu empfangen hinterelgen Sie Ihr Zertifikat oder öffentlichen GnuPG-Schlüssel in Ihrem Profil."
 
-#: Controller/EventsController.php:806
+#: Controller/EventsController.php:850
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "Keine GnuPG-Schlüssel in Ihrem Profil hinterlegt. Um E-Mails zu erhalten, hinterlegen Sie Ihren öffentlichen Schlüssel in Ihrem Profil."
 
-#: Controller/EventsController.php:812
+#: Controller/EventsController.php:856
 msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
 msgstr "Kein x509 Zertifikat oder GnuPG-Schlüssel im Profil angegeben. Um Attribute in E-Mails zu empfangen hinterelgen Sie Ihr Zertifikat oder öffentlichen GnuPG-Schlüssel in Ihrem Profil."
 
-#: Controller/EventsController.php:814
+#: Controller/EventsController.php:858
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr "Keine GnuPG-Schlüssel in Ihrem Profil hinterlegt. Um E-Mails zu erhalten, hinterlegen Sie Ihren öffentlichen Schlüssel in Ihrem Profil."
 
-#: Controller/EventsController.php:1527
+#: Controller/EventsController.php:1559
+msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
+msgstr "Sie sind derzeit als Administrator angemeldet und bearbeiten ein Event, welches nicht zu Ihrer Organisation gehört, dies verstößt gegen das Sharing-Modell von MISP. Bitte verwenden Sie dies nur in letzter Instanz und verwenden Sie stattdessen ein normales Benutzerkonto für die tägliche Arbeit."
+
+#: Controller/EventsController.php:1769
 msgid "You don't have permissions to create events"
 msgstr "Sie haben keine Berechtigung, ein Ereignis zu erstellen"
 
-#: Controller/EventsController.php:1533
+#: Controller/EventsController.php:1775
 msgid "No valid event data received."
 msgstr "Keine gültige Eventdaten empfangen."
 
-#: Controller/EventsController.php:1569
+#: Controller/EventsController.php:1811
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "Ungültige Freigabegruppe oder nicht autorisierte (Sync Benutzer ist nicht in der Freigabegruppe)."
 
-#: Controller/EventsController.php:1573;1577
+#: Controller/EventsController.php:1815;1819
 msgid "Invalid Sharing Group or not authorised."
 msgstr "Ungültige Freigabegruppe oder nicht berechtigt."
 
-#: Controller/EventsController.php:1601
+#: Controller/EventsController.php:1843
 msgid "Event blocked by local blacklist."
 msgstr "Event von lokaler Blacklist geblockt."
 
-#: Controller/EventsController.php:1614;1693;1955
+#: Controller/EventsController.php:1856;1933;2197
 msgid "The event has been saved"
 msgstr "Das Event wurde gespeichert"
 
-#: Controller/EventsController.php:1622
+#: Controller/EventsController.php:1864
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "Event existiert bereits, wenn Sie es wirklich bearbeiten wollen benutzen Sie die URL im Location-Header."
 
-#: Controller/EventsController.php:1633
+#: Controller/EventsController.php:1870
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "Ein Blacklist-Eintrag blockiert Sie Events zu erstellen. Bitte kontaktieren Sie die Administratoren dieser Instanz"
 
-#: Controller/EventsController.php:1635;1958
+#: Controller/EventsController.php:1872;2200
 msgid "The event could not be saved. Please, try again."
 msgstr "Das Event konnte nicht gespeichert werden. Bitte versuchen Sie es erneut."
 
-#: Controller/EventsController.php:1719
+#: Controller/EventsController.php:1912
+msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
+msgstr "Das erstellte Event wird für die Organisationen sichtbar sein, die ein Konto auf dieser MISP-Instanz haben. Es wird aber nicht mit anderen MISP-Instanzen synchronisiert, bis es veröffentlicht wird."
+
+#: Controller/EventsController.php:1959
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "Sie können nur MISP XML oder MISP JSON-Dateien hochladen."
 
-#: Controller/EventsController.php:1720
+#: Controller/EventsController.php:1960
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "Datei-Upload fehlgeschlagen oder die Datei hat nicht die erwartete Erweiterung (.xml / .json)."
 
-#: Controller/EventsController.php:1768
+#: Controller/EventsController.php:2009
 msgid "STIX document imported, event's created: "
 msgstr "STIX-Dokument importiert, Events erstellt: "
 
-#: Controller/EventsController.php:1771
+#: Controller/EventsController.php:2012
 msgid "STIX document imported."
 msgstr "STIX-Dokument importiert."
 
-#: Controller/EventsController.php:1774
+#: Controller/EventsController.php:2015
 msgid "Could not import STIX document: "
 msgstr "STIX Dokument konnte nicht importiert werden: "
 
-#: Controller/EventsController.php:1781
+#: Controller/EventsController.php:2022
 msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
 msgstr "Datei-Upload ist fehlgeschlagen. Stellen Sie sicher, dass Sie zum Upload eine STIX-Datei ausgewählt haben und dass diese nicht größer ist als die maximale Dateigröße von "
 
-#: Controller/EventsController.php:1805;1890
+#: Controller/EventsController.php:2046;2131
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "Sie sind nicht berechtigt das zu tun. Bitte überlegen Sie das 'Attribut Vorschlagen' Feature zu nutzen."
 
-#: Controller/EventsController.php:1813
+#: Controller/EventsController.php:2054
 msgid "Invalid event ID entered."
 msgstr "Ungültige Event-ID eingegeben."
 
-#: Controller/EventsController.php:1818
+#: Controller/EventsController.php:2059
 msgid "You are not authorised to read the selected event."
 msgstr "Sie sind nicht berechtigt dieses Event zu lesen."
 
-#: Controller/EventsController.php:2109;2172
+#: Controller/EventsController.php:2349;2387;2450
 msgid "You don't have the permission to do that."
 msgstr "Dir fehlt die Berechtigung um dies zu tun."
 
-#: Controller/EventsController.php:2259
+#: Controller/EventsController.php:2358
+msgid "Event unpublished."
+msgstr "Event unveröffentlicht."
+
+#: Controller/EventsController.php:2537
 msgid "Email sent to the reporter."
 msgstr "E-Mail an Berichterstatter gesendet."
 
-#: Controller/EventsController.php:2261
+#: Controller/EventsController.php:2539
 msgid "Sending of email failed"
 msgstr "Senden der E-Mail fehlgeschlagen"
 
-#: Controller/EventsController.php:2397
+#: Controller/EventsController.php:2678
 msgid "This feature is currently disabled"
 msgstr "Dieses Feature ist im Moment deaktiviert"
 
-#: Controller/EventsController.php:2439;4025
+#: Controller/EventsController.php:2720;3986
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
 msgstr "Geben Sie die Suchbegriffe entweder in der Url oder per POST eines XML-Dokuments (mit dem Root-Element \"request\")."
 
-#: Controller/EventsController.php:2475
+#: Controller/EventsController.php:2756
 msgid "Invalid Event ID."
 msgstr "Ungültige Event-ID."
 
-#: Controller/EventsController.php:2522
+#: Controller/EventsController.php:2803
 msgid "No events found that match the passed parameters."
 msgstr "Keine Events mit den übergebenen Parametern gefunden."
 
-#: Controller/EventsController.php:2547
+#: Controller/EventsController.php:2828
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
 msgstr "Spezifizieren Sie die Suchbegriffe entweder in der URL oder in einem JSON oder XML-Post mit Filterparametern. Gültige Filter: id (Event ID), tags (Liste von Tags), from (von Datum im Format YYYY-MM-DD), to (bis Datum im Format YYYY-MM-DD), last (Event mit einem Veröffentlichungszeitstempel neuer als - gültige Optionen sind Zeit + Einheit z.B. 6d oder 2w...)"
 
-#: Controller/EventsController.php:2622;2684
+#: Controller/EventsController.php:2903
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
 msgstr "Spezifizieren Sie die Suchbegriffe entweder in der URL oder in einem JSON oder XML-Post mit Filterparametern."
 
-#: Controller/EventsController.php:2641
-#: Model/Attribute.php:1927
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
 msgid "Invalid hash type."
 msgstr "Ungültiger Hashtyp."
 
-#: Controller/EventsController.php:2871
+#: Controller/EventsController.php:3025
 msgid "Filename not allowed."
 msgstr "Dateinamen nicht zulässig."
 
-#: Controller/EventsController.php:2892
+#: Controller/EventsController.php:3045
 msgid "Problem with writing the ioc file. Please report to administrator."
 msgstr "Problem beim Schreiben der IOC-Datei. Bitte wenden Sie sich an den Administrator."
 
-#: Controller/EventsController.php:2986
+#: Controller/EventsController.php:3139
 msgid "This is not a valid MISP XML file."
 msgstr "Dies ist keine gültige MISP XML-Datei."
 
-#: Controller/EventsController.php:3101
-msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type)."
-msgstr "Geben Sie die Suchbegriffe entweder in der Url an oder senden Sie per POST ein Json-Array / Xml-Dokument (mit Root-Element \"request\" und geben Sie die richtigen Header an, basierend auf dem Content-Type)."
-
-#: Controller/EventsController.php:3294
+#: Controller/EventsController.php:3291
 msgid "Not yet implemented"
 msgstr "Noch nicht implementiert"
 
-#: Controller/EventsController.php:3312;3316
+#: Controller/EventsController.php:3309;3313
 msgid "Invalid event or not authorised."
 msgstr "Ungültiges Event oder nicht berechtigt."
 
-#: Controller/EventsController.php:3336;3406
+#: Controller/EventsController.php:3333;3403
 msgid "You don't have the privileges to access this."
 msgstr "Sie haben nicht die Zugiffsberechtigung dies zuzugreifen."
 
-#: Controller/EventsController.php:3920
-msgid "Could not add tags."
-msgstr "Tags konnten nicht hinzugefügt werden."
+#: Controller/EventsController.php:3610
+#: Controller/TagCollectionsController.php:307
+msgid "Invalid Tag."
+msgstr "Ungültiger Tag."
 
-#: Controller/EventsController.php:3971;5055
-#: Controller/ObjectsController.php:46;140;144;438
+#: Controller/EventsController.php:3626
+#: Controller/TagCollectionsController.php:323
+msgid "Tag is already attached to this event."
+msgstr "Tag ist bereits mit diesem Event verbunden."
+
+#: Controller/EventsController.php:3637;3643
+#: Controller/TagCollectionsController.php:330
+msgid "Tag(s) added."
+msgstr "Tag(s) hinzugefügt."
+
+#: Controller/EventsController.php:3639
+msgid "Tag could not be added."
+msgstr "Tag konnte nicht hinzugefügt werden."
+
+#: Controller/EventsController.php:3645
+#: Controller/TagCollectionsController.php:338
+msgid "All tags are already present, nothing to add."
+msgstr "Alle Tags wurden bereits hinzugefügt, es gibt nichts hinzuzufügen."
+
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
 msgid "Invalid event."
 msgstr "Ungültiges Event."
 
-#: Controller/EventsController.php:4085;4115;4131
+#: Controller/EventsController.php:3918
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
+msgstr ""
+
+#: Controller/EventsController.php:4049;4079;4095
 msgid "You do not have the permission to do that."
 msgstr "Sie haben keine Berechtigung dies zu tun."
 
-#: Controller/EventsController.php:4196;4334
+#: Controller/EventsController.php:4160;4300
 msgid "Invalid ID"
 msgstr "Ungültige ID"
 
-#: Controller/EventsController.php:4200;4338
+#: Controller/EventsController.php:4164;4304
 msgid "Event not found or you are not authorised to view it."
 msgstr "Event nicht gefunden oder Sie sind nicht berechtigt es zu einzusehen."
 
-#: Controller/EventsController.php:4434;4441
+#: Controller/EventsController.php:4405;4412
 msgid "Please POST the samples as described on the automation page."
 msgstr "Bitte senden Sie die Samples wie auf der Automatisierungs-Seite beschrieben."
 
-#: Controller/EventsController.php:4470
+#: Controller/EventsController.php:4441
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr "Keine Samples empfangen oder Samples nicht im richtigen Format. Bitte schauen Sie die API-Dokumentation auf der Automatisierungsseite."
 
-#: Controller/EventsController.php:4478
+#: Controller/EventsController.php:4449
 msgid "Event not found"
 msgstr "Event nicht gefunden"
 
-#: Controller/EventsController.php:4501
+#: Controller/EventsController.php:4472
 msgid "Event not found."
 msgstr "Event nicht gefunden."
 
-#: Controller/EventsController.php:4511
+#: Controller/EventsController.php:4482
 msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
 msgstr "Verteilungsebene 5 wird nicht unterstützt beim Uplaod eines Samples ohne eine Event-ID. Verteilungsebene 5 ist gedacht die Verteilungsebene eines existierenden Events zu übernehmen."
 
-#: Controller/EventsController.php:4536
+#: Controller/EventsController.php:4507
 msgid "The creation of a new event with the supplied information has failed."
 msgstr "Fehler beim Erstellen eines neuen Events mit den zur Verfügung gestellten Informationen."
 
-#: Controller/EventsController.php:4671;4693;4722;4747;4772;4802;4823
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
 msgid "Invalid type."
 msgstr "Ungültiger Typ."
 
-#: Controller/EventsController.php:4866
+#: Controller/EventsController.php:4906
 msgid "Invalid method."
 msgstr "Ungültige Methode."
 
-#: Controller/EventsController.php:4946
+#: Controller/EventsController.php:4989
 msgid "%s services are not enabled."
 msgstr "%s Dienste sind nicht aktiviert."
 
-#: Controller/EventsController.php:4950
+#: Controller/EventsController.php:4993
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "Attribut nicht gefunden oder Sie sind nicht berechtigt es einzusehen."
 
-#: Controller/EventsController.php:4956
+#: Controller/EventsController.php:4999
 msgid "No valid %s options found for this attribute."
 msgstr "Keine gültigen Optionen %s für dieses Attribut gefunden."
 
-#: Controller/EventsController.php:4973
+#: Controller/EventsController.php:5016
 msgid "no valid %s options found for this attribute."
 msgstr "keine gültigen Optionen %s für dieses Attribut gefunden."
 
-#: Controller/EventsController.php:4995
+#: Controller/EventsController.php:5038
 msgid "%s service not reachable."
 msgstr "%s Dienst nicht erreichbar."
 
-#: Controller/EventsController.php:5007
+#: Controller/EventsController.php:5050
 msgid ": Enriched via the %s"
 msgstr ": Über %s angereichert"
 
-#: Controller/EventsController.php:5136
+#: Controller/EventsController.php:5184
 msgid "Import service not reachable."
 msgstr "Dienst zum importieren nicht erreichbar."
 
-#: Controller/EventsController.php:5303
+#: Controller/EventsController.php:5351
 msgid "Invalid ID."
 msgstr "Ungültige ID."
 
-#: Controller/EventsController.php:5351
-#: Controller/ShadowAttributesController.php:312;317;534
+#: Controller/EventsController.php:5399
+#: Controller/ShadowAttributesController.php:311;316;532
 msgid "Invalid Event"
 msgstr "Ungültiges Event"
 
-#: Controller/EventsController.php:5369
+#: Controller/EventsController.php:5420
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "Auftrag zur Anreicherung zur Hintergrundverarbeitung eingereiht. Kommen Sie später wieder um die Ergebnisse einzusehen."
 
@@ -543,122 +588,138 @@ msgstr "Auftrag zur Anreicherung zur Hintergrundverarbeitung eingereiht. Kommen
 msgid "You don't have the required privileges to do that."
 msgstr "Sie verfügen nicht über die erforderlichen Berechtigungen, um dies zu tun."
 
-#: Controller/FeedsController.php:193;291
+#: Controller/FeedsController.php:205;303
 msgid "Feed added."
 msgstr "Feed hinzugefügt."
 
-#: Controller/FeedsController.php:201
+#: Controller/FeedsController.php:213
 msgid "Feed could not be added. Invalid field: %s"
 msgstr "Feed konnte nicht hinzugefügt werden. Ungültiges Feld: %s"
 
-#: Controller/FeedsController.php:226;326;348;470;502;682
+#: Controller/FeedsController.php:238;338;360;482;517;721
 msgid "Invalid feed."
 msgstr "Ungültiger Feed."
 
-#: Controller/FeedsController.php:299
+#: Controller/FeedsController.php:311
 msgid "Feed could not be updated. Invalid fields: %s"
 msgstr "Feed konnte nicht aktualisiert werden. Ungültiges Feld: %s"
 
-#: Controller/FeedsController.php:322
+#: Controller/FeedsController.php:334
 msgid "This action requires a post request."
 msgstr "Diese Aktion erfordert eine Post-Anfrage."
 
-#: Controller/FeedsController.php:355;474
+#: Controller/FeedsController.php:367;486
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "Feed ist derzeit nicht aktiviert. Stellen Sie sicher, dass Sie ihn aktivieren."
 
-#: Controller/FeedsController.php:368;434
+#: Controller/FeedsController.php:380;446
 msgid "Starting fetch from Feed."
 msgstr "Feed-Download gestartet."
 
-#: Controller/FeedsController.php:379
+#: Controller/FeedsController.php:391
 msgid "Pull queued for background execution."
 msgstr "Pull eingereiht zur Hintergrundausführung."
 
-#: Controller/FeedsController.php:384;386
+#: Controller/FeedsController.php:396;398
 msgid "Fetching the feed has failed."
 msgstr "Feed-Download fehlgeschlagen."
 
-#: Controller/FeedsController.php:390
+#: Controller/FeedsController.php:402
 msgid "Fetching the feed has successfuly completed."
 msgstr "Holen des Feed erfolgreich abgeschlossen."
 
-#: Controller/FeedsController.php:451
+#: Controller/FeedsController.php:463
 msgid "Fetching the feed has successfully completed."
 msgstr "Holen des Feed erfolgreich abgeschlossen."
 
-#: Controller/FeedsController.php:481
+#: Controller/FeedsController.php:493
 msgid "Event added."
 msgstr "Event hinzugefügt."
 
-#: Controller/FeedsController.php:484
+#: Controller/FeedsController.php:496
 msgid "Event already up to date."
 msgstr "Event bereits auf aktuellem Stand."
 
-#: Controller/FeedsController.php:486
+#: Controller/FeedsController.php:498
 msgid "Event updated."
 msgstr "Event aktualisiert."
 
-#: Controller/FeedsController.php:490
+#: Controller/FeedsController.php:502
 msgid "Could not %s event."
 msgstr "Konnte nicht \"%s\" Event."
 
-#: Controller/FeedsController.php:493
+#: Controller/FeedsController.php:505
 msgid "Download failed."
 msgstr "Download fehlgeschlagen."
 
-#: Controller/FeedsController.php:561
+#: Controller/FeedsController.php:597
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "Feed konnte nicht abgerufen werden. HTTP-Fehlercode der zurückgegeben wurde: "
 
-#: Controller/FeedsController.php:600;651
+#: Controller/FeedsController.php:636;687
 msgid "Invalid feed type."
 msgstr "Ungültiger Feedtyp."
 
-#: Controller/FeedsController.php:714
+#: Controller/FeedsController.php:753
 msgid "This event is blocked by the Feed filters."
 msgstr "Dieses Event wird durch die Feed-Filter blockiert."
 
-#: Controller/FeedsController.php:716
+#: Controller/FeedsController.php:755
 msgid "Could not download the selected Event"
 msgstr "Das ausgewählte Event konnte nicht heruntergeladen werden"
 
-#: Controller/FeedsController.php:752;756
+#: Controller/FeedsController.php:791;795
 msgid "Invalid Feed."
 msgstr "Ungültiger Feed."
 
-#: Controller/FeedsController.php:777
+#: Controller/FeedsController.php:816
 msgid "Only POST requests are allowed."
 msgstr "Nur POST-Anfragen sind erlaubt."
 
-#: Controller/FeedsController.php:781
+#: Controller/FeedsController.php:820
 msgid "Feed not found."
 msgstr "Feed nicht gefunden."
 
-#: Controller/FeedsController.php:790
+#: Controller/FeedsController.php:829
 msgid "Data pulled."
 msgstr "Daten abgerufen."
 
-#: Controller/FeedsController.php:792
+#: Controller/FeedsController.php:831
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "Die ausgewählten Daten konnte nicht geladen werden. Grund: %s"
 
-#: Controller/FeedsController.php:809
+#: Controller/FeedsController.php:848
 msgid "Starting feed caching."
 msgstr "Feed-Caching begonnen."
 
-#: Controller/FeedsController.php:824
+#: Controller/FeedsController.php:863
 msgid "Caching the feeds has failed."
 msgstr "Feed-Caching fehlgeschlagen."
 
-#: Controller/FeedsController.php:827
+#: Controller/FeedsController.php:866
 msgid "Caching the feeds has successfully completed."
 msgstr "Zwischenspeicherung der Feeds wurde erfolgreich abgeschlossen."
 
-#: Controller/FeedsController.php:858
+#: Controller/FeedsController.php:900
 msgid "Invalid feed list received."
 msgstr "Ungültige Feed-Liste erhalten."
 
+#: Controller/GalaxiesController.php:92
+msgid "All clusters"
+msgstr "Alle Cluster"
+
+#: Controller/GalaxiesController.php:135
+msgid "All namespaces"
+msgstr "Alle Namespaces"
+
+#: Controller/GalaxiesController.php:250
+msgid "Failed to parse request."
+msgstr ""
+
+#: Controller/GalaxiesController.php:253
+msgid "No clusters picked."
+msgstr ""
+
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr "Alle abgeschlossenen Aufträge wurden gelöscht"
@@ -671,11 +732,23 @@ msgstr "Alle Aufträge wurden gelöscht"
 msgid "Invalid object"
 msgstr "Ungültiges Objekt"
 
-#: Controller/ObjectReferencesController.php:187
+#: Controller/ObjectReferencesController.php:188
 msgid "Invalid object reference"
 msgstr "Ungültige Objektreferenz"
 
-#: Controller/ObjectTemplatesController.php:88
+#: Controller/ObjectTemplatesController.php:31
+msgid "All Objects"
+msgstr "Alle Objekte"
+
+#: Controller/ObjectTemplatesController.php:99
+msgid "Invalid object template"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:103
+msgid "Invalid object template id."
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
 msgstr "ObjectTemplate gelöscht"
 
@@ -696,23 +769,23 @@ msgstr "Sie haben keine Berechtigung ein Event zu erstellen."
 msgid "Invalid template."
 msgstr "Ungültige Vorlage."
 
-#: Controller/ObjectsController.php:303
+#: Controller/ObjectsController.php:311
 msgid "You don't have permissions to edit objects."
 msgstr "Sie haben keine Berechtigung Objekte zu bearbeiten."
 
-#: Controller/ObjectsController.php:317;328;427
+#: Controller/ObjectsController.php:325;336;439
 msgid "Invalid object."
 msgstr "Ungültiges Objekt."
 
-#: Controller/ObjectsController.php:421
+#: Controller/ObjectsController.php:433
 msgid "You don't have permissions to delete objects."
 msgstr "Sie haben keine Berechtigung Objekte zu löschen."
 
-#: Controller/ObjectsController.php:531;538;542
+#: Controller/ObjectsController.php:543;550;554
 msgid "Object not found or not authorised."
 msgstr "Objekt nicht gefunden oder nicht berechtigt."
 
-#: Controller/ObjectsController.php:799
+#: Controller/ObjectsController.php:811
 msgid "%s objects successfully reconstructed."
 msgstr "%s Objekte erfolgreich rekonstruiert."
 
@@ -776,123 +849,147 @@ msgstr "Die Rolle konnte nicht gespeichert werden. Bitte erneut versuchen."
 msgid "Role deleted"
 msgstr "Rolle gelöscht"
 
-#: Controller/ServersController.php:204;394
+#: Controller/ServersController.php:226;417
 msgid "The pull filter rules must be in valid JSON format."
 msgstr "Die Pull-Filter-Regeln müssen in gültigem JSON-Format sein."
 
-#: Controller/ServersController.php:214;404
+#: Controller/ServersController.php:236;427
 msgid "The push filter rules must be in valid JSON format."
 msgstr "Die Push-Filter-Regeln müssen in gültigem JSON-Format sein."
 
-#: Controller/ServersController.php:268;434
+#: Controller/ServersController.php:291;457
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr "Die Organisation konnte nicht angelet werden, die UUID wird bereits verwendet."
 
-#: Controller/ServersController.php:280
+#: Controller/ServersController.php:303
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format? Also, make sure the organisation's name doesn't clash with an existing one."
 msgstr "Die neue Organisation konnte nicht gespeichert werden, sind Sie sicher, dass die UUID im richtigen Format ist? Stellen Sie außerdem sicher, dass der Organisationsname nicht mit einem Bestehenden übereinstimmt."
 
-#: Controller/ServersController.php:309;490
+#: Controller/ServersController.php:332;513
 msgid "The server has been saved"
 msgstr "Der Server wurde gespeichert"
 
-#: Controller/ServersController.php:316;497
+#: Controller/ServersController.php:339;520
 msgid "The server could not be saved. Please, try again."
 msgstr "Der Server konnte nicht gespeichert werden. Bitte erneut versuchen."
 
-#: Controller/ServersController.php:369;565;590;598;659;1412
+#: Controller/ServersController.php:392;589;614;623;683;1360
 msgid "Invalid server"
 msgstr "Ungültiger Server"
 
-#: Controller/ServersController.php:451
+#: Controller/ServersController.php:474
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr "Organisation konnte nicht gespeichert werden, ist die UUID im korrekten Format?."
 
-#: Controller/ServersController.php:572
+#: Controller/ServersController.php:596
 msgid "Server deleted"
 msgstr "Server gelöscht"
 
-#: Controller/ServersController.php:575
+#: Controller/ServersController.php:599
 msgid "Server was not deleted"
 msgstr "Server nicht gelöscht"
 
-#: Controller/ServersController.php:602
+#: Controller/ServersController.php:626
 msgid "Pull setting not enabled for this server."
 msgstr "Pull-Einstellung für diesen Server nicht aktiviert."
 
-#: Controller/ServersController.php:611
-msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
-msgstr "Nicht berechtigt. Dies ist entweder aufgrund eines ungüötigen Auth-Schlüssels oder weil der Sync-Benutzer keine Berechtigung am entfernten Server hat. Ein weiterer Grund könnte eine falsche Einstellung am Sync-Server sein."
+#: Controller/ServersController.php:659
+msgid "Pull queued for background execution. Job ID: %s"
+msgstr ""
 
-#: Controller/ServersController.php:1309
+#: Controller/ServersController.php:696
+msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
+msgstr ""
+
+#: Controller/ServersController.php:709
+msgid "Push complete. %s events pushed, %s events could not be pushed."
+msgstr ""
+
+#: Controller/ServersController.php:734
+msgid "Push queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:1257
 msgid "File not found."
 msgstr "Datei nicht gefunden."
 
-#: Controller/ServersController.php:1315
+#: Controller/ServersController.php:1263
 msgid "File could not be deleted."
 msgstr "Datei konnte nicht gelöscht werden."
 
-#: Controller/ServersController.php:1338;1354
+#: Controller/ServersController.php:1286;1302
 msgid "Upload failed."
 msgstr "Upload fehlgeschlagen."
 
-#: Controller/ServersController.php:1346
+#: Controller/ServersController.php:1294
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "Datei existiert bereits. Enfernen Sie die alte Datei um sie zu ersetzen."
 
-#: Controller/ShadowAttributesController.php:212
+#: Controller/ServersController.php:1748
+msgid "Starting server caching."
+msgstr ""
+
+#: Controller/ServersController.php:1763
+msgid "Caching the servers has failed."
+msgstr ""
+
+#: Controller/ServersController.php:1766
+msgid "Caching the servers has successfully completed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:211
 msgid "Moving of the file that this attachment references failed."
 msgstr "Verschieben der Datei auf welche dieser Anhang referenziert fehlgeschlagen."
 
-#: Controller/ShadowAttributesController.php:280
+#: Controller/ShadowAttributesController.php:279
 msgid "Could not discard proposal."
 msgstr "Konnte Vorschlag nicht verwerfen."
 
-#: Controller/ShadowAttributesController.php:341
+#: Controller/ShadowAttributesController.php:340
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr "Attribut wurde nicht hinzugefügt: Anhänge werden durch den \"Anlage hinzufügen\" Button hinzugefügt"
 
-#: Controller/ShadowAttributesController.php:389;392;401
+#: Controller/ShadowAttributesController.php:388;391;400
 msgid "The lines"
 msgstr "Die Linien"
 
-#: Controller/ShadowAttributesController.php:441
+#: Controller/ShadowAttributesController.php:440
 msgid "The proposal has been saved"
 msgstr "Der Vorschlag wurde gespeichert"
 
-#: Controller/ShadowAttributesController.php:453;763
+#: Controller/ShadowAttributesController.php:452;761
 msgid "Could not save the proposal. Errors: %s"
 msgstr "Vorschlag konnte nicht gespeichert werden. Fehler: %s"
 
-#: Controller/ShadowAttributesController.php:455
+#: Controller/ShadowAttributesController.php:454
 msgid "The proposal could not be saved. Please, try again."
 msgstr "Der Vorschlag konnte nicht gespeichert werden. Bitte erneut versuchen."
 
-#: Controller/ShadowAttributesController.php:492
+#: Controller/ShadowAttributesController.php:491
 msgid "Invalid Proposal"
 msgstr "Ungültige Vorschlag"
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:521
 msgid "Proposal not an attachment or malware-sample"
 msgstr "Vorschlag ist kein Attribut oder Malware-Sample"
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:617
 msgid "The attachment has been uploaded"
 msgstr "Die Anlage wurde hochgeladen"
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:619
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr "Die Anlage wurde hochgeladen, aber einige der Vorschläge konnte nicht erstellt werden. Die fehlgeschlagenen Vorschläge sind: "
 
-#: Controller/ShadowAttributesController.php:624
+#: Controller/ShadowAttributesController.php:622
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr "Die Anlage könnte nicht gespeichert haben, wenden Sie sich an Ihren Administrator."
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:752
 msgid "The proposed Attribute has been saved"
 msgstr "Das vorgeschlagene Attribut wurde gespeichert"
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:763
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr "Das Schattenattribut konnte nicht gespeichert werden. Bitte versuchen Sie es erneut."
 
@@ -924,6 +1021,86 @@ msgstr "Sharing-Group gelöscht"
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr "Sharing-Group konnte nicht gelöscht werden. Stellen Sie sicher, dass keine Events, Attribute oder Threads zu dieser Sharing-Group gehören."
 
+#: Controller/SightingsController.php:86
+msgid "Could not add the Sighting. Reason: "
+msgstr ""
+
+#: Controller/SightingsController.php:96;99
+msgid "Sighting added"
+msgstr "Sighting hinzugefügt"
+
+#: Controller/SightingsController.php:152
+msgid "You are not authorised to remove sightings data as you don't have permission to modify your organisation's data."
+msgstr ""
+
+#: Controller/SightingsController.php:158
+msgid "Attribute not found"
+msgstr "Attribut nicht gefunden"
+
+#: Controller/SightingsController.php:176
+msgid "Invalid request."
+msgstr ""
+
+#: Controller/SightingsController.php:185
+msgid "Sighting added."
+msgstr ""
+
+#: Controller/SightingsController.php:187
+msgid "Sighting could not be added"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:56;177
+msgid "The tag collection has been saved"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:64;185
+msgid "The tag collection could not be added. Reason: "
+msgstr ""
+
+#: Controller/TagCollectionsController.php:85
+msgid "%s new tag collections added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:154
+msgid "Invalid Tag Collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:161
+msgid "You don't have editing rights on this Tag Collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:201;380
+msgid "Invalid tag collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:207
+msgid "Tag collection deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:215
+msgid "Tag collection could not be deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:224
+msgid "You are not allowed to delete that."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:332
+msgid "Tag(s) could not be added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:384
+msgid "Insufficient privileges to remove the tag from the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:395
+msgid "Invalid tag or tag not associated with the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:399
+msgid "Failed to remove tag from the collection."
+msgstr ""
+
 #: Controller/TagsController.php:367
 msgid "Tag deleted"
 msgstr "Tag gelöscht"
@@ -932,6 +1109,27 @@ msgstr "Tag gelöscht"
 msgid "Tag was not deleted"
 msgstr "Tag wurde nicht gelsöcht"
 
+#: Controller/TagsController.php:580
+msgid "Favourite Tags"
+msgstr ""
+
+#: Controller/TagsController.php:586
+msgid "Tag Collections"
+msgstr ""
+
+#: Controller/TagsController.php:591
+msgid "All Tags"
+msgstr "Alle Tags"
+
+#: Controller/TagsController.php:601
+#: View/Taxonomies/view.ctp:2
+msgid "Taxonomy Library"
+msgstr ""
+
+#: Controller/TagsController.php:756
+msgid "Includes: "
+msgstr ""
+
 #: Controller/TemplatesController.php:408
 msgid "Event populated, "
 msgstr "Event verteilt, "
@@ -940,15 +1138,15 @@ msgstr "Event verteilt, "
 msgid "Event populated, but "
 msgstr "Event verteilt, aber "
 
-#: Controller/UsersController.php:42;221
+#: Controller/UsersController.php:42;247
 msgid "Invalid user or not authorised."
 msgstr "Ungültiger Nutzer oder nicht berechtigt."
 
-#: Controller/UsersController.php:54;430;657;907
+#: Controller/UsersController.php:54;456;683;929
 msgid "Invalid user"
 msgstr "Ungültiger Nutzer"
 
-#: Controller/UsersController.php:119;564;728
+#: Controller/UsersController.php:119;590;754
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr "Ungültige E-Mail Domain. Sie sind darauf beschränkt nur Nutzer der folgenden Domain(s) anzulegen: "
 
@@ -960,59 +1158,75 @@ msgstr "Das Profile wurde aktualisiert"
 msgid "The profile could not be updated. Please, try again."
 msgstr "Das Profil konnte nicht aktualisiert werden. Bitte versuchen Sie es erneut."
 
-#: Controller/UsersController.php:198
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
 msgid "Password Changed."
 msgstr "Passwort geändert."
 
-#: Controller/UsersController.php:203
+#: Controller/UsersController.php:222
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "Das Passwort konnte nicht geändert werdeden. Stellen Sie sicher den minimalanforderungen an die Passwortlänge und Komplexität wurde entsprochen."
 
-#: Controller/UsersController.php:575
+#: Controller/UsersController.php:601
 msgid "The user could not be saved. Invalid organisation."
 msgstr "Der Nutzer konnte nicht gespeichert werden. Ungültige Organisation."
 
-#: Controller/UsersController.php:597
+#: Controller/UsersController.php:623
 msgid "The user has been saved."
 msgstr "Der Nutzer wurde gespeichert."
 
-#: Controller/UsersController.php:606;843
+#: Controller/UsersController.php:632;865
 msgid "The user could not be saved. Please, try again."
 msgstr "Der Nutzer konnte nicht gespeichert werden. Bitte erneut versuchen."
 
-#: Controller/UsersController.php:835
+#: Controller/UsersController.php:857
 msgid "The user has been saved"
 msgstr "Der Nutzer wurde gespeichert"
 
-#: Controller/UsersController.php:915
+#: Controller/UsersController.php:937
 msgid "User deleted"
 msgstr "Nutzer gelöscht"
 
-#: Controller/UsersController.php:919
+#: Controller/UsersController.php:941
 msgid "User was not deleted"
 msgstr "Nutzer wurde nicht gelöscht"
 
-#: Controller/UsersController.php:997
+#: Controller/UsersController.php:1019
 msgid "Invalid username or password, try again"
 msgstr "Ungültiger Nutzername oder Passwort, erneut versuchen"
 
-#: Controller/UsersController.php:1080
+#: Controller/UsersController.php:1106
 msgid "Good-Bye"
 msgstr "Auf Wiedersehen"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1147
 msgid "New authkey generated."
 msgstr "Kein authkey erzeugt."
 
-#: Controller/UsersController.php:1230
+#: Controller/UsersController.php:1256
 msgid "You accepted the Terms and Conditions."
 msgstr "Sie akzeptieren die Geschäftsbedingungen."
 
-#: Controller/UsersController.php:1419
+#: Controller/UsersController.php:1438
+msgid "Recipient email not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1443
+msgid "Recipient organisation not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1480
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr "E-Mail gesendet, zustellung zu den folgenden Empfängern gescheitert: "
 
-#: Controller/UsersController.php:1421
+#: Controller/UsersController.php:1482
 msgid "E-mails sent."
 msgstr "E-Mails versendet."
 
@@ -1040,972 +1254,1040 @@ msgstr "%s gelöscht"
 msgid "%s was not deleted"
 msgstr "%s wurde nicht gelöscht"
 
-#: Controller/Component/BlackListComponent.php:72
+#: Controller/Component/BlackListComponent.php:75
 msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
 msgstr "Fertig. %d neue Einträge zur Blacklist hinzugefügt. %d Einträge konnten nicht gespeichert werden."
 
-#: Controller/Component/BlackListComponent.php:123
+#: Controller/Component/BlackListComponent.php:126
 msgid "Blacklist item added."
 msgstr "Blacklist Eintrag hinzugefügt."
 
-#: Controller/Component/BlackListComponent.php:152
+#: Controller/Component/BlackListComponent.php:155
 msgid "Invalid blacklist entry"
 msgstr "Ungültiger Blacklist Eintrag"
 
-#: Controller/Component/BlackListComponent.php:156
+#: Controller/Component/BlackListComponent.php:159
 msgid "Blacklist entry removed"
 msgstr "Blacklist Eintrag entfernt"
 
-#: Controller/Component/BlackListComponent.php:158
+#: Controller/Component/BlackListComponent.php:161
 msgid "Could not remove the blacklist entry"
 msgstr "Blacklist Eintrag konnte nicht entfernt werden"
 
-#: Model/Attribute.php:567
+#: Model/Attribute.php:591
 msgid "Composite type, but value not explodable"
 msgstr "Gemischter Typ, aber Wert konnte nicht extrahiert werden"
 
-#: Model/Attribute.php:677
+#: Model/Attribute.php:703
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr "Löschen des Datei-Anhangs fehlgeschlagen. Bitte wenden Sie sich an den Administrator."
 
-#: Model/Attribute.php:802
+#: Model/Attribute.php:828
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr "Die eingegebene Zeichenkette ist zu lang und würde abgeschnitten. Bitte fügen Sie die Daten stattdessen ggf. als Anhang an"
 
-#: Model/Attribute.php:921
+#: Model/Attribute.php:953
 msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "Prüfsumme hat eine ungültige Länge oder Format (erwartet werden: %s Hexadezimalzahlen). Bitte Wert prüfen oder als Typ \"Anderer\" hinzufügen."
 
-#: Model/Attribute.php:928
+#: Model/Attribute.php:960
 msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "Prüfsumme hat eine ungültige Länge oder Format (erwartet werden mindestens 35 Hexadezimalzahlen). Bitte Wert prüfen oder als Typ \"Anderer\" hinzufügen."
 
-#: Model/Attribute.php:935
+#: Model/Attribute.php:967
 msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr "Die Eingabe stimmt nicht dem der erwarteten Format für SHA1 überein (erwartet werden 40 Hexadezimalziffern). Bedenken Sie, dass MISP aktuell nur SHA1 für PEhashes unterstützt. Falls Sie die Unterstützung um weitere Hashtypen erweitert haben möchten öffnen Sie ein Ticket auf Github, unter https://github.com/MISP/MISP!"
 
-#: Model/Attribute.php:946
+#: Model/Attribute.php:978
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr "Ungültiger SSDeep hash. Das Format muss Blockgröße:Hash:Hash sein"
 
-#: Model/Attribute.php:957
+#: Model/Attribute.php:989
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr "Ungültiges impfuzzy Format. Das Format muss Imports:Hash:Hash sein"
 
-#: Model/Attribute.php:972
+#: Model/Attribute.php:996
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:1011
 msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr "Die Eingabe stimmt nicht dem der erwarteten Format Dateiname|SHA1 überein (erwartet wird Dateiname|40 Hexadezimalziffern). Bedenken Sie, dass MISP aktuell nur SHA1 für PEhashes unterstützt. Falls Sie die Unterstützung um weitere Hashtypen erweitert haben möchten öffnen Sie ein Ticket auf Github, unter https://github.com/MISP/MISP!"
 
-#: Model/Attribute.php:990
+#: Model/Attribute.php:1029
 msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "Prüfsumme hat eine ungültige Länge oder Format (erwartet werden: Dateiname|%s Hexadezimalziffern). Bitte Wert prüfen oder als Typ \"Anderer\" auswählen."
 
-#: Model/Attribute.php:995
+#: Model/Attribute.php:1034
 msgid "Invalid composite type. The format has to be %s."
 msgstr "Ungültiger zusammengesetzer Typ. Das Format muss %s sein."
 
-#: Model/Attribute.php:1006
+#: Model/Attribute.php:1045
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr "Ungültige SSDeep Hash (erwartet wird: Blocksize:Hash:Hash)."
 
-#: Model/Attribute.php:1014
+#: Model/Attribute.php:1053
 msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "Prüfsumme hat eine ungültige Länge oder Format (erwartet wird: Dateiname|mindestens 35 Hexadezimalzahlen). Bitte Wert prüfen oder Typ \"Anderer\" auswählen."
 
-#: Model/Attribute.php:1025
+#: Model/Attribute.php:1064
 msgid "Invalid CIDR notation value found."
 msgstr "Ungültiger CIDR-Wert gefunden."
 
-#: Model/Attribute.php:1032;1083
+#: Model/Attribute.php:1071;1122
 msgid "IP address has an invalid format."
 msgstr "IP-Adresse hat ein ungültiges Format."
 
-#: Model/Attribute.php:1037
+#: Model/Attribute.php:1076
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr "Port-Nummern müssen positive ganze Zahlen zwischen 1 und 65535 sein."
 
-#: Model/Attribute.php:1066
+#: Model/Attribute.php:1105
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr " Name hat ein ungültiges Format. Bitte überprüfen Sie den Wert oder wählen Sie \"andere\"."
 
-#: Model/Attribute.php:1086
+#: Model/Attribute.php:1125
 msgid "Domain name has an invalid format."
 msgstr "Domainname hat ein ungültiges Format."
 
-#: Model/Attribute.php:1099
+#: Model/Attribute.php:1138
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr "E-Mail-Adresse hat ein ungültiges Format. Bitte überprüfen Sie den Wert oder wählen Sie \"andere\"."
 
-#: Model/Attribute.php:1107
+#: Model/Attribute.php:1146
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr "Ungültiges Format. Erwartet wird: CVE-xxxx-xxxx..."
 
-#: Model/Attribute.php:1118
+#: Model/Attribute.php:1157
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr "Ungültiges Format. Nur Werte kürzer als 256 Zeichen die keine Vorwärts- oder Rückwartsschlrägstriche enthalten sind zulässig."
 
-#: Model/Attribute.php:1230
+#: Model/Attribute.php:1272
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr "Datetime muss im ISO 8601 Format sein."
 
-#: Model/Attribute.php:1236
+#: Model/Attribute.php:1278
 msgid "The value has to be a number greater or equal 0."
 msgstr "Der Wert muss eine Zahl größer oder gleich 0 sein."
 
-#: Model/Attribute.php:1243
+#: Model/Attribute.php:1285
 msgid "The value has to be a number between 0 and 10."
 msgstr "Der Wert muss eine Zahl zwischen 0 und 10 sein."
 
-#: Model/Attribute.php:1923;1991
+#: Model/Attribute.php:1968;2036
 msgid "Could not read user."
 msgstr "Nutzer konnte nicht gelesen werden."
 
-#: Model/Attribute.php:2527
+#: Model/Attribute.php:2616
 msgid "This field is mandatory."
 msgstr "Dies ist ein Pflichtfeld."
 
-#: Model/Attribute.php:2885
+#: Model/Attribute.php:3069
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr "Etwang ging schief, nicht-numerischer Wert für Eregnis-ID empfangen währen versucht wurde ein ZIP-Archiv von hochgeladenem Malware-Sample zu erzeugen."
 
-#: Model/Event.php:4532
+#: Model/Event.php:5392
 msgid "Issues while loading the stix file. "
 msgstr "Probleme beim laden der STIX-Datei. "
 
-#: Model/Event.php:4534
+#: Model/Event.php:5394
 msgid "Issues with the maec library. "
 msgstr "Probeleme mit der maec Bibliothek. "
 
-#: Model/Event.php:4536
+#: Model/Event.php:5396
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "Probleme beim Ausführen des Aufnahemskripts oder ungültige Eingabe. "
 
-#: Model/Event.php:4539
+#: Model/Event.php:5399
 msgid "Please ask your administrator to "
 msgstr "Bitte fragen Sie ihren Administrator "
 
-#: Model/Event.php:4541
+#: Model/Event.php:5401
 msgid "Please "
 msgstr "Bitte "
 
-#: Model/Event.php:4543
+#: Model/Event.php:5403
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr "überprüfen Sie mit dem Diagnosetool ob die Anhängikeiten für STIX erfüllt sind."
 
-#: Model/Event.php:4575
+#: Model/Event.php:5435
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:4584
+#: Model/Event.php:5444
 msgid "%s not set"
 msgstr "%s nicht gesetzt"
 
-#: Model/Server.php:114
+#: Model/Event.php:5667
+msgid "Could not add tags."
+msgstr "Tags konnten nicht hinzugefügt werden."
+
+#: Model/Galaxy.php:219;276;286;300
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
 msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
 msgstr "Bestimmte administrative Aufgaben sind über die API verfügbar. Diese helfen MISP automatisch über externe Tools zu konfigurieren und zu pflegen."
 
-#: Model/Server.php:115
+#: Model/Server.php:122
 msgid "Administering MISP via the CLI"
 msgstr "Administration von MISP über die Kommandozeile"
 
-#: Model/Server.php:125
+#: Model/Server.php:132
 msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
 msgstr "Wenn Sie Aufgaben automatisieren möchten, wie das Chachen von Feeds oder der Abruf von anderen Servern, können Sie dies folgenden Kommandozeilenprogramme. Führen Sie einfach die gegebenen Kommandos über die Eingabeaufforderung aus oder erzeugen Sie einen Cron-Job daraus."
 
-#: Model/Server.php:126
+#: Model/Server.php:133
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr "Automatisierung gewisser Konsolenaufgaben"
 
-#: Model/Server.php:135
+#: Model/Server.php:142
 msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
 msgstr "Die Basis-URL der Anwendung (im Format https://www.mainemispinstanz.de). Einige Funktionen hängen davon ab, dass diese Einstellung korrekt ist."
 
-#: Model/Server.php:137
+#: Model/Server.php:144
 msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
 msgstr "Die aktuell gesetzte Basis-URL entspricht nicht der URL über die Sie auf diese Seit zugreifen. Irgnorieren Sie diesen Hinweis, falls Sie die Seite über eine ander URL zugreifen (zum Beispiel die IP-Adresse)."
 
-#: Model/Server.php:143
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr "Solange nicht auf true gesetzt wird diese Instanz nur für Site-Admins zugreifbar sein."
 
-#: Model/Server.php:151
+#: Model/Server.php:166
 msgid "Select the language MISP should use. The default is english."
 msgstr "Wählen Sie die Sprache aus die MISP verwenden soll. Der Standard ist Englisch."
 
-#: Model/Server.php:161
+#: Model/Server.php:176
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr "Aktivieren von leistungsintensiven Korrelationen (aktuell CIDR Korrelation)"
 
-#: Model/Server.php:170
+#: Model/Server.php:185
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:195
 msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
 msgstr "Ein manchen Fällen kann eine MISP Instanz unter hoher Last ungewollte Blackhole-Fehler erzeugen, dies ist aufgrund einer hohen Anzahl an Anfragen an den Server. Deaktivieren Sie die Auto-Logout-Funktion um das system zu entlasten."
 
-#: Model/Server.php:179
+#: Model/Server.php:204
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr "Legen Sie den ssdeep-Wert fest, bei dem zwei ssdeep-Hashes als gleich korrelieren [1-100]"
 
-#: Model/Server.php:187
+#: Model/Server.php:212
 msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
 msgstr "Legt die maximale Anzahl an Korrelationen fest, die mit einem einzigen Event abgerufen werden können. Für extreme Grenzfälle kann dies Speicherprobleme verhindern. Der Standardwert ist 5k."
 
-#: Model/Server.php:196
+#: Model/Server.php:221
 msgid "The message that users will see if the instance is not live."
 msgstr "Die Nachricht, die Nutzern angezeigt wird, wenn die Instanz nicht aktiv ist."
 
-#: Model/Server.php:198
+#: Model/Server.php:223
 msgid "If this is not set the default value will be used."
 msgstr "Wenn dies nicht festgelegt ist, wird der Standardwert verwendet."
 
-#: Model/Server.php:204;212;230;254;262;270;278;335;383;391;457
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
 msgid "This setting is deprecated and can be safely removed."
 msgstr "Diese Einstellung ist veraltet und kann gefahrlos entfernt werden."
 
-#: Model/Server.php:220
+#: Model/Server.php:245
 msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
 msgstr "Zwischengespeicherte Exports können eine beträchtliche Menge an Speicherplatz verbrauchen und können mit dieser Einstellung für die gesammte Instanz deaktiviert werden. Deaktivieren der zwischengespeicherten Exports wird nicht empfohlen, trotzdem ist es ein wertvolles Feature. Falls Ihr Server Speicherplatzprobleme hat kann es sinnvoll sein diesen Schritt zu tun."
 
-#: Model/Server.php:238
+#: Model/Server.php:263
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr "Fußzeilentext, dem \"Powered by MISP\" vorangestellt."
 
-#: Model/Server.php:246
+#: Model/Server.php:271
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr "Fußzeilentext, dem \"Powered by MISP\" folgend."
 
-#: Model/Server.php:286
+#: Model/Server.php:311
 msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
 msgstr "Wenn diese Einstellung gesetzt ist erlaubt sie ein Logo auf der rechten Seite der Fußzeile anzuzeigen. Laden Sie es als ein benutzerdefiniertes Bild im Datei-Management-Tool hoch."
 
-#: Model/Server.php:294
+#: Model/Server.php:319
 msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
 msgstr "Wenn diese Einstellung gesetzt ist erlaubt sie ein Logo als Home-Icon anzuzeigen. Laden Sie es als ein benutzerdefiniertes Bild im Datei-Management-Tool hoch."
 
-#: Model/Server.php:302
+#: Model/Server.php:327
 msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
 msgstr "Diese Einstellung, wenn gesetzt, spezifiziert ein Bild welches das Hauptlogo von MISP auf dem Loginbildschirm ersetzt. Laden Sie es als benutzerdefiniertes Bild im Management Tool hoch."
 
-#: Model/Server.php:310
+#: Model/Server.php:335
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr "Das Organisation-Tag der Hosting-Organisation. Dies wird in Betreffs der E-Mails verwendet."
 
-#: Model/Server.php:318
+#: Model/Server.php:343
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr "Die Hosting-Organisationen dieser Instanz. Wenn diese Option nicht ausgewählt ist können keine Replikatiosinstanzen hinzugefügt werden."
 
-#: Model/Server.php:327
+#: Model/Server.php:352
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr "Die UUID der MISP Instanz. Diese UUID wird verwendet, um diese Instanz zu identifizieren."
 
-#: Model/Server.php:329
+#: Model/Server.php:354
 msgid "No valid UUID set"
 msgstr "Keine gültige UUID gesetzt"
 
-#: Model/Server.php:343
+#: Model/Server.php:368
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr "Diese Einstellung auf \"False\" gesetzt wird alle Organisationnamen und Logos verstecken."
 
-#: Model/Server.php:351
+#: Model/Server.php:376
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr "Setzen Sie das Event-Bedrohungs-Level im Betreiff der Benachrichtigung E-Mail."
 
-#: Model/Server.php:359
+#: Model/Server.php:384
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr "Dies ist die TLP-Zeichenfolge für E-mails wenn email_subject_tag nicht gefunden wird."
 
-#: Model/Server.php:367
+#: Model/Server.php:392
 msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
 msgstr "Wenn dieser Tag in einem Event gesetzt ist wird dessen Wert im E-Mail-Betreff gesendet. Wenn das Tag nicht gesetzt ist, wird der email_subject_TLP_string verwendet."
 
-#: Model/Server.php:375
+#: Model/Server.php:400
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr "Den Namen des email_subject_tag im Betreff angeben. Wenn false wird nur der Wert des Tag verwendet."
 
-#: Model/Server.php:399
+#: Model/Server.php:424
 msgid "Enables the use of MISP's background processing."
 msgstr "Aktiviert das Benutzen der MISP Hintergrundverarbeitung."
 
-#: Model/Server.php:407
+#: Model/Server.php:432
 msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
 msgstr "Verzeichnis in welchem Anlagen gespeichert werden. MISP wird KEINE existierenden Daten migrieren wenn diese Einstellung geändert wird. Der einzige sichere Weg diese Einstellung zu ändern ist in der config.php wenn MISP nicht läuft und nachdem die existierenden Daten an den neuen Ort verschoben oder kopiert wurden. Dieses Verzeichnis muss bereits existieren und die MISP Applikation schreib- und lesbar sein."
 
-#: Model/Server.php:416
+#: Model/Server.php:441
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr "Erlauben den XML-Caches encodierte Anlagen zu beinhalten."
 
-#: Model/Server.php:424
+#: Model/Server.php:449
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr "Anlagen immer herunterladen wenn ein durch einen Nutzer im Browser geladen"
 
-#: Model/Server.php:432
+#: Model/Server.php:457
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr "Die E-Mailadresse die von MISP für alle Mitteilungen verwendet werden soll"
 
-#: Model/Server.php:440
+#: Model/Server.php:465
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr "Sie können mit diese Einstellung jeglichen E-Mail versandt deaktivieren. Wenn aktiviert, werden keine ausgehenden E-Mails von MISP gesendet."
 
-#: Model/Server.php:449
+#: Model/Server.php:474
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr "Die E-Mailadresse die in MISP als Kontaktadresse für das Support-Team der Instanz enthalten sein soll."
 
-#: Model/Server.php:465
+#: Model/Server.php:490
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr "Verwundbarkeitstyp Attribute als Links zum verwendeten CVE-Lookup ändern"
 
-#: Model/Server.php:473
+#: Model/Server.php:498
 msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
 msgstr "Diese Einstellung kontrolliert ob Benachrichtigungs E-Mails versendet werden wenn Events über das REST Interface erstellt werden. Es ist gut diese Einstellung beim ersten Verbinden zu einer anderen Instanz zu deaktivieren um zu verhindern, dass die Nutzer während dem initialen Pull überschwemmt werden. In Kürze: True = E-Mails werden NICHT gesendet, False = E-Mails werden gesendet beim publizieren von Events über Sync und REST."
 
-#: Model/Server.php:481
+#: Model/Server.php:506
 msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
 msgstr "aktvieren dieses Schalters erlaubt es die Eregnissbeschreibung im Betreff von Alarm E-Mails zu versenden. Wichtig festzustellen, dass diese nicht von GnuPG verschlüsselt werden. Aktivieren Sie diese Option nur wenn Sie akzeptieren, dass Teile der Beschreibung im Klartext versendet werden."
 
-#: Model/Server.php:489
+#: Model/Server.php:514
 msgid "The default distribution setting for events (0-3)."
 msgstr "Die standard Verteilungseinstellung für Events (0-3)."
 
-#: Model/Server.php:498
+#: Model/Server.php:523
 msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
 msgstr "Die Standardeinstellung für die Verteilung von Attributen, setzen Sie sie auf \"Event\" um für Attribute das standard Verteilunglevel für Events zu verwenden. (0-3 oder \"Event\")"
 
-#: Model/Server.php:507
+#: Model/Server.php:532
 msgid "The default threat level setting when creating events."
 msgstr "Die Standardeinstellung für Bedrohungslevel beim erstellen von Events."
 
-#: Model/Server.php:516
+#: Model/Server.php:541
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:550
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr "Aktivieren der Tagging-Funktion von MISP. Strengstens empfohlen."
 
-#: Model/Server.php:524
+#: Model/Server.php:558
 msgid "Show the full tag names on the event index."
 msgstr "Zeige die vollen Tag-Namen im Eregnis-Index."
 
-#: Model/Server.php:533
+#: Model/Server.php:567
 msgid "Used on the login page, before the MISP logo"
 msgstr "Genutzt auf der Login-Seite, vor dem MISP-Logo"
 
-#: Model/Server.php:541
+#: Model/Server.php:575
 msgid "Used on the login page, after the MISP logo"
 msgstr "Genutzt auf der Login-Seite, hiner dem MISP-Logo"
 
-#: Model/Server.php:549
+#: Model/Server.php:583
 msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
 msgstr "Verwendet auf der Login-Seite, links vom MISP-Logo. Laden Sie es als benutzerdefiniertes Bild im Datei-Management-Tool hoch."
 
-#: Model/Server.php:557
+#: Model/Server.php:591
 msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
 msgstr "Verwendet auf der Login-Seite, rechts vom MISP-Logo. Laden Sie es als benutzerdefiniertes Bild im Datei-Management-Tool hoch."
 
-#: Model/Server.php:565
+#: Model/Server.php:599
 msgid "Used in the page title, after the name of the page"
 msgstr "Verwendet im Seitentitel nach dem Namen der Seite"
 
-#: Model/Server.php:573
+#: Model/Server.php:607
 msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
 msgstr "Ermöglicht den Nutzern Besitz von Events die von einen Upload über den \"Add MISP XML\" Button stammen zu ergreifen. Dies ermöglicht es den Ersteller eines manuell importieren Events zu fälschen, außerdem kann so die ursprünglich beabsichtigte Veröffentlichung beeinträchtigt werden. Synchronisation mit einer Instanz die einen anderen Author für das selbe Event hat kann zu ungewollten Konsequenzen führen."
 
-#: Model/Server.php:581
+#: Model/Server.php:615
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr "Wählen Sie, ob die allgemeinen Geschäftsbedingungen Inline angezeigt (false) oder als Download (true) angeboten werden sollen"
 
-#: Model/Server.php:589
+#: Model/Server.php:623
 msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
 msgstr "Der Dateiname der Datei mit den Geschäftsbedingungen. Stellen Sie sicher, dass sich die Datei im Verzeichnis MISP/app/files/terms befindet"
 
-#: Model/Server.php:597
+#: Model/Server.php:631
 msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
 msgstr "True aktivierte alternative Org-Felder für Event-Index (Quellorganisation und Mitgliederorganisation), anstelle dem traditionellen Weg nur ein Organisationfeld anzuzeigen. Dies ermöglicht es Nutzern sehen ob ein Event von einer Mitgliederorganisation auf ihre MISP-Instanz hochgeladen wurde oder ob es von einer weiter vernetzten Instanz kommt."
 
-#: Model/Server.php:605
+#: Model/Server.php:639
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr "True verbietet den Zugriff auf unveröffentlichte Events für Nutzer außerhalb der Organisation des Erstellers, außer für Site-Admins."
 
-#: Model/Server.php:614
+#: Model/Server.php:648
 msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr "Die Benachrichtigung an den Nutzer nach der Accounterstellung (muss manuell vom Administrationsinterface gesendet werden). Verwenden Sie \\n für Zeilenumbrüche. Die folgenden Variablen werden automatisch mit dem Text ersetzt: $password = ein neues temporäres von MISP erzeugtes Passwort, $username = die E-Mailadresse des Nutzers, $misp = die URL dieser Instanz, $org = die Organisation zu welcher diese Instanz gehört, wie in MISP.org gesetzt, $contact = die E-Mailadresse des Support Teams, wie in MISP.contact gesetzt. Zum Beispiel \"das Passwort für $username ist $password\" würde in der E-Mail an einen Nutzer mit der E-Mailadresse user@misp.org zu \"das Passwort für user@misp.org ist hNamJae81\"."
 
-#: Model/Server.php:623
+#: Model/Server.php:657
 msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr "Die Benachrichtigung an die Nutzer nachdem ein Passwortreset ausgelöst wurde. Verwenden Sie \\n für Zeilenumbrüche. Die folgenden Variablen werden automatisch mit dem Text ersetzt: $password = ein neues temporäres von MISP erzeugtes Passwort, $username = die E-Mailadresse des Nutzers, $misp = die URL dieser Instanz, $contact = die E-Mailadresse des Support Teams, wie in MISP.contact gesetzt. Zum Beispiel \"das Passwort für $username ist $password\" würde in der E-Mail an einen Nutzer mit der E-Mailadresse user@misp.org zu \"das Passwort für user@misp.org ist hNamJae81\"."
 
-#: Model/Server.php:631
+#: Model/Server.php:665
 msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
 msgstr "Seit Version 2.3.107 ist es möglich Event UUIDs zu blacklisten um zu verhindern, dass sie an andere Instanzen weitergegeben werden. Diese Funktionalität wird ebenfalls im hintergrund verwendet wenn ein Event gelöscht wird um zu verhindern, dass ein gelöschtes Event per PUSH von einer anderen Instanz zurück kommt."
 
-#: Model/Server.php:638
+#: Model/Server.php:672
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr "Blacklisten von Organisations UUIDs um die erzeugung von jeglichen Events erzeugt von der blockierten Organisation zu verhindern."
 
-#: Model/Server.php:645
+#: Model/Server.php:679
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr "Wenn aktiviert, werden alle Log-Einträge die IP-Adresse des Benutzers enthalten."
 
-#: Model/Server.php:654
+#: Model/Server.php:688
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr "Wenn aktiviert, protokolliert MISP alle erfolgreiche Authentifizierungen mit API-Schlüssel. Die angeforderten URLs werden ebenfalls protokolliert."
 
-#: Model/Server.php:662
+#: Model/Server.php:696
 msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
 msgstr "Diese Funktion ermöglicht es Nutzern Org only Events zu erstellen und eine andere Organisation zu bitten diese zu übernehmen. Dies ermöglicht es Organisationen anonym zu bleiben indem Sie einen Partner ein Event für sie zu veröffentlichen lassen."
 
-#: Model/Server.php:671
+#: Model/Server.php:705
 msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
 msgstr "Falls aktiviert, wird die Anzahl an Korrelationen für den aktuell angemeldeten Nutzer in der Event-Index Oberfläche dargestellt. Dies ist rechenaufwändig, kann aber sehr hilfreich sein um auf einen Blick korrelierende Events zu sehen."
 
-#: Model/Server.php:680
+#: Model/Server.php:714
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr "Falls aktiv, wird die Anzahl an Proposalsa für das Event im Index angezeigt."
 
-#: Model/Server.php:689
+#: Model/Server.php:723
 msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
 msgstr "Falls aktiviert, wird die Gesamtzahl der Attribut-Sichtungen des Events für den aktuell angemeldeten Benutzer auf der Event-Index Oberfläche sichtbar."
 
-#: Model/Server.php:698
+#: Model/Server.php:732
 msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
 msgstr "Falls aktiviert, wird die Gesamtzahl der Diskussionsbeiträge für das Event für den aktuell angemeldeten Benutzer in der Event-Index Oberfläche sichtbar."
 
-#: Model/Server.php:707
+#: Model/Server.php:741
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr "Falls aktiv können nur Org- oder Site-Admins Nutzerprofile editieren."
 
-#: Model/Server.php:717
+#: Model/Server.php:751
 msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
 msgstr "Aktivieren Sie diese Einstellung um Alert-E-Mails für Event mit einem bestimmten Tag zu blockieren. Spezifizieren Sie den Tag in MISP.block_event_alert_tag."
 
-#: Model/Server.php:726
+#: Model/Server.php:760
 msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
 msgstr "Wenn die MISP.block_event_alert Einstellung gesetzt ist werden Alert E-mails für Events mit dem Tag, definiert durch diese Einstellung, blockiert."
 
-#: Model/Server.php:735
+#: Model/Server.php:769
 msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
 msgstr "Aktivieren Sie diese Einstellung um zu beginnen Alert E-Mails für alte Events zu blockieren. Das genaue Alter das darüber entscheided ob ein Event alt ist wird festgelegt in MISP.block_old_event_alert_age."
 
-#: Model/Server.php:744
+#: Model/Server.php:778
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
 msgstr "Wenn die MISP.block_old_event_alert Einstellung gesetzt ist wird diese Einstellung steuern wie alt ein Event sein darf um eine Benachrichtgung auszulösen. Dafür wird das Feld \"Datum\" des Events verwendet. Erwartetes Format: Ganzzahl, in Tagen"
 
-#: Model/Server.php:753
+#: Model/Server.php:787
 msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
 msgstr "Bitte spezifizieren Sie das temporäre Verzeichnis, dass Sie für bestimmte Funktionalitäten von MISP verwenden möchten. Standarmäßig ist dies /tmp. Es wird unter anderem verwendet zur Speicherung temporärer Dateien, extrahiert während des Importprozesses."
 
-#: Model/Server.php:762
-msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/webroot/css directory and enter the name here."
-msgstr "Wenn Sie das CSS anpassen möchten, legen Sie einfach eine CSS-Datei in das /var/www/MISP/webroot/css Verzeichnis und geben Sie den Namen hier an."
+#: Model/Server.php:796
+msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
+msgstr ""
 
-#: Model/Server.php:771
+#: Model/Server.php:805
 msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
 msgstr "Aktivieren Sie diese Einstellung um sensible to_ids Exporte von Attributen zu blockieren wenn ein Vorschlag existiert das IDS-Flag zu entfernen oder das Attribut ganz zu entfernen. Dies ist ein leistungsfähiges Werkzeug, um mit Fehlalarme umzugehen."
 
-#: Model/Server.php:780
+#: Model/Server.php:814
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr "Aktivieren Sie diese Einstellung wenn neue Tags durch Sync / Hinzufügen durch ankommende Events aus beliebiger Quelle, nicht standardmäßig von Nutzern auswählbar sein sollen."
 
-#: Model/Server.php:789
+#: Model/Server.php:823
 msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
 msgstr "*ACHTUNG* Diese Einstellung deaktiviert die komplette Korrelation auf dieser Instanz und entfernt alle existierenden gespeicherten Korrelationen. Aktivieren wird eine komplette Neukorrelation aller Daten, dies ist ein extrem langer und auwändiger Prozess. Aktivieren Sie dies nur, wenn Sie wissen was Sie tun."
 
-#: Model/Server.php:799
+#: Model/Server.php:833
 msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
 msgstr "*WARNUNG* Diese Einstellung ermöglicht es Erstellern von Events die Korrelation einzelner von ihnen estellten Events / Attributen zu deaktivieren."
 
-#: Model/Server.php:808
+#: Model/Server.php:842
 msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr "Der Host auf dem der Redis-Sever für generische MISP Tasks, wie Caching, läuft. Nicht zu verwechseln mit dem Redis-Server welcher von der Hintergrundverarbeitung verwendet wird."
 
-#: Model/Server.php:816
+#: Model/Server.php:850
 msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr "Der Port des Redis-Severs für generische MISP Tasks (wie Caching). Nicht zu verwechseln mit dem Redis-Server welcher von der Hintergrundverarbeitung verwendet wird."
 
-#: Model/Server.php:824
+#: Model/Server.php:858
 msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
 msgstr "Die Datenbank auf dem Redis-Server welche für generische MISP-Tasks verwendet wird. Wenn Sie mehr als eine MISP-Instanz betreiben, stellen Sie bitte sicher auf jeder eine unterschiedliche Datenbank zu verwenden."
 
-#: Model/Server.php:832
+#: Model/Server.php:866
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr "Das Passwort auf dem Redis-Server (falls vorhanden) welches für generische MISP Tasks verwendet wird."
 
-#: Model/Server.php:841
+#: Model/Server.php:875
 msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
 msgstr "Geben Sie an, nach welche Felder gefiltert werden soll wenn im Eventview gesucht wird. Standardwerte sind : \"id, uuid, value, comment, type, category, Tag.name\""
 
-#: Model/Server.php:849
+#: Model/Server.php:883
+msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
+msgstr ""
+
+#: Model/Server.php:891
 msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
 msgstr "Aktivieren Sie diese Option nur, wenn Sie einige Tools verwenden die mit hoher Parallelität auf MISP zugreifen. Die allgemeine Leistung wird geringer sein als normal, weil bestimmte Datenbanktransaktionen vermieden werden um kürzere Tabellenlocks zu haben."
 
-#: Model/Server.php:861
+#: Model/Server.php:903
 msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
 msgstr "Der Speicherort der GnuPG Binary. Wenn Sie eine andere GnuPG Binary verwenden wollen als die in /usr/bin/gpg können Sie diese hier angeben. Wenn der Default in Ordnung ist, behalten Sie den von MISP vorgeschlagenen Pfad."
 
-#: Model/Server.php:869
+#: Model/Server.php:911
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr "Erlauben (false), dass unverschlüsselte E-Mails and Nutzer geschickt werden die keinen GnuPG-Key hinterlegt haben."
 
-#: Model/Server.php:877
+#: Model/Server.php:919
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr "Erlauben (false), dass Inhalte von unverschlüsselten E-Mail Details über ein Event enthalten."
 
-#: Model/Server.php:885
+#: Model/Server.php:927
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr "Aktivieren, dass GnuPG E-Mails signiert werden. Stardmäpßig sind GnuPG E-Mails signiert"
 
-#: Model/Server.php:893
+#: Model/Server.php:935
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr "Die E-Mailadresse die im GnuPG-Schlüssel der Instanz angegeben ist."
 
-#: Model/Server.php:901
+#: Model/Server.php:943
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr "Das Passwort (falls gesetzt) des GnuPG-Schlüssels der Instanz."
 
-#: Model/Server.php:910
+#: Model/Server.php:952
 msgid "The location of the GnuPG homedir."
 msgstr "Der Speicherort des GnuPG Schlüsselbundes (homedir)."
 
-#: Model/Server.php:921
+#: Model/Server.php:963
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr "Aktivieren der SMIME Verschlüsselung. Die Einstellungen von GnuPG.onlyencrpyted und GnuPG.bodyonlyencrypted werden übernommen, wenn SMIME aktiviert ist."
 
-#: Model/Server.php:929
+#: Model/Server.php:971
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr "Die E-Mailadresse die im SMIME-Schlüssel der Instanz angegeben ist."
 
-#: Model/Server.php:937
+#: Model/Server.php:979
 msgid "The location of the public half of the signing certificate."
 msgstr "Das Verzeichnis in dem der öffentliche Teil des Signaturzertifikats abgelegt ist."
 
-#: Model/Server.php:945
+#: Model/Server.php:987
 msgid "The location of the private half of the signing certificate."
 msgstr "Das Verzeichnis in dem der private Teil des Signaturzertifikats abgelegt ist."
 
-#: Model/Server.php:953
+#: Model/Server.php:995
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr "Das Passwort (falls gesetzt) des SMIME-Schlüssels der Instanz."
 
-#: Model/Server.php:965
+#: Model/Server.php:1007
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr "Der Hostname eines HTTP-Proxys für ausgehende Sync-Anfragen. Leer lassen um keinen Proxy zu verwenden."
 
-#: Model/Server.php:973
+#: Model/Server.php:1015
 msgid "The TCP port for the HTTP proxy."
 msgstr "Der TCP-Port für den HTTP-Proxy."
 
-#: Model/Server.php:981
+#: Model/Server.php:1023
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr "Die Authentifizierungsmethode für den HTTP-Proxy. Derzeit werden Basic oder Digest unterstützt. Für keine Proxy-Authentifizierung leer lassen."
 
-#: Model/Server.php:989
+#: Model/Server.php:1031
 msgid "The authentication username for the HTTP proxy."
 msgstr "Der Benutzername für die Authentifizierung am HTTP-Proxy."
 
-#: Model/Server.php:997
+#: Model/Server.php:1039
 msgid "The authentication password for the HTTP proxy."
 msgstr "Das Passwort für die Authentifizierung am HTTP-Proxy."
 
-#: Model/Server.php:1008
+#: Model/Server.php:1050
 msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
 msgstr "Die Salt für Password-Hashes. Sie können diese nicht aus der GUI zurücksetzen, nur manuell aus der Datei seetings.php. Beachten Sie, dass dies alles Passwörter in der Datenbank ungültig macht."
 
-#: Model/Server.php:1017
+#: Model/Server.php:1059
 msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
 msgstr "Aktivieren Sie diese Einstellung um alle Einträge im Audit-Log direkt an Syslog zu geben. Bedenken Sie, diese sind ausführlich und enthalten Nutzer-, Organisations- und Event-Daten."
 
-#: Model/Server.php:1026
+#: Model/Server.php:1068
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr "Geforderte Passwortlänge. Falls nicht gesetzt oder auf 0 wird der Standard angenommen (12)."
 
-#: Model/Server.php:1034
+#: Model/Server.php:1076
 msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 msgstr "Anforderung an die Passwortkomplexität. Leer lassen um die Standardeinstellung zu verwenden (3 von 4, mit entweder einer Ziffer oder Sonderzeichen) oder geben Sie eine regex an. Beachten Sie, die Länge wir mit einer anderen Einstellung gefordert. Standard (für einfache Passwörter 3 von 4 oder mindestens 16 Zeichen): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 
-#: Model/Server.php:1042
+#: Model/Server.php:1084
 msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
 msgstr "Das Aktivieren dieser Einstellung bewirkt, dass Benutzer ihr derzeitiges Passwort bei jeder Änderung ihres Profils (einschließlich einer ausgelösten Kennwortänderung) eingeben müssen. Für Administratoren wird die Eingabe erforderlich bei der Änderung eines beliebigen Benutzerprofils. Dies könnte potenziell einen Angreifer davon abhalten das Kennwort eines Benutzers zu ändern, um persistent Zugang zu erlangen, auf jeden Fall ist es sehr lästig für die Benutzer, werden diese Funktion aktiv ist."
 
-#: Model/Server.php:1051
+#: Model/Server.php:1093
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr "Durch Aktivieren dieser Einstellung wird der Inhalt eines Attributs bei einem \"soft delete\" bereinigt"
 
-#: Model/Server.php:1060
+#: Model/Server.php:1102
 msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
 msgstr "Aktivieren dieser Einstellung macht den Organisations-Index für alle außer den Site Administratoren dieser Instanz unsichtbar. Bedenken Sie, dass Nutzer immernoch Organisationen welche Daten über Events, Proposals, Event Histoy, Log Entries, usw. produzieren sehen können."
 
-#: Model/Server.php:1069
+#: Model/Server.php:1111
 msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
 msgstr "Erlaubt das übergeben des API-Keys über den URL-Parameter \"apikey\" - es wird strengstens empfohlen dies nicht zu aktivieren, falls Sie ein heikles Legacy-Tool verwenden, welches den Authorization-Header nicht übergeben kann, kann dies ein Workaround sein. Nochmal, benutzen Sie dies nur als eine letzte Möglichkeit."
 
-#: Model/Server.php:1071
+#: Model/Server.php:1113
 msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
 msgstr "Sie haben das Übergeben von API-Keys über URL-Parameter aktiviert. Es wird strengstens empfolen dies nicht zu tun, wollen Sie wirklich API-Keys in den Logfiles haben?..."
 
-#: Model/Server.php:1081
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr "Die Anzahl Versuche die ein Nutzer beim Login hat bevor der Bruteforce-Schutz aktiv wird."
 
-#: Model/Server.php:1089
+#: Model/Server.php:1149
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr "Die Dauer (in Sekunden) für die ein Nutzer blockiert wird falls er die erlaubte Anzahl Loginversuche aufgebraucht hat."
 
-#: Model/Server.php:1100
+#: Model/Server.php:1160
 msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
 msgstr "Auf \"True\" gesetzt werden Sessions nach x Anfragen automatisch neue generiert. Dies kann dazu führen, dass der Nutzer abgemeldet wird und ist gererell frustrierend, also aktivieren Sie dies nur falls Sie Sessions wirklich neu generieren müssen. (Nicht empfohlen)"
 
-#: Model/Server.php:1108
+#: Model/Server.php:1168
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr "Mit dem Wert \"True\" wird der User-Agent-String jeder Anfrage überprüft. Dies kann zu gelegentlichen Logouts führen (nicht empfohlen)."
 
-#: Model/Server.php:1116
+#: Model/Server.php:1176
 msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
 msgstr "Der Session-Typ der von MISP verwendet wird. Die Standardeinstellung ist php, welche die Session-Einstellungen konfiguriert in der php.ini für die Session-Daten nutzt (unterstützte Optionen: php, database). Die empfohlene Einstellung ist php und PHP mit redis Session über die php.ini zu konfigurieren. Fügen Sie einfach 'session.save_handler = redis' und \"session.save_path = 'tcp://localhost:6379\"\" hinzu (fügen Sie in der zweiten Option Ihre Verbindung zu redis ein) um "
 
-#: Model/Server.php:1125
-msgid "The timeout duration of sessions (in MINUTES)."
-msgstr "Die Timeout-Dauer der Sitzungen (in Minuten)."
+#: Model/Server.php:1185
+msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
+msgstr ""
 
-#: Model/Server.php:1133
+#: Model/Server.php:1193
 msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
 msgstr "Das Ablaufdatum des Cookies (in Minuten). Das Session-Timeout wird regelmäßig aktualisiert, die Cookies aber nicht. Im Allgemeinen empfiehlt es sich, einen viel höheren cookie_timeout als Session-timeout zu haben."
 
-#: Model/Server.php:1144
+#: Model/Server.php:1204
 msgid "The default policy action for the values added to the RPZ."
 msgstr "Die standard Policy-Aktion für Werte die RPZ hinzugefügt werden."
 
-#: Model/Server.php:1153
+#: Model/Server.php:1213
 msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
 msgstr "Der Standard Walled-Garden, vernwendet vom RPZ export wenn die Walled-Garden-Einstellung für den Export ausgewählt ist."
 
-#: Model/Server.php:1161
+#: Model/Server.php:1221
 msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
 msgstr "Die \"serial\" im SOA-Teil der Zonendatei. (Numerisch, best practice ist yyyymmddrr wobei rr die zweistellgie Sub-Revision der Date ist. $date wird automatisch zum aktuellen yyyymmdd konvertiert, also ist $date00 eine gültige Einstellung)."
 
-#: Model/Server.php:1169
+#: Model/Server.php:1229
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Der \"refresh\" angegeben im SOA-Teil der Zonendatei. (in Sekunden oder Kurzschrift, z.B. 15m)"
 
-#: Model/Server.php:1177
+#: Model/Server.php:1237
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Der \"retry\" angegeben im SOA-Teil der Zonendatei. (in Sekunden oder Kurzschrift, z.B. 15m)"
 
-#: Model/Server.php:1185
+#: Model/Server.php:1245
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Der \"expiry\" angegeben im SOA-Teil der Zonendatei. (in Sekunden oder Kurzschrift, z.B. 15m)"
 
-#: Model/Server.php:1193
+#: Model/Server.php:1253
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Der \"minimum TTL\" angegeben im SOA-Teil der Zonendatei. (in Sekunden oder Kurzschrift, z.B. 15m)"
 
-#: Model/Server.php:1201
+#: Model/Server.php:1261
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Die TTL der Zonendatei. (in Sekunden oder Kurzschrift, z.B. 15m)"
 
-#: Model/Server.php:1217
+#: Model/Server.php:1277
 msgid "Alternate nameserver"
 msgstr "Alternative nameserver"
 
-#: Model/Server.php:1225
+#: Model/Server.php:1285
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr "Die E-Mail-Adresse angegeben im SOA-Tail der Zone-Datei."
 
-#: Model/Server.php:1233
+#: Model/Server.php:1293
 msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
 msgstr "Aktiviert oder deaktiviert das Pub/Sub-Feature von MISP. Stellen Sie sicher, dass die Abhängigkeiten für das Plugin installiert sind, damit es funktionieren kann. Mehr Informationen in den Installationsanweisungen."
 
-#: Model/Server.php:1242
+#: Model/Server.php:1302
 msgid "The port that the pub/sub feature will use."
 msgstr "Der Port, den das Pub/Sub-Feature verwendet."
 
-#: Model/Server.php:1251
+#: Model/Server.php:1311
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr "Ort der Redis-DB verwendet von MISP und dem PUB Python Skript als Warteschlange für zu veröffentlichende Daten."
 
-#: Model/Server.php:1260
+#: Model/Server.php:1320
 msgid "The port that Redis is listening on."
 msgstr "Der Port auf dem Redis hört."
 
-#: Model/Server.php:1269
+#: Model/Server.php:1329
 msgid "The password, if set for Redis."
 msgstr "Das Passwort, falls für Redis gesetzt."
 
-#: Model/Server.php:1278
+#: Model/Server.php:1338
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr "Die Datenbank die für die Warteschlange für Nachrichten für die Pub/Sub-Funktionalität verwendet werden soll."
 
-#: Model/Server.php:1287
+#: Model/Server.php:1347
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr "Der Namespace der für die Warteschlange für Nachrichten für die Pub/Sub-Funktionalität verwendet werden soll."
 
-#: Model/Server.php:1296
+#: Model/Server.php:1356
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr "Aktivieren Sie diese Einstellung um die base64 kodierten Payloads von Malware-Samples/Anlagen in die Ausgabe einzubinden."
 
-#: Model/Server.php:1304
+#: Model/Server.php:1364
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung von Event- Erzeugungen/Änderungen/Löschungen."
 
-#: Model/Server.php:1312
+#: Model/Server.php:1372
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung von Objekt- Erzeugungen/Änderungen/Löschungen."
 
-#: Model/Server.php:1320
+#: Model/Server.php:1380
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung von Objekt-Referenz- Erzeugungen/Löschungen."
 
-#: Model/Server.php:1328
+#: Model/Server.php:1388
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung von Attribut- Erzeugungen/Änderungen/(Soft) Löschungen."
 
-#: Model/Server.php:1336
+#: Model/Server.php:1396
 msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung von Tag- Erstellungen/Änderungen/Löschungen sowie Tags die an unterschiedlichste MISP Elemente zugewieson / enfernt werden."
 
-#: Model/Server.php:1344
+#: Model/Server.php:1404
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung neuer Sightings zum ZMQ pubsub Feed."
 
-#: Model/Server.php:1352
+#: Model/Server.php:1412
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung neuer/veränderter Nutzer zum ZMQ pubsub Feed."
 
-#: Model/Server.php:1360
+#: Model/Server.php:1420
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung neuer/geänderter Organisationen zum ZMQ pubsub Feed."
 
-#: Model/Server.php:1368
+#: Model/Server.php:1428
 msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr "Aktiviert oder deaktiviert die Veröffentlichung von Log-Einträgen zum ZMQ pubsub Feed. Bedenken Sie, diese Einträge können viele Details beinhalten, abhängig von Ihren Logging-Einstellungen."
 
-#: Model/Server.php:1376
+#: Model/Server.php:1436
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr "Aktiviert das Logging auf eine ElasticSearch-Instanz"
 
-#: Model/Server.php:1384
-msgid "The URL(s) at which to access ElasticSearch - comma seperate if you want to have more than one."
-msgstr "Die URL(s) auf denen ElasticSearch zugegriffen wird - Komma getrennt, für mehr als eine."
+#: Model/Server.php:1444
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
+msgstr ""
 
-#: Model/Server.php:1392
+#: Model/Server.php:1452
 msgid "The index in which to place logs"
 msgstr "Der Index in dem Logs gespeichert werden sollen"
 
-#: Model/Server.php:1400
+#: Model/Server.php:1460
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr "Aktiviert oder deaktiviert den Upload von Malware Samples auf S3 anstatt auf Festplatte (WARNUNG: Zuerst die Erlaubnis von Amazon einholen!)"
 
-#: Model/Server.php:1408
+#: Model/Server.php:1468
 msgid "Bucket name to upload to"
 msgstr "Name des Bucket in den hochgeladen wird"
 
-#: Model/Server.php:1416
+#: Model/Server.php:1476
 msgid "Region in which your S3 bucket resides"
 msgstr "Region in welcher der S3-Bucket ist"
 
-#: Model/Server.php:1424
+#: Model/Server.php:1484
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr "AWS-Schlüssel zum Hochladen von Samples (WARNUNG: es wird dringend empfohlen, dass Sie EC2 IAM-Rollen verwenden, wenn überhaupt möglich)"
 
-#: Model/Server.php:1432
+#: Model/Server.php:1492
 msgid "AWS secret key to use when uploading samples"
 msgstr "Geheimer AWS Schlüssel für das Hochladen von Samples"
 
-#: Model/Server.php:1440
+#: Model/Server.php:1500
 msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
 msgstr "Diese Einstellung definiert wer Zugriff auf die gemeldeten Sightings haben wird. Die Standardeinstellung ist nur der Besitzer selbst (zusätzlich dazu, dass jeder seine eigenen Beiträge sieht), die anderen Optionen, Sighting Reporters (bedeutet der Event-Besitzer und jeder der Sighting Informationen zum Event beigetragen hat) und Jeder (bedeutet jeder der Zugriff auf das Event / Attribut hat)."
 
-#: Model/Server.php:1449
+#: Model/Server.php:1509
 msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
 msgstr "Aktiviert die Anonymisiserung von Sightings wird die Summe der Sightings zeigen anstatt der Organisationen welche diese gemeldet haben. Benutzern wird es möglich sein die Anzahl an Sightings der eigenen Organisation und derer anderer Organisationen zu sehen"
 
-#: Model/Server.php:1457
+#: Model/Server.php:1517
 msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
 msgstr "Einstellung des Bereichs für Sightings für das generieren von Graphen. Zum Beispiel ein Sighting mit einem sighted_date von vor 7 Jahren ist eventuell nicht mehr relevant. Wert in Tagen, Default ist 365 Tage"
 
-#: Model/Server.php:1465
+#: Model/Server.php:1525
 msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
 msgstr "Aktivieren Sie diese Funktion, falls Sie die Authentifizierung mit MISP durch ein externes Tool und custom Header handhaben möchten."
 
-#: Model/Server.php:1475
+#: Model/Server.php:1535
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr "Stellen Sie hier die Kopfzeile ein, nach der MISP hier suchen soll. Ohne weitere Angabe wird als Default nach der Authorisierungskopfzeile gesucht."
 
-#: Model/Server.php:1484
+#: Model/Server.php:1544
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr "Verwenden Sie einen Namespace (Namensbereich) für den Authentifizierungsheader - Standardeinstellung ist aktiviert"
 
-#: Model/Server.php:1493
+#: Model/Server.php:1553
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr "Der Standard Namespace für den Authentifizierungsheader - Standardeinstellung ist HTTP"
 
-#: Model/Server.php:1502
+#: Model/Server.php:1562
 msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
 msgstr ""
 
-#: Model/Server.php:1511
+#: Model/Server.php:1571
 msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
 msgstr ""
 
-#: Model/Server.php:1520
+#: Model/Server.php:1580
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr ""
 
-#: Model/Server.php:1529
+#: Model/Server.php:1589
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr "Deaktivieren Sie den Logout-Button für User, die sich extern authentifizieren."
 
-#: Model/Server.php:1537
+#: Model/Server.php:1597
 msgid "Enable/disable the enrichment services"
 msgstr "Aktivieren/Deaktivieren der Enrichtment Services"
 
-#: Model/Server.php:1545
+#: Model/Server.php:1605
 msgid "Set a timeout for the enrichment services"
 msgstr "Timeout für die Enrichment Services"
 
-#: Model/Server.php:1553;1665
+#: Model/Server.php:1613;1725
 msgid "Enable/disable the import services"
 msgstr "Aktivieren/Deaktivieren der Import Services"
 
-#: Model/Server.php:1561;1682
+#: Model/Server.php:1621;1742
 msgid "Set a timeout for the import services"
 msgstr "Timeout für die Import-Services"
 
-#: Model/Server.php:1569
+#: Model/Server.php:1629
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "Die URL zum Zugriff auf die Import-Services. Standardmäßig sind diese Zugreifbar unter http://127.0.0.1:6666"
 
-#: Model/Server.php:1577
+#: Model/Server.php:1637
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Der Port zum Zugriff auf die Import-Services. Standardmäßig sind diese Zugreifbar unter http://127.0.0.1:6666"
 
-#: Model/Server.php:1585
+#: Model/Server.php:1645
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "Die URL zum Zugriff auf die Export-Services. Standardmäßig sind diese Zugreifbar unter http://127.0.0.1:6666"
 
-#: Model/Server.php:1593
+#: Model/Server.php:1653
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Der Port zum Zugriff auf die Export-Services. Standardmäßig sind diese Zugreifbar unter http://127.0.0.1:6666"
 
-#: Model/Server.php:1601
+#: Model/Server.php:1661
 msgid "Enable/disable the export services"
 msgstr "Aktivieren/Deaktivieren der Export Services"
 
-#: Model/Server.php:1609
+#: Model/Server.php:1669
 msgid "Set a timeout for the export services"
 msgstr "Timeout für die Export-Services"
 
-#: Model/Server.php:1617
+#: Model/Server.php:1677
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1625
+#: Model/Server.php:1685
 msgid "Set a timeout for the hover services"
 msgstr "Timeout für Tooltips (hover services)"
 
-#: Model/Server.php:1633
+#: Model/Server.php:1693
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1641
+#: Model/Server.php:1701
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1649
+#: Model/Server.php:1709
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:1657
+#: Model/Server.php:1717
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:1673
+#: Model/Server.php:1733
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:1690
+#: Model/Server.php:1750
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:1699
+#: Model/Server.php:1759
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:1708
+#: Model/Server.php:1768
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr ""
 
-#: Model/Server.php:1717
+#: Model/Server.php:1777
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:1726
+#: Model/Server.php:1786
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:1735
+#: Model/Server.php:1795
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:1745
+#: Model/Server.php:1805
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:1754
+#: Model/Server.php:1814
 msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
 msgstr ""
 
-#: Model/Server.php:2401
+#: Model/Server.php:1947
+msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/Server.php:2054
+msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+msgstr "Nicht berechtigt. Dies ist entweder aufgrund eines ungüötigen Auth-Schlüssels oder weil der Sync-Benutzer keine Berechtigung am entfernten Server hat. Ein weiterer Grund könnte eine falsche Einstellung am Sync-Server sein."
+
+#: Model/Server.php:2056
+msgid "Sorry, this is not yet implemented"
+msgstr "Entschuldigung, die Entwickler von MISP waren zu faul dies zu entwickeln;P"
+
+#: Model/Server.php:2057
+msgid "Something went wrong while trying to pull"
+msgstr "Beim Versenden der E-Mails ist etwas schief gegangen"
+
+#: Model/Server.php:2069;2071
+msgid "Unknown issue."
+msgstr "Unbekanntes Problem."
+
+#: Model/Server.php:2535
 msgid "Enable or disable the %s module."
 msgstr "Ein- oder Ausschalten des %s Moduls."
 
-#: Model/Server.php:2404
+#: Model/Server.php:2538
 msgid "Restrict the %s module to the given organisation."
 msgstr "Das %s Modul auf die angegebene Organisation beschränken."
 
-#: Model/Server.php:2412
+#: Model/Server.php:2546
 msgid "Set this required module specific setting."
 msgstr "Setzen Sie die spezifische Einstellung für dieses Modul."
 
-#: Model/Server.php:2527
+#: Model/Server.php:2661
 msgid "Value not set."
 msgstr "Wert wurde nicht gesetzt."
 
-#: Model/Server.php:3130
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
 msgid "Organisation logos"
 msgstr "Logos der Organisationen"
 
-#: Model/Server.php:3131
+#: Model/Server.php:3476
 msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
 msgstr "Das Logo einer Organisation welches im Event Index, Ereignisanzeige, Diskussionen, Vorschläge usw. verwendet wird. Stellen Sie sicher, dass der Dateiname im Format org.png ist, wobei org der Name der Organisation ist (Groß/Kleinschreibung ist zu beachten)."
 
-#: Model/Server.php:3133
+#: Model/Server.php:3478
 msgid "48x48 pixel .png files"
 msgstr "48x48 Pixel png-Dateien"
 
-#: Model/Server.php:3136;3151
+#: Model/Server.php:3481;3496
 msgid "Filename must be in the following format: *.png"
 msgstr "Dateiname muss im folgenden Format sein: *.png"
 
-#: Model/Server.php:3140
+#: Model/Server.php:3485
 msgid "Additional image files"
 msgstr "Zusätzliche Bilder"
 
-#: Model/Server.php:3141
+#: Model/Server.php:3486
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr "Bilddateien, die in dieses Verzeichnis hochgeladen werden, können für weitere Einsatzzwecke verwendet werden, etwa als Logo der Login-Seite"
 
-#: Model/Server.php:3148
+#: Model/Server.php:3493
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr "text/html falls es im Interface angezeigt werden soll, ansonsten jede Datei als Download, die die allgemeinen Nutzungsbedingungen vermittelt"
 
-#: Model/Server.php:3765
+#: Model/Server.php:3665
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr "Fehler: Server hat die erwartete Antwort nicht gesendet. Dies kann sein, weil die entfernte Server-Version veraltet ist."
+
+#: Model/Server.php:4115
 msgid "Removing a dead worker."
 msgstr "Gestorbenen Arbeitsprozess entfernen."
 
-#: Model/Server.php:3766
+#: Model/Server.php:4116
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr "Gestorbener Arbeitsprozess wird entfernt. Arbeitsprozess war vom Typ %s mit Prozess-ID %s"
 
-#: Model/Server.php:3770
+#: Model/Server.php:4120
 msgid "Stopping a worker."
 msgstr "Einen Arbeitsprozess anhalten."
 
-#: Model/Server.php:3771
+#: Model/Server.php:4121
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr "Gestorbener Arbeitsprozess wird entfernt. Arbeitsprozess war vom Typ %s mit Prozess-ID %s"
 
@@ -2029,7 +2311,7 @@ msgstr "hat die folgenden abhängigen Elemente"
 
 #: View/Attributes/add.ctp:7
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Attribut hinzufügen"
@@ -2074,7 +2356,7 @@ msgstr "Typ "
 #: View/Attributes/add.ctp:36
 #: View/Attributes/add_attachment.ctp:24
 #: View/Attributes/edit.ctp:24
-#: View/Events/add.ctp:24
+#: View/Events/add.ctp:20
 msgid "Distribution "
 msgstr "Distribution "
 
@@ -2082,7 +2364,7 @@ msgstr "Distribution "
 #: View/Attributes/add_attachment.ctp:33
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
-#: View/Events/add.ctp:34
+#: View/Events/add.ctp:30
 #: View/Events/edit.ctp:26
 #: View/Feeds/add.ctp:176
 #: View/Feeds/edit.ctp:172
@@ -2109,23 +2391,24 @@ msgstr "Kontextuelles Kommentar"
 msgid "for Intrusion Detection System"
 msgstr "für Intrusion Detection System (IDS)"
 
-#: View/Attributes/add.ctp:87
+#: View/Attributes/add.ctp:91
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_mitre_attack_matrix.ctp:14;113
+#: View/Elements/view_galaxy_matrix.ctp:76;199
 #: View/Events/contact.ctp:29
 #: View/Events/edit.ctp:59
 #: View/Events/free_text_import.ctp:27
 #: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:78
+#: View/ObjectReferences/ajax/add.ctp:130
 #: View/Objects/add.ctp:147
 #: View/Objects/revise_object.ctp:85
 #: View/Organisations/admin_add.ctp:49
 #: View/Organisations/admin_edit.ctp:60
-#: View/Servers/add.ctp:126
-#: View/Servers/edit.ctp:167
-#: View/SharingGroups/add.ctp:75
+#: View/Servers/add.ctp:115
+#: View/Servers/edit.ctp:162
+#: View/SharingGroups/add.ctp:115
+#: View/TagCollections/add.ctp:21
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
 #: View/TemplateElements/ajax/template_element_add_file.ctp:67
 #: View/TemplateElements/ajax/template_element_add_text.ctp:29
@@ -2134,7 +2417,7 @@ msgstr "für Intrusion Detection System (IDS)"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/Users/admin_add.ctp:97
 #: View/Users/admin_edit.ctp:91
-#: View/Users/admin_email.ctp:51
+#: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
 #: View/Users/change_pw.ctp:23
 #: View/Users/edit.ctp:41
@@ -2142,14 +2425,17 @@ msgstr "für Intrusion Detection System (IDS)"
 msgid "Submit"
 msgstr "Einreichen"
 
-#: View/Attributes/add.ctp:88
+#: View/Attributes/add.ctp:92
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:62
+#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/exportSearch.ctp:32
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Elements/eventattributecreation.ctp:89
-#: View/Elements/view_mitre_attack_matrix.ctp:114
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/view_galaxy_matrix.ctp:200
 #: View/Elements/serverRuleElements/pull.ctp:70
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2158,21 +2444,18 @@ msgstr "Einreichen"
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/ajax/enrich_event.ctp:21
+#: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:15
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/exportChoice.ctp:51
 #: View/Events/ajax/importChoice.ctp:12
 #: View/Events/ajax/quick_edit.ctp:6
-#: View/Galaxies/ajax/cluster_choice.ctp:32
-#: View/Galaxies/ajax/galaxy_choice.ctp:22
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:15
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
-#: View/ObjectReferences/ajax/add.ctp:82
+#: View/ObjectReferences/ajax/add.ctp:134
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/ObjectTemplates/ajax/object_choice.ctp:10
 #: View/Objects/add.ctp:153
 #: View/Objects/revise_object.ctp:87
 #: View/Objects/ajax/delete.ctp:24
@@ -2187,11 +2470,12 @@ msgstr "Einreichen"
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
 #: View/Sightings/ajax/advanced.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
-#: View/Tags/ajax/select_tag.ctp:32
-#: View/Tags/ajax/taxonomy_choice.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:6
 #: View/TemplateElements/ajax/template_element_add_file.ctp:73
@@ -2201,6 +2485,7 @@ msgstr "Einreichen"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:35
 #: View/Templates/ajax/template_choices.ctp:15
 #: View/Users/admin_filter_user_index.ctp:107
+#: View/Users/ajax/emailConfirmTemplate.ctp:14
 #: View/Users/ajax/fetchpgpkey.ctp:24
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
@@ -2239,8 +2524,6 @@ msgstr "Event-ID"
 #: View/Elements/Users/userIndexTable.ctp:4
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_view.ctp:14
-#: View/Users/view.ctp:14
 msgid "Org"
 msgstr "Org"
 
@@ -2255,7 +2538,7 @@ msgid "Event date"
 msgstr "Event-Datum"
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Event graph"
 msgstr "Event-Diagramm"
 
@@ -2283,12 +2566,12 @@ msgstr "Alle Attribute als \"für IDS\" markieren"
 
 #: View/Attributes/attribute_replace.ctp:26
 #: View/Noticelists/view.ctp:36
-#: View/Warninglists/view.ctp:54
+#: View/Warninglists/view.ctp:35
 msgid "Values"
 msgstr "Werte"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:75
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:46
@@ -2322,7 +2605,7 @@ msgstr "Kein Fehler bei der Zusammensetzung"
 msgid "disabled"
 msgstr "deaktiviert"
 
-#: View/Attributes/edit.ctp:64
+#: View/Attributes/edit.ctp:68
 #: View/ShadowAttributes/add.ctp:55
 #: View/ShadowAttributes/edit.ctp:45;54
 msgid "Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this."
@@ -2330,7 +2613,7 @@ msgstr "Warnung: Sie sind dabei, Daten freizugeben, die als vertraulich eingestu
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -2338,10 +2621,6 @@ msgstr "Warnung: Sie sind dabei, Daten freizugeben, die als vertraulich eingestu
 msgid "Attributes"
 msgstr "Attribute"
 
-#: View/Attributes/index.ctp:7
-msgid "Results for all attributes"
-msgstr "Resultate aller Attribute"
-
 #: View/Attributes/index.ctp:8
 msgid " with the value containing "
 msgstr " mit dem Wert "
@@ -2354,57 +2633,67 @@ msgstr " getaggt mit "
 msgid " from the events "
 msgstr " der Events "
 
-#: View/Attributes/index.ctp:12
-msgid " of category "
-msgstr " der Kategorie "
+#: View/Attributes/index.ctp:11
+msgid " carrying the tag(s) "
+msgstr ""
 
-#: View/Attributes/index.ctp:13
+#: View/Attributes/index.ctp:12
 msgid " of type "
 msgstr " des Typs "
 
-#: View/Attributes/index.ctp:14
-msgid " created by the organisation "
-msgstr " erstellt von Organisation "
+#: View/Attributes/index.ctp:13
+msgid " of category "
+msgstr " der Kategorie "
 
-#: View/Attributes/index.ctp:28;173
-#: View/Elements/eventattribute.ctp:60;258
+#: View/Attributes/index.ctp:14
+msgid " created by organisation "
+msgstr ""
+
+#: View/Attributes/index.ctp:26
+msgid "Results for all attributes"
+msgstr "Resultate aller Attribute"
+
+#: View/Attributes/index.ctp:39;132
+#: View/Elements/eventattribute.ctp:60;229
 #: View/Elements/eventdiscussion.ctp:15;126
+#: View/Elements/generic_table.ctp:16
+#: View/Elements/generic_table_row.ctp:16
 #: View/Elements/Feeds/eventattribute.ctp:20;86
 #: View/Elements/Servers/eventattribute.ctp:20;86
 #: View/EventBlacklists/index.ctp:13;54
-#: View/Events/index.ctp:12;89
+#: View/Events/index.ctp:12;115
 #: View/Events/proposal_event_index.ctp:12;95
 #: View/Events/ajax/index.ctp:13;39
 #: View/Feeds/freetext_index.ctp:22;86
-#: View/Feeds/index.ctp:20;230
-#: View/Feeds/preview_index.ctp:14;82
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
 #: View/Galaxies/index.ctp:13;53
-#: View/GalaxyClusters/ajax/index.ctp:11;96
+#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:33;162
-#: View/Logs/admin_index.ctp:37;111
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
 #: View/Logs/event_index.ctp:17;61
 #: View/News/index.ctp:39
 #: View/Noticelists/index.ctp:13;83
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
-#: View/ObjectTemplates/index.ctp:13;126
+#: View/ObjectTemplates/index.ctp:13;137
 #: View/OrgBlacklists/index.ctp:13;52
-#: View/Organisations/index.ctp:42;138
+#: View/Organisations/index.ctp:42;159
 #: View/Regexp/admin_index.ctp:13;51
 #: View/Regexp/index.ctp:13;45
 #: View/Roles/admin_index.ctp:13;82
 #: View/Roles/index.ctp:13;55
-#: View/Servers/index.ctp:13;117
-#: View/Servers/preview_index.ctp:15;164
-#: View/ShadowAttributes/index.ctp:12;108
-#: View/SharingGroups/index.ctp:13;86
+#: View/Servers/index.ctp:13;156
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;63
-#: View/Taxonomies/view.ctp:53;169
+#: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:12;56
+#: View/Users/admin_index.ctp:12;86
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -2412,45 +2701,47 @@ msgstr " erstellt von Organisation "
 msgid "previous"
 msgstr "zurück"
 
-#: View/Attributes/index.ctp:30;175
-#: View/Elements/eventattribute.ctp:62;260
+#: View/Attributes/index.ctp:41;134
+#: View/Elements/eventattribute.ctp:62;231
 #: View/Elements/eventdiscussion.ctp:17;128
+#: View/Elements/generic_table.ctp:18
+#: View/Elements/generic_table_row.ctp:18
 #: View/Elements/Feeds/eventattribute.ctp:22;88
 #: View/Elements/Servers/eventattribute.ctp:22;88
 #: View/EventBlacklists/index.ctp:15;56
-#: View/Events/index.ctp:14;91
+#: View/Events/index.ctp:14;117
 #: View/Events/proposal_event_index.ctp:14;97
 #: View/Events/ajax/index.ctp:15;41
 #: View/Feeds/freetext_index.ctp:24;88
-#: View/Feeds/index.ctp:22;232
-#: View/Feeds/preview_index.ctp:16;84
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
 #: View/Galaxies/index.ctp:15;55
-#: View/GalaxyClusters/ajax/index.ctp:13;98
+#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:35;164
-#: View/Logs/admin_index.ctp:39;113
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
 #: View/Logs/event_index.ctp:19;63
 #: View/News/index.ctp:41
 #: View/Noticelists/index.ctp:15;85
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
-#: View/ObjectTemplates/index.ctp:15;128
+#: View/ObjectTemplates/index.ctp:15;139
 #: View/OrgBlacklists/index.ctp:15;54
-#: View/Organisations/index.ctp:44;140
+#: View/Organisations/index.ctp:44;161
 #: View/Regexp/admin_index.ctp:15;53
 #: View/Regexp/index.ctp:15;47
 #: View/Roles/admin_index.ctp:15;84
 #: View/Roles/index.ctp:15;57
-#: View/Servers/index.ctp:15;119
-#: View/Servers/preview_index.ctp:17;166
-#: View/ShadowAttributes/index.ctp:14;110
-#: View/SharingGroups/index.ctp:15;88
+#: View/Servers/index.ctp:15;158
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;65
-#: View/Taxonomies/view.ctp:55;171
+#: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:14;58
+#: View/Users/admin_index.ctp:14;88
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -2458,66 +2749,144 @@ msgstr "zurück"
 msgid "next"
 msgstr "weiter"
 
-#: View/Attributes/index.ctp:148
-msgid "Are you sure you want to delete this attribute?"
-msgstr "Möchten Sie dieses Attribut wirklich löschen?"
+#: View/Attributes/index.ctp:53
+#: View/Elements/eventattribute.ctp:152
+#: View/Elements/Events/eventIndexTable.ctp:37
+#: View/Elements/Feeds/eventattribute.ctp:45
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/view.ctp:117
+#: View/Feeds/preview_event.ctp:16
+#: View/Noticelists/view.ctp:43
+#: View/Pages/doc/using_the_system.ctp:164;207;318
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
+#: View/Tags/index.ctp:10
+#: View/Templates/add.ctp:12
+#: View/Templates/edit.ctp:12
+#: View/Templates/view.ctp:19
+msgid "Tags"
+msgstr "Tags"
 
-#: View/Attributes/index.ctp:151
-msgid "Propose an edit"
-msgstr "Eine Änderung vorschlagen"
+#: View/Attributes/index.ctp:54
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/Galaxies/index.ctp:2
+msgid "Galaxies"
+msgstr "Galaxien"
 
-#: View/Attributes/index.ctp:155
-#: View/Elements/Events/eventIndexTable.ctp:82;86;229
-#: View/Elements/Users/userIndexTable.ctp:94
-#: View/Elements/dashboard/dashboard_events.ctp:4;5
-#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
-#: View/Events/proposal_event_index.ctp:45;49
-#: View/Feeds/preview_index.ctp:66
-#: View/Noticelists/index.ctp:66
-#: View/ObjectTemplates/index.ctp:104
-#: View/Organisations/index.ctp:122
-#: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/preview_index.ctp:148
-#: View/Taxonomies/index.ctp:47
-#: View/Warninglists/index.ctp:60
-msgid "View"
-msgstr "Ansicht"
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:161
+msgid "Correlate"
+msgstr "Korrelation"
 
-#: View/Attributes/index.ctp:166
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Events/view.ctp:314
+#: View/Feeds/preview_event.ctp:73
+#: View/Pages/doc/using_the_system.ctp:235
+#: View/Servers/preview_event.ctp:95
+msgid "Related Events"
+msgstr "Verwandte Events"
+
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:163
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+msgid "Feed hits"
+msgstr "Treffer in Feeds"
+
+#: View/Attributes/index.ctp:61
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
+msgid "Sightings"
+msgstr "Sichtungen"
+
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
+#: View/Tags/index.ctp:73
+msgid "Activity"
+msgstr "Aktivität"
+
+#: View/Attributes/index.ctp:63
+#: View/Elements/eventattribute.ctp:168
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/healthElements/files.ctp:33
+#: View/Elements/healthElements/workers.ctp:60
+#: View/Elements/templateElements/templateRowAttribute.ctp:94
+#: View/Elements/templateElements/templateRowFile.ctp:71
+#: View/Elements/templateElements/templateRowText.ctp:28
+#: View/EventBlacklists/index.ctp:27
+#: View/Events/export.ctp:31
+#: View/Events/resolved_attributes.ctp:53
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:51
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:66
+#: View/OrgBlacklists/index.ctp:26
+#: View/Organisations/index.ctp:102
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:25
+#: View/Roles/admin_index.ctp:35
+#: View/Servers/index.ctp:37
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:27
+#: View/Templates/index.ctp:27
+#: View/Threads/index.ctp:28
+#: View/Warninglists/index.ctp:38
+#: View/Whitelists/admin_index.ctp:24
+msgid "Actions"
+msgstr "Aktionen"
+
+#: View/Attributes/index.ctp:125
 #: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
 #: View/EventBlacklists/index.ctp:47
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:223
-#: View/Feeds/preview_index.ctp:74
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
 #: View/Galaxies/index.ctp:46
-#: View/GalaxyClusters/ajax/index.ctp:90
+#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:155
-#: View/Logs/admin_index.ctp:104
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
 #: View/Logs/event_index.ctp:54
 #: View/News/index.ctp:33
 #: View/Noticelists/index.ctp:76
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:66
-#: View/ObjectTemplates/index.ctp:119
+#: View/ObjectTemplates/index.ctp:130
 #: View/OrgBlacklists/index.ctp:45
-#: View/Organisations/index.ctp:131
+#: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
 #: View/Roles/admin_index.ctp:75
 #: View/Roles/index.ctp:48
-#: View/Servers/index.ctp:110
-#: View/Servers/preview_index.ctp:156
-#: View/ShadowAttributes/index.ctp:101
-#: View/SharingGroups/index.ctp:79
+#: View/Servers/index.ctp:149
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:56
-#: View/Taxonomies/view.ctp:162
+#: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:49
+#: View/Users/admin_index.ctp:79
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -2564,26 +2933,22 @@ msgid "Containing the following expressions"
 msgstr "Den folgenden Ausdruck enthaltend"
 
 #: View/Attributes/search.ctp:11
-msgid "Being an attribute matching the following tags"
-msgstr "Ein Attribut mit folgenden Tags"
+msgid "Having tag or being an attribute of an event having the tag"
+msgstr ""
 
 #: View/Attributes/search.ctp:12
 msgid "Being attributes of the following event IDs, event UUIDs or attribute UUIDs"
 msgstr "Ein Attribut mit den folgenden Event-IDs, Event-UUIDs oder Attribut-UUIDs"
 
-#: View/Attributes/search.ctp:13
-msgid "Being an attribute of an event matching the following tags"
-msgstr "Ein Attribut eines Events mit den folgenden Tags"
-
-#: View/Attributes/search.ctp:20
+#: View/Attributes/search.ctp:15
 msgid "From the following organisation(s)"
 msgstr "Von der/den Organisation/en"
 
-#: View/Attributes/search.ctp:36
-msgid "Only find IOCs to use in IDS"
-msgstr "Nur finden IOCs suchen, die mit \"für IDS\" markiert sind"
+#: View/Attributes/search.ctp:29
+msgid "Only find IOCs flagged as to_ids"
+msgstr ""
 
-#: View/Attributes/search.ctp:40
+#: View/Attributes/search.ctp:33
 msgid "Alternate Search Result (Events)"
 msgstr "Alternative Suchergebnisse (Events)"
 
@@ -2601,26 +2966,26 @@ msgstr "Sind Sie sicher, dass Sie Attribut #%s weich-löschen möchten? Das Attr
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90
-#: View/Elements/galaxyQuickView.ctp:23
-#: View/Elements/side_menu.ctp:351
-#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/eventIndexTable.ctp:229
 #: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:30
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Roles/admin_index.ctp:67
-#: View/Servers/index.ctp:99
+#: View/Servers/index.ctp:138
 #: View/Tags/index.ctp:125
 msgid "Delete"
 msgstr "Löschen"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
@@ -2634,34 +2999,36 @@ msgstr "Löschen"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:56
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:168
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
 #: View/Events/ajax/handleSelected.ctp:17
 #: View/Events/ajax/toggle_correlation.ctp:20
 #: View/Feeds/preview_event.ctp:56
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:79
 #: View/Servers/ajax/update.ctp:11
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
 #: View/Templates/view.ctp:41
-#: View/Users/admin_view.ctp:32;37;104;114;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:27
 msgid "Yes"
 msgstr "Ja"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:21
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
@@ -2675,29 +3042,30 @@ msgstr "Ja"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:58;176
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:166
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/handleSelected.ctp:22
 #: View/Events/ajax/toggle_correlation.ctp:25
 #: View/Feeds/preview_event.ctp:61;66
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:89
 #: View/Servers/ajax/update.ctp:16
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
 #: View/Templates/view.ctp:42
-#: View/Users/admin_view.ctp:32;37;106;116;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
 msgid "No"
@@ -2706,7 +3074,6 @@ msgstr "Nein"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:5
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:5
 #: View/Attributes/ajax/attributeEditValueForm.ctp:6
 msgid "Accept change"
@@ -2715,7 +3082,6 @@ msgstr "Änderung akzeptieren"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:6
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
 msgid "Discard change"
@@ -2732,7 +3098,7 @@ msgstr "Aktuelle Einstellungen nicht ändern"
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/view.ctp:143
+#: View/Events/view.ctp:145
 #: View/Feeds/add.ctp:167
 #: View/Feeds/edit.ctp:164
 #: View/Feeds/freetext_index.ctp:36
@@ -2754,6 +3120,50 @@ msgstr "Für Intrusion Detection System (IDS)"
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr "Lassen Sie dieses Feld leer, um das Kommentarfeld der ausgewählten Attribute unverändert lassen."
 
+#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+msgid "Tags to <b>remove</b>"
+msgstr "Tags zu <b>entfernen</b>"
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+msgid "Tags to <b>add</b>"
+msgstr "Tags <b>hinzuzufügen</b>"
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+msgid "Clusters to <b>remove</b>"
+msgstr "Tags zu <b>entfernen</b>"
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+msgid "Clusters to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr "aktiviert"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr "deaktiviert"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
 #: View/Attributes/ajax/attributeRestorationForm.ctp:5
 msgid "Attribute Restoration"
 msgstr "Attribut-Wiederherstellung"
@@ -2762,6 +3172,15 @@ msgstr "Attribut-Wiederherstellung"
 msgid "Are you sure you want to undelete Attribute #%s?"
 msgstr "Möchten Sie Attribut #%s wirklich wiederherstellen?"
 
+#: View/Attributes/ajax/exportSearch.ctp:2
+msgid "Choose the format that you wish to download the search results in"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:10;23
+#: View/Events/ajax/exportChoice.ctp:17;18;27;28
+msgid "Export as %s"
+msgstr "Exportieren als %s"
+
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
 msgid "Remove Tag"
 msgstr "Tag entfernen"
@@ -2782,16 +3201,6 @@ msgstr "Entfernen"
 msgid "Toggle Correlation %s "
 msgstr "Korrelation für %s ein/ausschalten "
 
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "on"
-msgstr "aktiviert"
-
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "off"
-msgstr "deaktiviert"
-
 #: View/Attributes/ajax/toggle_correlation.ctp:11
 msgid "Re-enable the correlation for this attribute."
 msgstr "Korrelation für dieses Attribut wieder einschalten."
@@ -2804,13 +3213,21 @@ msgstr ""
 msgid "Toggle correlation for attribute"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:25
+#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Elements/ajaxTagCollectionTags.ctp:16
 #: View/Elements/ajaxTags.ctp:14
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr "Tag entfernen"
 
+#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Pages/doc/using_the_system.ctp:303
+#: View/Templates/add.ctp:17
+#: View/Templates/edit.ctp:17
+msgid "Add tag"
+msgstr ""
+
 #: View/Elements/ajaxTags.ctp:17
 msgid "Remove tag %s"
 msgstr "Tag entfernen %s"
@@ -2821,215 +3238,33 @@ msgstr "Tag entfernen %s"
 msgid "Add a tag"
 msgstr "Tag hinzufügen"
 
-#: View/Elements/eventattribute.ctp:71;269
+#: View/Elements/eventattribute.ctp:71;240
 #: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
 #: View/Elements/Servers/eventattribute.ctp:28;31;94;97
 msgid "view all"
 msgstr "Alle anzeigen"
 
-#: View/Elements/eventattribute.ctp:117
-#: View/Pages/doc/using_the_system.ctp:86
-msgid "Add attribute"
-msgstr "Attribut hinzufügen"
-
-#: View/Elements/eventattribute.ctp:118
-msgid "Edit selected Attributes"
-msgstr "Ausgewählte Attribute bearbeiten"
-
-#: View/Elements/eventattribute.ctp:119
-msgid "Tag selected Attributes"
-msgstr "Ausgewählte Attribute taggen"
-
-#: View/Elements/eventattribute.ctp:120
-msgid "Delete selected Attributes"
-msgstr "Ausgewählte Attribute löschen"
-
-#: View/Elements/eventattribute.ctp:121
-msgid "Accept selected Proposals"
-msgstr "Ausgewählte Vorschläge akzeptieren"
-
-#: View/Elements/eventattribute.ctp:122
-msgid "Discard selected Proposals"
-msgstr "Ausgewählte Vorschläge verwerfen"
-
-#: View/Elements/eventattribute.ctp:123
-msgid "Sightings display for selected attributes"
-msgstr "Sichtungen für ausgewählte Attribute anzeigen"
-
-#: View/Elements/eventattribute.ctp:127
-msgid "Populate using a template"
-msgstr "Anhand einer Vorlage befüllen"
-
-#: View/Elements/eventattribute.ctp:129
-msgid "Populate using the freetext import tool"
-msgstr "Mit dem Freitext-Import-Tool befüllen"
-
-#: View/Elements/eventattribute.ctp:131
-msgid "Replace all attributes of a category/type combination within the event"
-msgstr "Ersetzen aller Attribute einer Kategorie/Typ-Kombination in diesem Event"
-
-#: View/Elements/eventattribute.ctp:140;159
-msgid "Show all attributes"
-msgstr "Alle Attribute anzeigen"
-
-#: View/Elements/eventattribute.ctp:144
-msgid "Only show %s related attributes"
-msgstr "Nur %s bezogene Attribute anzeigen"
-
-#: View/Elements/eventattribute.ctp:148
-msgid "Only show proposals"
-msgstr "Nur Vorschläge anzeigen"
-
-#: View/Elements/eventattribute.ctp:148
-#: View/Logs/event_index.ctp:44
-msgid "Proposal"
-msgstr "Vorschlag"
-
-#: View/Elements/eventattribute.ctp:149
-msgid "Only show correlating attributes"
-msgstr "Nur korrelierte Attribute anzeigen"
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Only show potentially false positive attributes"
-msgstr "Nur potentielle falsch-positiv Attribute anzeigen"
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Warnings"
-msgstr "Warnungen"
-
-#: View/Elements/eventattribute.ctp:152
-msgid "Include deleted attributes"
-msgstr "Gelöschten Attribute einbeziehen"
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show attribute context fields"
-msgstr "Kontextfelder von Attributen anzeigen"
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show context fields"
-msgstr "Kontextfelder anzeigen"
-
-#: View/Elements/eventattribute.ctp:157
-msgid "Filter on attributes value"
-msgstr "Filtern nach Attributwerten"
-
-#: View/Elements/eventattribute.ctp:159
-#: View/Events/index.ctp:41
-#: View/Servers/preview_index.ctp:42
-#: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:37
-msgid "Remove filters"
-msgstr "Filter entfernen"
-
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 msgid "Select all attributes/proposals on current page"
 msgstr "Alle Attribute/Vorschläge auf aktueller Seite auswählen"
 
-#: View/Elements/eventattribute.ctp:188
-#: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/view.ctp:121
-#: View/Feeds/preview_event.ctp:16
-#: View/Noticelists/view.ctp:43
-#: View/Pages/doc/using_the_system.ctp:164;207;318
-#: View/Servers/preview_event.ctp:27
-#: View/Servers/preview_index.ctp:68
-#: View/Tags/index.ctp:10
-#: View/Templates/add.ctp:12
-#: View/Templates/edit.ctp:12
-#: View/Templates/view.ctp:19
-msgid "Tags"
-msgstr "Tags"
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
+msgstr ""
 
-#: View/Elements/eventattribute.ctp:189
-#: View/Elements/global_menu.ctp:56
-#: View/Events/view.ctp:387
-#: View/Galaxies/index.ctp:2
-msgid "Galaxies"
-msgstr "Galaxien"
-
-#: View/Elements/eventattribute.ctp:191
-msgid "Correlate"
-msgstr "Korrelation"
-
-#: View/Elements/eventattribute.ctp:192
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:263
-#: View/Feeds/preview_event.ctp:73
-#: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:95
-msgid "Related Events"
-msgstr "Verwandte Events"
-
-#: View/Elements/eventattribute.ctp:193
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
-msgid "Feed hits"
-msgstr "Treffer in Feeds"
-
-#: View/Elements/eventattribute.ctp:196
-#: View/Events/view.ctp:198
-msgid "Sightings"
-msgstr "Sichtungen"
-
-#: View/Elements/eventattribute.ctp:197
-#: View/Events/view.ctp:205
-#: View/Tags/index.ctp:73
-msgid "Activity"
-msgstr "Aktivität"
-
-#: View/Elements/eventattribute.ctp:198
-#: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/healthElements/files.ctp:33
-#: View/Elements/healthElements/workers.ctp:55
-#: View/Elements/templateElements/templateRowAttribute.ctp:94
-#: View/Elements/templateElements/templateRowFile.ctp:71
-#: View/Elements/templateElements/templateRowText.ctp:28
-#: View/EventBlacklists/index.ctp:27
-#: View/Events/export.ctp:31
-#: View/Events/resolved_attributes.ctp:53
-#: View/Feeds/index.ctp:61
-#: View/Feeds/preview_index.ctp:38
-#: View/GalaxyClusters/ajax/index.ctp:51
-#: View/Noticelists/index.ctp:37
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:55
-#: View/OrgBlacklists/index.ctp:26
-#: View/Organisations/index.ctp:81
-#: View/Pages/doc/using_the_system.ctp:187;238;286;382
-#: View/Regexp/admin_index.ctp:25
-#: View/Roles/admin_index.ctp:35
-#: View/Servers/index.ctp:36
-#: View/Servers/preview_index.ctp:80
-#: View/SharingGroups/add.ctp:34;54
-#: View/SharingGroups/edit.ctp:34;62
-#: View/SharingGroups/index.ctp:30
-#: View/Sightings/ajax/list_sightings.ctp:11
-#: View/Tags/index.ctp:76
-#: View/Taxonomies/index.ctp:27
-#: View/Templates/index.ctp:27
-#: View/Threads/index.ctp:28
-#: View/Warninglists/index.ctp:38
-#: View/Whitelists/admin_index.ctp:24
-msgid "Actions"
-msgstr "Aktionen"
-
-#: View/Elements/eventattribute.ctp:238
+#: View/Elements/eventattribute.ctp:209
 msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
 "a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
 "attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
 msgstr "Attributswarnung: Dieses Event hat keine für Sie sichtbaren Attribute. Entweder der Besitzer des Events hat ein spezielles Verteilungsschema pro Attribut beschlossen und wollte trotzdem das Event weitergeben. Entweder für die Benachrichtigung oder für die mögliche Verteilung mit Attributen ohne eine solche Beschränkung. Oder der Besitzer hat vergessen Attribute hinzuzufügen oder ein geeignetes Verteilungsschema. Falls Sie glauben, dies sei ein Fehler oder sie könnten anhand der Meta-Informationen Attribute hinzufügen, zögern Sie nicht Vorschläge einzureichen"
 
-#: View/Elements/eventattribute.ctp:242
+#: View/Elements/eventattribute.ctp:213
 msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
 msgstr "Attributswarnung: Dieses Event beinhaltet keine Attribute. Es wird dringend empfohlen ein Event mit Attributen zu befüllen (Indikatoren, Beobachtungen oder Informationen) um ein aussagekräftiges Event bereitzustellen"
 
@@ -3037,6 +3272,140 @@ msgstr "Attributswarnung: Dieses Event beinhaltet keine Attribute. Es wird dring
 msgid "Create multiple attributes one per line"
 msgstr "Mehrere Attribute erstellen, eines pro Zeile"
 
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr "Alle Attribute anzeigen"
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr "Alles"
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr "Nur %s bezogene Attribute anzeigen"
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr "Nur Vorschläge anzeigen"
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr "Vorschlag"
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr "Nur korrelierte Attribute anzeigen"
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr "Korrelation"
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr "Nur potentielle falsch-positiv Attribute anzeigen"
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr "Attribut hinzufügen"
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr "Ausgewählte Attribute bearbeiten"
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr "Ausgewählte Attribute taggen"
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr "Ausgewählte Attribute löschen"
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr "Ausgewählte Vorschläge akzeptieren"
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr "Ausgewählte Vorschläge verwerfen"
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr "Sichtungen für ausgewählte Attribute anzeigen"
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr "Anhand einer Vorlage befüllen"
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr "Mit dem Freitext-Import-Tool befüllen"
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr "Ersetzen aller Attribute einer Kategorie/Typ-Kombination in diesem Event"
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr "Gelöschten Attribute einbeziehen"
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr "Gelöscht"
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr "Kontextfelder von Attributen anzeigen"
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr "Kontext"
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr "Filter entfernen"
+
 #: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr "Datum: "
@@ -3046,14 +3415,14 @@ msgid "Deactivated user"
 msgstr "Deaktivierter Benutzer"
 
 #: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:223
-#: View/Elements/Events/View/row_attribute.ctp:299
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/View/row_attribute.ctp:380
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/Feeds/edit.ctp:193
 #: View/OrgBlacklists/edit.ctp:22
 #: View/Pages/doc/using_the_system.ctp:191
-#: View/Servers/index.ctp:98
-#: View/Tags/edit.ctp:35
+#: View/Servers/index.ctp:137
+#: View/Tags/edit.ctp:36
 #: View/Templates/edit.ctp:49
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -3081,12 +3450,12 @@ msgid "Insert a link to an event - just enter the event ID between the [event][/
 msgstr "Einen Link zu einem Event einfügen. Dazu die Event-ID zwischen [event][/event] Tags einfügen."
 
 #: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:180;191
+#: View/Events/view.ctp:196;207
 #: View/Objects/orphaned_object_diagnostics.ctp:21
 #: View/Pages/doc/administration.ctp:167
 #: View/Pages/doc/using_the_system.ctp:200;279
 #: View/Posts/add.ctp:33
-#: View/ShadowAttributes/index.ctp:31
+#: View/ShadowAttributes/index.ctp:41
 msgid "Event"
 msgstr "Event"
 
@@ -3121,9 +3490,19 @@ msgid "Code"
 msgstr "Programmcode"
 
 #: View/Elements/eventdiscussion.ctp:156
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr "Abschicken"
 
+#: View/Elements/flashErrorMessage.ctp:2
+msgid "Errors"
+msgstr "Fehler"
+
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Jobs/ajax/error.ctp:34
+msgid "Close"
+msgstr "Schliessen"
+
 #: View/Elements/footer.ctp:5
 msgid "Keyboard shortcuts for this page"
 msgstr "Tastenkombinationen für diese Seite"
@@ -3135,8 +3514,8 @@ msgstr "keine"
 #: View/Elements/footer.ctp:15
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:60
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
 msgid "GnuPG key"
 msgstr "GnuPG-Schlüssel"
 
@@ -3152,32 +3531,36 @@ msgstr "S/MIME-Zertifikat konnte nicht gefunden werden."
 msgid "View details about this galaxy"
 msgstr "Details über diese Galaxis anzeigen"
 
-#: View/Elements/galaxyQuickView.ctp:17
+#: View/Elements/galaxyQuickView.ctp:19
 #: View/Elements/galaxyQuickViewMini.ctp:69
 msgid "View details about this cluster"
 msgstr "Details über diese Cluster anzeigen"
 
-#: View/Elements/galaxyQuickView.ctp:18
+#: View/Elements/galaxyQuickView.ctp:20
 #: View/Elements/galaxyQuickViewMini.ctp:70
 msgid "View all events containing this cluster."
 msgstr "Alle Events dieses Clusters anzeigen."
 
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
 #: View/Elements/galaxyQuickView.ctp:24
 msgid "Are you sure you want to detach %s from this event?"
 msgstr "Möchten Sie %s wirklich aus diesem Event trennen?"
 
-#: View/Elements/galaxyQuickViewMini.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:74
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr "Möchten Sie %s wirklich von %s separieren?"
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 msgid "Add new cluster"
 msgstr "Neuen Cluster hinzufügen"
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 #: View/EventBlacklists/add.ctp:35
 #: View/EventBlacklists/edit.ctp:29
-#: View/Events/add.ctp:72
+#: View/Events/add.ctp:68
 #: View/Events/filter_event_index.ctp:125
 #: View/Feeds/add.ctp:198
 #: View/Feeds/import_feeds.ctp:19
@@ -3187,113 +3570,139 @@ msgstr "Neuen Cluster hinzufügen"
 #: View/Roles/admin_add.ctp:44
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 #: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:19
 #: View/Tags/add.ctp:35
 #: View/Users/admin_filter_user_index.ctp:62
 #: View/Whitelists/admin_add.ctp:13
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/side_menu.ctp:174;188
+#: View/Elements/generic_picker.ctp:205
+msgid "Due to the large number of options, no contextual information is provided."
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:273
+msgid "Nothing to pick"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:11
+#: View/Pages/doc/general.ctp:20
+msgid "Event Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr "Events auflisten"
 
-#: View/Elements/global_menu.ctp:26
-#: View/Elements/side_menu.ctp:179;194
-#: View/Events/add.ctp:8
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
+#: View/Events/add.ctp:4
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
 msgstr "Event hinzufügen"
 
-#: View/Elements/global_menu.ctp:28
-#: View/Elements/side_menu.ctp:213
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr "Attribute auflisten"
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/side_menu.ctp:218
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr "Attribute suchen"
 
-#: View/Elements/global_menu.ctp:30
-#: View/Elements/side_menu.ctp:206
-#: View/Servers/rest.ctp:4
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
+#: View/Servers/rest.ctp:20
 msgid "REST client"
 msgstr "REST-Client"
 
-#: View/Elements/global_menu.ctp:32
-#: View/Elements/side_menu.ctp:238
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "Vorschläge anzeigen"
 
-#: View/Elements/global_menu.ctp:35
-#: View/Elements/side_menu.ctp:446
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
+#: View/Pages/doc/general.ctp:39
+msgid "Events with proposals"
+msgstr "Events mit Vorschlägen"
+
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "Tags auflisten"
 
-#: View/Elements/global_menu.ctp:37
-#: View/Elements/side_menu.ctp:450
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
+msgid "List Tag Collections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 #: View/Tags/edit.ctp:4
 msgid "Add Tag"
 msgstr "Tag hinzufügen"
 
-#: View/Elements/global_menu.ctp:39
-#: View/Elements/side_menu.ctp:471
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 msgid "List Taxonomies"
 msgstr "Taxonomien auflisten"
 
-#: View/Elements/global_menu.ctp:41
-#: View/Elements/side_menu.ctp:485
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "Vorlagen auflisten"
 
-#: View/Elements/global_menu.ctp:43
-#: View/Elements/side_menu.ctp:487
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "Vorlage hinzufügen"
 
-#: View/Elements/global_menu.ctp:46
-#: View/Elements/side_menu.ctp:247
+#: View/Elements/global_menu.ctp:78
 #: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
 msgstr "Exportieren"
 
-#: View/Elements/global_menu.ctp:48
-#: View/Elements/side_menu.ctp:253
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
+#: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
 #: View/Pages/doc/using_the_system.ctp:15;361
 msgid "Automation"
 msgstr "Automatisierung"
 
-#: View/Elements/global_menu.ctp:60
-#: View/Elements/side_menu.ctp:529
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 msgid "List Galaxies"
 msgstr "Galaxien auflisten"
 
-#: View/Elements/global_menu.ctp:67
+#: View/Elements/global_menu.ctp:101
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr "Eingangsfilter"
 
-#: View/Elements/global_menu.ctp:72;76
+#: View/Elements/global_menu.ctp:104;109
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -3302,7 +3711,7 @@ msgstr "Eingangsfilter"
 msgid "Import Regexp"
 msgstr "Import via regulärem Ausdruck"
 
-#: View/Elements/global_menu.ctp:73;77
+#: View/Elements/global_menu.ctp:114;119
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -3311,82 +3720,88 @@ msgstr "Import via regulärem Ausdruck"
 msgid "Signature Whitelist"
 msgstr "Signatur-Whitelist"
 
-#: View/Elements/global_menu.ctp:79
-#: View/Elements/side_menu.ctp:274
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 msgid "List Warninglists"
 msgstr "Warninglist anzeigen"
 
-#: View/Elements/global_menu.ctp:80
-#: View/Elements/side_menu.ctp:283
+#: View/Elements/global_menu.ctp:128
 msgid "List Noticelists"
 msgstr "Noticelists anzeigen"
 
-#: View/Elements/global_menu.ctp:90
+#: View/Elements/global_menu.ctp:135
+#: View/Pages/doc/general.ctp:22;54
+msgid "Global Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:139
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
 msgstr "Neuigkeiten"
 
-#: View/Elements/global_menu.ctp:91
-#: View/Elements/side_menu.ctp:311
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "Mein Profil"
 
-#: View/Elements/global_menu.ctp:92;203
-#: View/Elements/side_menu.ctp:312
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: View/Elements/global_menu.ctp:96
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
-#: View/Users/statistics_data.ctp:32
+#: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr "Organisationen"
 
-#: View/Elements/global_menu.ctp:100
-#: View/Elements/side_menu.ctp:325
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "Rollen und Berechtigungen"
 
-#: View/Elements/global_menu.ctp:102
-#: View/Elements/side_menu.ctp:552
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "List Object Templates"
 msgstr "Objektvorlagen anzeigen"
 
-#: View/Elements/global_menu.ctp:104
-#: View/Elements/side_menu.ctp:331
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:106
-#: View/Elements/side_menu.ctp:332
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:109
-#: View/Elements/side_menu.ctp:334
-#: View/Events/automation.ctp:42
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
+#: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
 msgstr "Benutzerhandbuch"
 
-#: View/Elements/global_menu.ctp:110
-#: View/Elements/side_menu.ctp:335
-#: View/Pages/doc/general.ctp:61
-#: View/Pages/doc/user_management.ctp:54
-msgid "Terms &amp; Conditions"
+#: View/Elements/global_menu.ctp:186
+msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:111
-#: View/Elements/side_menu.ctp:336
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -3399,30 +3814,34 @@ msgstr ""
 msgid "Statistics"
 msgstr "Statistik"
 
-#: View/Elements/global_menu.ctp:113
+#: View/Elements/global_menu.ctp:201
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr "Diskussionen anzeigen"
 
-#: View/Elements/global_menu.ctp:114
+#: View/Elements/global_menu.ctp:205
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr "Diskussion starten"
 
-#: View/Elements/global_menu.ctp:125
-#: View/Elements/side_menu.ctp:354
+#: View/Elements/global_menu.ctp:212
+#: View/Pages/doc/general.ctp:23;66
+msgid "Sync Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "Server auflisten"
 
-#: View/Elements/global_menu.ctp:127
-#: View/Elements/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
 msgid "List Feeds"
 msgstr "Feeds auflisten"
 
-#: View/Elements/global_menu.ctp:136
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/administration.ctp:8
-#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
 #: View/Pages/doc/quickstart.ctp:8
@@ -3431,95 +3850,100 @@ msgstr "Feeds auflisten"
 msgid "Administration"
 msgstr "Administration"
 
-#: View/Elements/global_menu.ctp:140
-#: View/Elements/side_menu.ctp:376
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "Benutzer auflisten"
 
-#: View/Elements/global_menu.ctp:141
-#: View/Elements/side_menu.ctp:375
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
 msgid "Add User"
 msgstr "Benutzer hinzufügen"
 
-#: View/Elements/global_menu.ctp:142
-#: View/Elements/side_menu.ctp:379
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr "Benutzer kontaktieren"
 
-#: View/Elements/global_menu.ctp:144
-#: View/Elements/side_menu.ctp:316;391
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
 msgid "List Organisations"
 msgstr "Organisationen anzeigen"
 
-#: View/Elements/global_menu.ctp:146
-#: View/Elements/side_menu.ctp:383
-msgid "Add Organisation"
-msgstr "Organisation hinzufügen"
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:149
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr "Rollen auflisten"
 
-#: View/Elements/global_menu.ctp:151
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
-msgstr "Rolle hinzufügen"
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-msgid "Maintenance"
-msgstr "Wartung"
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
+msgstr "Servereinstellungen & Wartung"
 
-#: View/Elements/global_menu.ctp:158
-#: View/Elements/side_menu.ctp:401
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "Jobs"
 
-#: View/Elements/global_menu.ctp:160
-#: View/Elements/side_menu.ctp:403
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
 msgstr "Geplante Aufgaben"
 
-#: View/Elements/global_menu.ctp:165
-#: View/Elements/side_menu.ctp:407
+#: View/Elements/global_menu.ctp:300
+msgid "Blacklist Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
 msgid "Manage Event Blacklists"
 msgstr "Event-Blacklisten verwalten"
 
-#: View/Elements/global_menu.ctp:169
+#: View/Elements/global_menu.ctp:314
 msgid "Blacklist Organisation"
 msgstr "Organisationen blacklisten"
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/side_menu.ctp:411
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
 msgid "Manage Org Blacklists"
 msgstr "Org Blacklists verwalten"
 
-#: View/Elements/global_menu.ctp:180
+#: View/Elements/global_menu.ctp:327
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr "Audit"
 
-#: View/Elements/global_menu.ctp:184
-#: View/Elements/side_menu.ctp:417
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "Logs auflisten"
 
-#: View/Elements/global_menu.ctp:185
-#: View/Elements/side_menu.ctp:418
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "Logs durchsuchen"
 
-#: View/Elements/global_menu.ctp:207;209
+#: View/Elements/global_menu.ctp:362;367
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr "Ausloggen"
@@ -3540,407 +3964,8 @@ msgstr "Histogramm ein/aus"
 msgid "Attributes per organization"
 msgstr "Attribute per Organisation"
 
-#: View/Elements/side_menu.ctp:17;78
-msgid "Populate From Template"
-msgstr "Aus Vorlage befüllen"
-
-#: View/Elements/side_menu.ctp:24
-msgid "Freetext Import Result"
-msgstr "Ergebnisse des Freitext-Imports"
-
-#: View/Elements/side_menu.ctp:31
-msgid "View Event"
-msgstr "Event anzeigen"
-
-#: View/Elements/side_menu.ctp:36;465;540
-msgid "View Correlation Graph"
-msgstr "Korrelations-Graph anzeigen"
-
-#: View/Elements/side_menu.ctp:41
-msgid "View Event History"
-msgstr "Event-Verlauf anzeigen"
-
-#: View/Elements/side_menu.ctp:48
-#: View/Events/edit.ctp:8
-msgid "Edit Event"
-msgstr "Event bearbeiten"
-
-#: View/Elements/side_menu.ctp:50
-msgid "Delete Event"
-msgstr "Event löschen"
-
-#: View/Elements/side_menu.ctp:50;267;298;351;371
-#: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Servers/index.ctp:99
-msgid "Are you sure you want to delete # %s?"
-msgstr "Möchten Sie # %s wirklich löschen?"
-
-#: View/Elements/side_menu.ctp:61
-msgid "Add Object"
-msgstr "Objekt hinzufügen"
-
-#: View/Elements/side_menu.ctp:66
-msgid "Add Attachment"
-msgstr "Anhang hinzufügen"
-
-#: View/Elements/side_menu.ctp:73
-msgid "Populate from..."
-msgstr "Befüllen aus..."
-
-#: View/Elements/side_menu.ctp:86
-#: View/Events/ajax/enrich_event.ctp:2
-msgid "Enrich Event"
-msgstr "Event anreichern"
-
-#: View/Elements/side_menu.ctp:91
-msgid "Merge attributes from..."
-msgstr "Attribute übernehmen von..."
-
-#: View/Elements/side_menu.ctp:98
-msgid "Propose Attribute"
-msgstr "Attribute vorschlagen"
-
-#: View/Elements/side_menu.ctp:103
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr "Anhang vorschlagen"
-
-#: View/Elements/side_menu.ctp:115
-#: View/Elements/Events/eventIndexTable.ctp:218
-msgid "Publish Event"
-msgstr "Event veröffentlichen"
-
-#: View/Elements/side_menu.ctp:123
-msgid "Publish (no email)"
-msgstr "Veröffentlichen (ohne Email)"
-
-#: View/Elements/side_menu.ctp:132
-msgid "Delegate Publishing"
-msgstr "Veröffentlichung delegieren"
-
-#: View/Elements/side_menu.ctp:143
-#: View/EventDelegations/ajax/accept_delegation.ctp:2
-msgid "Accept Delegation Request"
-msgstr "Delegationsanfrage akzeptieren"
-
-#: View/Elements/side_menu.ctp:151
-msgid "Discard Delegation Request"
-msgstr "Delegationsanfrage verwerfen"
-
-#: View/Elements/side_menu.ctp:157
-msgid "Publish event to ZMQ"
-msgstr "Event via ZMQ veröffentlichen"
-
-#: View/Elements/side_menu.ctp:162
-msgid "Contact Reporter"
-msgstr "Reporter kontaktieren"
-
-#: View/Elements/side_menu.ctp:169
-msgid "Download as..."
-msgstr "Herunterladen als..."
-
-#: View/Elements/side_menu.ctp:201
-msgid "Import from…"
-msgstr "Importieren aus…"
-
-#: View/Elements/side_menu.ctp:224
-msgid "Download results as JSON"
-msgstr "Ergebnisse als JSON herunterladen"
-
-#: View/Elements/side_menu.ctp:228
-msgid "Download results as XML"
-msgstr "Ergebnisse im XML-Format herunterladen"
-
-#: View/Elements/side_menu.ctp:232
-msgid "Download results as CSV"
-msgstr "Ergebnisse als CSV herunterladen"
-
-#: View/Elements/side_menu.ctp:242
-#: View/Pages/doc/general.ctp:39
-msgid "Events with proposals"
-msgstr "Events mit Vorschlägen"
-
-#: View/Elements/side_menu.ctp:259
-msgid "List Regexp"
-msgstr "Reguläre Ausdrücke auflisten"
-
-#: View/Elements/side_menu.ctp:261
-msgid "New Regexp"
-msgstr "Neuer regulärer Ausdruck"
-
-#: View/Elements/side_menu.ctp:262
-msgid "Perform on existing"
-msgstr "Auf Bestehende ausführen"
-
-#: View/Elements/side_menu.ctp:266
-msgid "Edit Regexp"
-msgstr "Regulären Ausdruck bearbeiten"
-
-#: View/Elements/side_menu.ctp:267
-msgid "Delete Regexp"
-msgstr "Regulären Ausdruck löschen"
-
-#: View/Elements/side_menu.ctp:273
-msgid "View Warninglist"
-msgstr "Warninglist anzeigen"
-
-#: View/Elements/side_menu.ctp:276
-msgid "Update Warninglists"
-msgstr "Warninglist aktualisieren"
-
-#: View/Elements/side_menu.ctp:282
-msgid "View Noticelist"
-msgstr "Noticelists anzeigen"
-
-#: View/Elements/side_menu.ctp:285
-msgid "Update Noticelists"
-msgstr "Noticelists aktualisieren"
-
-#: View/Elements/side_menu.ctp:291
-msgid "List Whitelist"
-msgstr "Whitelist anzeigen"
-
-#: View/Elements/side_menu.ctp:293
-msgid "New Whitelist"
-msgstr "Neue Whitelist"
-
-#: View/Elements/side_menu.ctp:297
-msgid "Edit Whitelist"
-msgstr "Whitelist bearbeiten"
-
-#: View/Elements/side_menu.ctp:298
-msgid "Delete Whitelist"
-msgstr "Whitelist löschen"
-
-#: View/Elements/side_menu.ctp:305
-#: View/Users/edit.ctp:4
-msgid "Edit My Profile"
-msgstr "Mein Profil bearbeiten"
-
-#: View/Elements/side_menu.ctp:306
-#: View/Pages/doc/administration.ctp:126
-#: View/Users/admin_edit.ctp:70
-#: View/Users/change_pw.ctp:4
-msgid "Change Password"
-msgstr "Passwort ändern"
-
-#: View/Elements/side_menu.ctp:321;389
-msgid "View Organisation"
-msgstr "Organisationen anzeigen"
-
-#: View/Elements/side_menu.ctp:328
-#: View/SharingGroups/edit.ctp:3
-msgid "Edit Sharing Group"
-msgstr "Sharing-Gruppe bearbeiten"
-
-#: View/Elements/side_menu.ctp:329
-msgid "View Sharing Group"
-msgstr "Sharing-Gruppe anzeigen"
-
-#: View/Elements/side_menu.ctp:342
-msgid "Explore Remote Event"
-msgstr "Event per Fernzugriff ansehen"
-
-#: View/Elements/side_menu.ctp:343
-msgid "Fetch This Event"
-msgstr "Event abholen"
-
-#: View/Elements/side_menu.ctp:343
-#: View/Feeds/preview_index.ctp:65
-#: View/Servers/preview_index.ctp:147
-msgid "Are you sure you want to fetch and save this event on your instance?"
-msgstr "Sind Sie sicher, dass Sie das Event abholen und auf Ihrer Instanz speichern möchten?"
-
-#: View/Elements/side_menu.ctp:344;347
-msgid "Explore Remote Server"
-msgstr "Server per Fernzugriff erkunden"
-
-#: View/Elements/side_menu.ctp:350
-#: View/Servers/edit.ctp:4
-msgid "Edit Server"
-msgstr "Server bearbeiten"
-
-#: View/Elements/side_menu.ctp:356
-msgid "New Server"
-msgstr "Neuer Server"
-
-#: View/Elements/side_menu.ctp:363
-msgid "View User"
-msgstr "Benutzer anzeigen"
-
-#: View/Elements/side_menu.ctp:364
-msgid "Reset Password"
-msgstr "Passwort zurücksetzen"
-
-#: View/Elements/side_menu.ctp:365
-msgid "Edit User"
-msgstr "Benutzer bearbeiten"
-
-#: View/Elements/side_menu.ctp:366
-msgid "Delete User"
-msgstr "Benutzer löschen"
-
-#: View/Elements/side_menu.ctp:366
-#: View/Elements/Users/userIndexTable.ctp:91
-msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
-msgstr "Sind Sie sicher, dass Sie # %s löschen möchten? Es wird dringend empfohlen nie Benutzer löschen, sondern diese stattdessen zu deaktivieren."
-
-#: View/Elements/side_menu.ctp:370
-#: View/Roles/admin_edit.ctp:4
-msgid "Edit Role"
-msgstr "Rolle bearbeiten"
-
-#: View/Elements/side_menu.ctp:371
-msgid "Delete Role"
-msgstr "Rolle löschen"
-
-#: View/Elements/side_menu.ctp:385
-#: View/Organisations/admin_edit.ctp:4
-msgid "Edit Organisation"
-msgstr "Organisation bearbeiten"
-
-#: View/Elements/side_menu.ctp:386
-#: View/Organisations/ajax/merge.ctp:5
-msgid "Merge Organisation"
-msgstr "Organisation zusammenfügen"
-
-#: View/Elements/side_menu.ctp:398
-#: View/Servers/server_settings.ctp:5
-msgid "Server Settings & Maintenance"
-msgstr "Servereinstellungen & Wartung"
-
-#: View/Elements/side_menu.ctp:406
-msgid "Blacklists Event"
-msgstr "Blacklists Event"
-
-#: View/Elements/side_menu.ctp:410
-msgid "Blacklists Organisation"
-msgstr "Blacklists Organisation"
-
-#: View/Elements/side_menu.ctp:426;433
-msgid "View Thread"
-msgstr "Thread anzeigen"
-
-#: View/Elements/side_menu.ctp:427
-#: View/Posts/add.ctp:4
-msgid "Add Post"
-msgstr "Beitrag hinzufügen"
-
-#: View/Elements/side_menu.ctp:434
-#: View/Posts/edit.ctp:4
-msgid "Edit Post"
-msgstr "Beitrag editieren"
-
-#: View/Elements/side_menu.ctp:439
-msgid "List Threads"
-msgstr "Threads anzeigen"
-
-#: View/Elements/side_menu.ctp:440
-msgid "New Thread"
-msgstr "Neuer Thread"
-
-#: View/Elements/side_menu.ctp:445
-msgid "List Favourite Tags"
-msgstr "Bevorzugte Tags anzeigen"
-
-#: View/Elements/side_menu.ctp:455
-msgid "Edit Tag"
-msgstr "Tag bearbeiten"
-
-#: View/Elements/side_menu.ctp:461;473
-msgid "View Taxonomy"
-msgstr "Taxonomie anzeigen"
-
-#: View/Elements/side_menu.ctp:474
-msgid "Delete Taxonomy"
-msgstr "Taxonomie löschen"
-
-#: View/Elements/side_menu.ctp:492
-msgid "View Template"
-msgstr "Vorlage ansehen"
-
-#: View/Elements/side_menu.ctp:494
-#: View/Templates/edit.ctp:6
-msgid "Edit Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:502
-msgid "Add Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:503
-msgid "Import Feeds from JSON"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:504
-#: View/Feeds/compare_feeds.ctp:7
-msgid "Feed overlap analysis matrix"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:505
-msgid "Export Feed settings"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:507
-msgid "Edit Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:509
-msgid "PreviewIndex"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:511
-msgid "PreviewEvent"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:516
-msgid "View News"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:520
-#: View/News/add.ctp:6
-msgid "Add News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:522
-#: View/News/edit.ctp:6
-msgid "Edit News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:533
-msgid "Update Galaxies"
-msgstr "Galaxien aktualisieren"
-
-#: View/Elements/side_menu.ctp:533
-msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:534
-msgid "Force Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:534
-msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:538;546
-msgid "View Galaxy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:539
-msgid "View Cluster"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:556
-msgid "Update Objects"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:561
-msgid "View Object Template"
-msgstr ""
-
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:84
+#: View/Layouts/default.ctp:87
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr "Lädt"
@@ -3972,31 +3997,34 @@ msgstr ""
 
 #: View/Elements/view_event_graph.ctp:13
 msgid "Display"
-msgstr ""
+msgstr "Anzeigen"
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Jobs/index.ctp:62
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
 #: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
 msgid "Filters"
-msgstr ""
+msgstr "Filtern"
 
 #: View/Elements/view_event_graph.ctp:16
 msgid "History"
-msgstr ""
+msgstr "Verlauf"
 
 #: View/Elements/view_event_graph.ctp:22
 #: View/Events/view_graph.ctp:16
 msgid "Toggle fullscreen"
 msgstr ""
 
-#: View/Elements/view_mitre_attack_matrix.ctp:27
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
-msgstr ""
+msgstr "Zeige alles"
 
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all events on current page"
-msgstr ""
+msgstr "Alle Datensätze der aktuellen Seite selektieren"
 
 #: View/Elements/Events/eventIndexTable.ctp:35
 msgid "Clusters"
@@ -4020,7 +4048,7 @@ msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:47
 msgid "Proposal Count"
-msgstr ""
+msgstr "Anzahl der Vorschläge"
 
 #: View/Elements/Events/eventIndexTable.ctp:47
 msgid "#Prop"
@@ -4034,35 +4062,58 @@ msgstr ""
 msgid "#Posts"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:167
-msgid " correlation(s)"
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/dashboard/dashboard_events.ctp:4;5
+#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
+#: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/preview_index.ctp:174
+#: View/Taxonomies/index.ctp:47
+#: View/Warninglists/index.ctp:60
+msgid "View"
+msgstr "Ansicht"
+
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:177;182
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:187
+#: View/Elements/Events/eventIndexTable.ctp:190
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:207
-#: View/Jobs/index.ctp:15;63
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-msgid "All"
-msgstr ""
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
+msgstr "Event veröffentlichen"
 
-#: View/Elements/Events/eventIndexTable.ctp:218
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:12
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
 msgid "Are you sure this event is complete and everyone should be informed?"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:219
+#: View/Elements/Events/eventIndexTable.ctp:222
 msgid "Not published"
 msgstr ""
 
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr "Möchten Sie # %s wirklich löschen?"
+
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid "Show "
 msgstr ""
@@ -4072,51 +4123,66 @@ msgid " more..."
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:295
+#: View/Events/view.ctp:346
 msgid "Collapse…"
+msgstr "Kollabieren"
+
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:262
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:343
 msgid "Restore attribute"
 msgstr "Attribut wiederherstellen"
 
-#: View/Elements/Events/View/row_attribute.ctp:263;303
+#: View/Elements/Events/View/row_attribute.ctp:344;384
 msgid "Permanently delete attribute"
 msgstr "Attribut dauerhaft löschen"
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Query enrichment"
 msgstr "Anreicherung anfragen"
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Propose enrichment"
 msgstr "Anreicherung vorschlagen"
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Query Cortex"
 msgstr "Cortex abfragen"
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Propose enrichment through Cortex"
 msgstr "Anreicherung durch Cortex vorschlagen"
 
-#: View/Elements/Events/View/row_attribute.ctp:279
+#: View/Elements/Events/View/row_attribute.ctp:360
 msgid "Propose Edit"
 msgstr "Änderung vorschlagen"
 
-#: View/Elements/Events/View/row_attribute.ctp:280
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Propose Deletion"
 msgstr "Löschung vorschlagen"
 
-#: View/Elements/Events/View/row_attribute.ctp:290;295
+#: View/Elements/Events/View/row_attribute.ctp:371;376
 msgid "Add enrichment"
 msgstr "Anreicherung hinzufügen"
 
-#: View/Elements/Events/View/row_attribute.ctp:295
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Add enrichment via Cortex"
 msgstr "Anreicherung via Cortex hinzufügen"
 
-#: View/Elements/Events/View/row_attribute.ctp:307
+#: View/Elements/Events/View/row_attribute.ctp:388
 msgid "Soft-delete attribute"
 msgstr "Attribut soft-löschen"
 
@@ -4138,24 +4204,36 @@ msgid "Expand or Collapse"
 msgstr "Ausklappen/Einklappen"
 
 #: View/Elements/Events/View/row_object.ctp:69
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:70
 msgid "Meta-category: "
 msgstr "Meta-Kategorie: "
 
-#: View/Elements/Events/View/row_object.ctp:70
+#: View/Elements/Events/View/row_object.ctp:71
 #: View/Elements/Feeds/View/row_object.ctp:21
 msgid "Description: "
 msgstr "Beschreibung: "
 
-#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Events/View/row_object.ctp:72
 #: View/Elements/Feeds/View/row_object.ctp:22
 msgid "Template: "
 msgstr "Vorlage: "
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Permanently delete object"
 msgstr "Objekt dauerhaft löschen"
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Soft delete object"
 msgstr "Objekt soft-löschen"
 
@@ -4196,6 +4274,7 @@ msgstr "Vorschlag verwerfen"
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
 #: View/Sightings/ajax/advanced.ctp:10
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 msgid "Add sighting"
 msgstr "Sichtung hinzufügen"
 
@@ -4204,7 +4283,6 @@ msgid "Mark as false-positive"
 msgstr "Markieren als falsch-positiv"
 
 #: View/Elements/Events/View/sighting_field.ctp:14
-#: View/Events/view.ctp:203
 msgid "Advanced sightings"
 msgstr "Erweiterte Sichtungen"
 
@@ -4232,7 +4310,7 @@ msgstr " wert"
 
 #: View/Elements/Feeds/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object.ctp:20
-#: View/ObjectTemplates/view.ctp:19
+#: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:23
 msgid "Meta-category"
 msgstr "Meta-Kategorie"
@@ -4247,7 +4325,7 @@ msgid "all"
 msgstr "alle"
 
 #: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/view.ctp:126
+#: View/Events/view.ctp:131
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
 #: View/Servers/preview_event.ctp:36
 #: View/Sightings/ajax/list_sightings.ctp:5
@@ -4273,12 +4351,13 @@ msgstr "Status"
 #: View/Elements/Servers/View/row_attribute.ctp:93
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/healthElements/files.ctp:61
-#: View/Elements/healthElements/workers.ctp:61;62;63
-#: View/Events/automation.ctp:403;410;417;438;445
+#: View/Elements/healthElements/workers.ctp:66;67;68
+#: View/Events/automation.ctp:234;241;248;269;276
 #: View/Events/export.ctp:68;88
-#: View/Taxonomies/view.ctp:96;107;152
-#: View/Users/admin_view.ctp:83;92;122
-#: View/Users/view.ctp:62
+#: View/Events/legacy_automation.ctp:403;410;417;438;445
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
 msgid "N/A"
 msgstr "nicht verfügbar"
 
@@ -4287,23 +4366,24 @@ msgstr "nicht verfügbar"
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
 #: View/Galaxies/view.ctp:14
-#: View/ObjectTemplates/view.ctp:11
+#: View/ObjectTemplates/view.ctp:4
 #: View/Objects/revise_object.ctp:19
 #: View/Organisations/ajax/merge.ctp:57;64
 #: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/view.ctp:9
-#: View/SharingGroups/add.ctp:11;31;51
-#: View/SharingGroups/edit.ctp:11;31;59
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
 #: View/SharingGroups/view.ctp:42;67
 #: View/Templates/view.ctp:9
 #: View/Users/statistics_orgs.ctp:31
-#: View/Warninglists/view.ctp:9
+#: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "Name"
 
 #: View/Elements/Servers/View/row_object.ctp:21
 #: View/Elements/healthElements/files.ctp:8
-#: View/Elements/healthElements/settings_tab.ctp:16
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:10
 #: View/Elements/templateElements/populateTemplateDescription.ctp:12
 #: View/Elements/templateElements/populateTemplateFile.ctp:10
@@ -4311,19 +4391,19 @@ msgstr "Name"
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:27
 #: View/Galaxies/view.ctp:20
-#: View/ObjectTemplates/view.ctp:21
+#: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:16;94
-#: View/Organisations/view.ctp:32;89;90
+#: View/Organisations/view.ctp:15;58;59
 #: View/Pages/doc/administration.ctp:48;241
-#: View/Pages/doc/categories_and_types.ctp:50;67
+#: View/Pages/doc/categories_and_types.ctp:44;61
 #: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
 #: View/Servers/preview_event.ctp:65
-#: View/SharingGroups/add.ctp:15
-#: View/SharingGroups/edit.ctp:15
-#: View/SharingGroups/index.ctp:28
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
 #: View/Taxonomies/view.ctp:14
 #: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:14
+#: View/Warninglists/view.ctp:11
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -4342,11 +4422,17 @@ msgstr "Referenzen"
 msgid "Referenced by"
 msgstr "Referenziert von"
 
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
+
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:2
+#: View/Roles/view.ctp:24
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_view.ctp:19
-#: View/Users/view.ctp:19
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
 msgstr "Rolle"
 
@@ -4357,7 +4443,7 @@ msgstr "Letztes Login"
 #: View/Elements/Users/userIndexTable.ctp:17
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:54
+#: View/ShadowAttributes/index.ctp:64
 msgid "Created"
 msgstr "Erstellt"
 
@@ -4369,6 +4455,11 @@ msgstr "Passwort-Erneuerung initiieren"
 msgid "Create new credentials and inform user"
 msgstr "Neue Anmeldeinformationen erstellen und Benutzer informieren"
 
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr "Sind Sie sicher, dass Sie # %s löschen möchten? Es wird dringend empfohlen nie Benutzer löschen, sondern diese stattdessen zu deaktivieren."
+
 #: View/Elements/dashboard/dashboard_events.ctp:2
 msgid "Changes since last visit"
 msgstr "Änderungen seit dem letzten Besuch"
@@ -4383,11 +4474,11 @@ msgstr ""
 
 #: View/Elements/dashboard/dashboard_notifications.ctp:2
 msgid "Notifications"
-msgstr ""
+msgstr "Benachrichtigungen"
 
 #: View/Elements/dashboard/dashboard_notifications.ctp:4
 msgid "Proposals: "
-msgstr ""
+msgstr "Vorschläge: "
 
 #: View/Elements/dashboard/dashboard_notifications.ctp:5
 msgid "Events with proposals: "
@@ -4397,13 +4488,424 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr "Aus Vorlage befüllen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr "Ergebnisse des Freitext-Imports"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr "Event anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr "Korrelations-Graph anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr "Event-Verlauf anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr "Event bearbeiten"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr "Event löschen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr "Objekt hinzufügen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr "Anhang hinzufügen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr "Befüllen aus..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr "Event anreichern"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr "Attribute übernehmen von..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr "Attribute vorschlagen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr "Anhang vorschlagen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr "Veröffentlichen (ohne Email)"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr "Veröffentlichung delegieren"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr "Delegationsanfrage akzeptieren"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr "Delegationsanfrage verwerfen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr "Event via ZMQ veröffentlichen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr "Reporter kontaktieren"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr "Herunterladen als..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr "Importieren aus…"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr "Reguläre Ausdrücke auflisten"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr "Neuer regulärer Ausdruck"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr "Auf Bestehende ausführen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr "Regulären Ausdruck bearbeiten"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr "Regulären Ausdruck löschen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr "Warninglist anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr "Warninglist aktualisieren"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr "Noticelists anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr "Noticelists aktualisieren"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr "Whitelist anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr "Neue Whitelist"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr "Whitelist bearbeiten"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr "Whitelist löschen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr "Mein Profil bearbeiten"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr "Passwort ändern"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr "Passwort zurücksetzen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr "Organisationen anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr "Sharing-Gruppe bearbeiten"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr "Sharing-Gruppe anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr "Server per Fernzugriff erkunden"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr "Event per Fernzugriff ansehen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr "Event abholen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr "Sind Sie sicher, dass Sie das Event abholen und auf Ihrer Instanz speichern möchten?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr "Server bearbeiten"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr "Benutzer anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr "Benutzer bearbeiten"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr "Benutzer löschen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr "Rolle bearbeiten"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr "Rolle löschen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr "Organisation hinzufügen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr "Organisation bearbeiten"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr "Organisation zusammenfügen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr "Rolle hinzufügen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr "Blacklists Event"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr "Blacklists Organisation"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr "Thread anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr "Beitrag hinzufügen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr "Beitrag editieren"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr "Threads anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr "Neuer Thread"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr "Bevorzugte Tags anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr "Tag bearbeiten"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr "Taxonomie anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr "Taxonomie löschen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr "Vorlage ansehen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr "News anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr "Galaxien aktualisieren"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr "Galaxy anzeigen"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr ""
+
 #: View/Elements/healthElements/diagnostics.ctp:5
 msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:9
 msgid "MISP version"
-msgstr ""
+msgstr "MISP-Version"
 
 #: View/Elements/healthElements/diagnostics.ctp:10
 msgid "Every version of MISP includes a json file with the current version. This is checked against the latest tag on github, if there is a version mismatch the tool will warn you about it. Make sure that you update MISP regularly."
@@ -4419,15 +4921,14 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:22
 msgid "Outdated version"
-msgstr ""
+msgstr "Veraltete Version"
 
-#: View/Elements/healthElements/diagnostics.ctp:26;156;170;195
-#: View/Elements/healthElements/workers.ctp:18;71
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
+#: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
-#: View/Users/admin_view.ctp:81
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: View/Elements/healthElements/diagnostics.ctp:30
 msgid "Could not retrieve version from github"
@@ -4439,137 +4940,141 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:46
 msgid "Status…"
-msgstr ""
+msgstr "Status…"
 
 #: View/Elements/healthElements/diagnostics.ctp:53
 msgid "Current branch…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Pull the latest MISP version from github"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Update MISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "Writeable Directories and files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:67
+#: View/Elements/healthElements/diagnostics.ctp:65
 msgid "The following directories and files have to be writeable for MISP to function properly. Make sure that the apache user has write privileges for the directories below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:68
+#: View/Elements/healthElements/diagnostics.ctp:66
 msgid "Directories"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:75
+#: View/Elements/healthElements/diagnostics.ctp:73
 msgid "Directory "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:83
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Writeable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:90;104
+#: View/Elements/healthElements/diagnostics.ctp:88;102
 msgid "File "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:97
+#: View/Elements/healthElements/diagnostics.ctp:95
 msgid "Readable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:112
+#: View/Elements/healthElements/diagnostics.ctp:110
 msgid "PHP Settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:115;127
+#: View/Elements/healthElements/diagnostics.ctp:113;125
 msgid "Up to date"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:121
-#: View/Elements/healthElements/workers.ctp:78;80
-#: View/Organisations/view.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:119
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
 msgid "Unknown"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:123
+#: View/Elements/healthElements/diagnostics.ctp:121
 msgid "Issues determining version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:130;139
+#: View/Elements/healthElements/diagnostics.ctp:128;137
 msgid "Update highly recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:133;142
+#: View/Elements/healthElements/diagnostics.ctp:131;140
 msgid "Version unsupported, update ASAP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:146
+#: View/Elements/healthElements/diagnostics.ctp:144
 msgid "PHP ini path"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:147
+#: View/Elements/healthElements/diagnostics.ctp:145
 msgid "PHP Version"
-msgstr ""
+msgstr "PHP-Version"
 
-#: View/Elements/healthElements/diagnostics.ctp:147;148
+#: View/Elements/healthElements/diagnostics.ctp:145;146
 msgid "recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:148
+#: View/Elements/healthElements/diagnostics.ctp:146
 msgid "PHP CLI Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:149
+#: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
 msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:156
+#: View/Elements/healthElements/diagnostics.ctp:155
 #: View/Events/filter_event_index.ctp:32;190
 #: View/Pages/doc/using_the_system.ctp:66;171
 msgid "Low"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:160
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP Extensions"
-msgstr ""
+msgstr "PHP-Erweiterungen"
 
-#: View/Elements/healthElements/diagnostics.ctp:170
+#: View/Elements/healthElements/diagnostics.ctp:169
 msgid "Not loaded"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:175
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:183
+#: View/Elements/healthElements/diagnostics.ctp:182
 msgid "Advanced attachment handler"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:184
+#: View/Elements/healthElements/diagnostics.ctp:183
 msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PyMISP"
-msgstr ""
+msgstr "PyMISP"
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:201
+#: View/Elements/healthElements/diagnostics.ctp:200
 msgid "STIX and Cybox libraries"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:202
+#: View/Elements/healthElements/diagnostics.ctp:201
 msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:203
+#: View/Elements/healthElements/diagnostics.ctp:202
 msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
 msgstr ""
 
@@ -4803,75 +5308,38 @@ msgstr ""
 #: View/Elements/healthElements/files.ctp:32
 #: View/Roles/admin_edit.ctp:15
 msgid "Permissions"
-msgstr ""
+msgstr "Berechtigungen"
 
 #: View/Elements/healthElements/files.ctp:73
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
 #: View/Roles/admin_index.ctp:67
-#: View/SharingGroups/index.ctp:68
+#: View/SharingGroups/index.ctp:87
 msgid "Are you sure you want to delete %s?"
-msgstr ""
+msgstr "Soll %s wirklich gelöscht werden?"
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:5
 msgid "Good, but there are some optional settings that are incorrect / not set."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:6
 msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
-msgid "Overall health"
+msgid "Test"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:17
-msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:26
-msgid " settings incorrectly or not set"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:27
-msgid " incorrect settings."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:33
-msgid "Critical issues revealed by the diagnostics"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:34
-msgid " issues detected."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:35
-msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:9
-msgid "Toggle subgroup"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:13
-#: View/Pages/doc/administration.ctp:45
-msgid "Priority"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:14
-#: View/Pages/doc/administration.ctp:46
-msgid "Setting"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:15
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
 #: View/Events/filter_event_index.ctp:134
 #: View/Events/resolved_attributes.ctp:45
 #: View/Events/show_i_o_c_results.ctp:13
@@ -4884,47 +5352,77 @@ msgstr ""
 #: View/Templates/populate_event_from_template_attributes.ctp:8
 #: View/Users/admin_filter_user_index.ctp:71
 msgid "Value"
+msgstr "Wert"
+
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
 msgstr ""
 
-#: View/Elements/healthElements/settings_tab.ctp:17
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
-msgstr ""
+msgstr "Fehlermeldung"
 
-#: View/Elements/healthElements/tabs.ctp:3;15;27;36
-#: View/Events/index.ctp:30;58
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
-#: View/Users/admin_index.ctp:28
-msgid "Modify filters"
-msgstr ""
-
-#: View/Elements/healthElements/tabs.ctp:3
+#: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:28
-#: View/Pages/doc/administration.ctp:38
-msgid "Diagnostics"
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:37
-#: View/Pages/doc/administration.ctp:39
-msgid "Workers"
+#: View/Elements/healthElements/tabs.ctp:34
+#: View/Pages/doc/administration.ctp:38
+msgid "Diagnostics"
 msgstr ""
 
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:48
+#: View/Elements/healthElements/tabs.ctp:50;65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:5
-msgid "Warning"
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:5
@@ -4932,82 +5430,90 @@ msgid "MISP cannot access your /proc directory to check the status of the worker
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:10
-msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgid "Note:"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "You have set the \"manage_workers\" variable to \"false\", therefore worker controls have been disabled."
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:15
+msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:20
 msgid "Worker started with the correct user, but the current status is unknown."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:24
+#: View/Elements/healthElements/workers.ctp:29
 msgid "There are issues with the worker(s), but at least one healthy worker is monitoring the queue."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:30
+#: View/Elements/healthElements/workers.ctp:35
 msgid "Worker type: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:32
+#: View/Elements/healthElements/workers.ctp:37
 msgid "Jobs in the queue: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:40
+#: View/Elements/healthElements/workers.ctp:45
 msgid "Queue status: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:51
+#: View/Elements/healthElements/workers.ctp:56
 msgid "Worker PID"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:52
+#: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
-#: View/Users/admin_view.ctp:7
-#: View/Users/view.ctp:2
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
 msgid "User"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:53
+#: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:54
+#: View/Elements/healthElements/workers.ctp:59
 msgid "Information"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:64
+#: View/Elements/healthElements/workers.ctp:69
 msgid "Worker not running!"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:72
+#: View/Elements/healthElements/workers.ctp:77
 msgid "The worker appears to be healthy."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:75
+#: View/Elements/healthElements/workers.ctp:80
 msgid "The worker was started with a user other than the apache user. MISP cannot check whether the worker is alive or not."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:81
+#: View/Elements/healthElements/workers.ctp:86
 msgid "Cannot check whether the worker is alive or dead."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:85
+#: View/Elements/healthElements/workers.ctp:90
 msgid "Dead"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:86
+#: View/Elements/healthElements/workers.ctp:91
 msgid "The Worker appears to be dead."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:100
+#: View/Elements/healthElements/workers.ctp:106
 msgid "Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:111
+#: View/Elements/healthElements/workers.ctp:119
 msgid "Start a worker"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:119
+#: View/Elements/healthElements/workers.ctp:130
 msgid "Restart all workers"
 msgstr ""
 
@@ -5102,7 +5608,7 @@ msgstr ""
 #: View/Elements/serverRuleElements/pull.ctp:65
 #: View/Elements/serverRuleElements/push.ctp:67
 msgid "Update"
-msgstr ""
+msgstr "Aktualisieren"
 
 #: View/Elements/serverRuleElements/push.ctp:3
 msgid "Set push rules"
@@ -5138,18 +5644,18 @@ msgstr ""
 #: View/Objects/revise_object.ctp:45
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
-#: View/Pages/doc/categories_and_types.ctp:66
+#: View/Pages/doc/categories_and_types.ctp:60
 #: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
-#: View/ShadowAttributes/index.ctp:36;51
-#: View/SharingGroups/add.ctp:30
-#: View/SharingGroups/edit.ctp:30
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
 #: View/Sightings/ajax/list_sightings.ctp:7
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:35
-#: View/Warninglists/view.ctp:24
+#: View/Warninglists/view.ctp:13
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:38
 msgid "Describe the %s using one or several (separated by a line-break) of the following types: %s"
@@ -5169,7 +5675,7 @@ msgstr ""
 
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:68
 msgid "Error: %s"
-msgstr ""
+msgstr "Fehler: %s"
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:3
 #: View/Templates/add.ctp:37
@@ -5186,7 +5692,7 @@ msgid "Template Name"
 msgstr ""
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:60
+#: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr ""
@@ -5206,12 +5712,12 @@ msgid "s"
 msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
-#: View/ObjectReferences/ajax/add.ctp:60
+#: View/ObjectReferences/ajax/add.ctp:86
 #: View/Objects/revise_object.ctp:43
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
 msgid "Attribute"
-msgstr ""
+msgstr "Attribut"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:30
 #: View/Elements/templateElements/templateRowFile.ctp:30
@@ -5220,19 +5726,19 @@ msgstr ""
 #: View/Feeds/freetext_index.ctp:31
 #: View/Objects/add.ctp:95
 #: View/Objects/revise_object.ctp:44
-#: View/Pages/doc/categories_and_types.ctp:17;23;37;43;49
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
 #: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
-#: View/ShadowAttributes/index.ctp:48
+#: View/ShadowAttributes/index.ctp:58
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_add_file.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:28
 #: View/Templates/populate_event_from_template_attributes.ctp:6
 msgid "Category"
-msgstr ""
+msgstr "Kategorie"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
-#: View/Pages/doc/categories_and_types.ctp:63
+#: View/Pages/doc/categories_and_types.ctp:57
 #: View/Pages/doc/using_the_system.ctp:109
 #: View/Pages/doc/md/categories_and_types.ctp:33
 msgid "Types"
@@ -5294,12 +5800,12 @@ msgstr ""
 
 #: View/Errors/error403.ctp:4
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
 #: View/Errors/missing_connection.ctp:1
 #: View/Errors/missing_datasource_config.ctp:1
 msgid "Missing Database Connection"
-msgstr ""
+msgstr "Keine Verbindung zur Datenbank"
 
 #: View/Errors/pdo_error.ctp:1
 msgid "PDO error"
@@ -5430,7 +5936,7 @@ msgstr ""
 #: View/ShadowAttributes/ajax/attributeEditTypeForm.ctp:5
 #: View/ShadowAttributes/ajax/attributeEditValueForm.ctp:5
 msgid "Accept"
-msgstr ""
+msgstr "Annehmen"
 
 #: View/EventDelegations/ajax/view.ctp:23
 msgid "Decline and remove delegation request"
@@ -5461,45 +5967,33 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
-#: View/Events/add.ctp:3
-msgid "The event created %s, but not synchronised to other MISP instances until it is published."
-msgstr ""
-
-#: View/Events/add.ctp:3
-msgid "will be restricted to your organisation"
-msgstr ""
-
-#: View/Events/add.ctp:3
-msgid "will be visible to the organisations having an account on this platform"
-msgstr ""
-
-#: View/Events/add.ctp:48
+#: View/Events/add.ctp:44
 #: View/Events/edit.ctp:35
 msgid "Threat Level "
 msgstr ""
 
-#: View/Events/add.ctp:52
+#: View/Events/add.ctp:48
 #: View/Events/edit.ctp:38
 msgid "Analysis "
-msgstr ""
+msgstr "Analyse"
 
-#: View/Events/add.ctp:56
+#: View/Events/add.ctp:52
 #: View/Events/edit.ctp:43
-#: View/ShadowAttributes/index.ctp:42
+#: View/ShadowAttributes/index.ctp:52
 msgid "Event Info"
 msgstr ""
 
-#: View/Events/add.ctp:60
+#: View/Events/add.ctp:56
 #: View/Events/edit.ctp:47
 msgid "Quick Event Description or Tracking Info"
 msgstr ""
 
-#: View/Events/add.ctp:63
+#: View/Events/add.ctp:59
 #: View/Events/edit.ctp:50
 msgid "Extends event"
 msgstr ""
 
-#: View/Events/add.ctp:66
+#: View/Events/add.ctp:62
 #: View/Events/edit.ctp:53
 msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr ""
@@ -5510,7 +6004,8 @@ msgstr ""
 
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
-#: View/Events/upload_stix.ctp:22
+#: View/Events/upload_analysis_file.ctp:22
+#: View/Events/upload_stix.ctp:29
 msgid "Upload"
 msgstr ""
 
@@ -5548,7 +6043,7 @@ msgid "Details"
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:89
+#: View/Jobs/index.ctp:124
 msgid "Failed"
 msgstr ""
 
@@ -5561,781 +6056,677 @@ msgid "Event with this UUID already exists."
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr ""
 
 #: View/Events/automation.ctp:3
-msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
-"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
-"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgid "Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.\n"
+"    To to make this functionality available for automated tools an authentication key is used."
 msgstr ""
 
 #: View/Events/automation.ctp:6
-msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgid "Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP."
 msgstr ""
 
-#: View/Events/automation.ctp:7
+#: View/Events/automation.ctp:9
+#: View/Events/legacy_automation.ctp:7
 msgid "Your current key is: <code>%s</code>.\n"
 "    You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:8
+#: View/Events/automation.ctp:10
+#: View/Events/legacy_automation.ctp:8
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:10
-msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
-msgstr ""
-
-#: View/Events/automation.ctp:11
-msgid "Please use the use the following header"
-msgstr ""
-
-#: View/Events/automation.ctp:12
-msgid "Authorization"
-msgstr ""
-
-#: View/Events/automation.ctp:13
-msgid "XML Export"
-msgstr ""
-
 #: View/Events/automation.ctp:14
-msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+#: View/Logs/admin_index.ctp:20;21
+msgid "Search"
 msgstr ""
 
-#: View/Events/automation.ctp:15;47;76
-msgid "You can configure your tools to automatically download the following file"
+#: View/Events/automation.ctp:16
+#: View/Events/legacy_automation.ctp:264
+msgid "It is possible to search the database for attributes based on a list of criteria."
 msgstr ""
 
 #: View/Events/automation.ctp:17
-msgid "If you only want to fetch a specific event append the eventid number"
+#: View/Events/legacy_automation.ctp:265
+msgid "To return an event or a list of events in a desired format, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:19;144
-msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+#: View/Events/automation.ctp:18
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
 msgstr ""
 
-#: View/Events/automation.ctp:26
-msgid "The xml download also accepts two additional the following optional parameters in the URL"
+#: View/Events/automation.ctp:21
+msgid "Set the return format of the search (Currently supported: json, xml, openioc, suricata, snort - more formats are being moved to restSearch with the goal being that all searches happen through this API). Can be passed as the first parameter after restSearch or via the JSON payload."
 msgstr ""
 
-#: View/Events/automation.ctp:29;52;85
-msgid "Restrict the download to a single event"
+#: View/Events/automation.ctp:22
+msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
 msgstr ""
 
-#: View/Events/automation.ctp:30
-msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+#: View/Events/automation.ctp:23
+msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
 msgstr ""
 
-#: View/Events/automation.ctp:31;54;87;112;134
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:24
+#: View/Events/legacy_automation.ctp:268;297
+msgid "Search for the given value in the attributes' value field."
 msgstr ""
 
-#: View/Events/automation.ctp:37;64;91;117;140;203;254;279
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:38;65;92;118;141;204;255;280
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:39;119;142;205;256;281;306
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:41;70;97;122;259;290
-msgid "The keywords false or null should be used for optional empty parameters in the URL."
-msgstr ""
-
-#: View/Events/automation.ctp:43
-msgid "Also check out the %s to read about the REST API."
-msgstr ""
-
-#: View/Events/automation.ctp:45
-msgid "CSV Export"
-msgstr ""
-
-#: View/Events/automation.ctp:46
-msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
-msgstr ""
-
-#: View/Events/automation.ctp:49
-msgid "You can specify additional flags for CSV exports as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:53
-msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
-msgstr ""
-
-#: View/Events/automation.ctp:58
-msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:61;270;299
-msgid "The attribute category, any valid MISP attribute category is accepted."
-msgstr ""
-
-#: View/Events/automation.ctp:62;199;269;298
+#: View/Events/automation.ctp:25
+#: View/Events/legacy_automation.ctp:62;199;269;298
 msgid "The attribute type, any valid MISP attribute type is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:63
-msgid "Include the event data with each attribute."
+#: View/Events/automation.ctp:26
+#: View/Events/legacy_automation.ctp:61;270;299
+msgid "The attribute category, any valid MISP attribute category is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:66
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+#: View/Events/automation.ctp:27
+#: View/Events/legacy_automation.ctp:271;300
+msgid "Search by the creator organisation by supplying the organisation identifier."
 msgstr ""
 
-#: View/Events/automation.ctp:67
-msgid "The CSV created when this setting is set to true will not contain the header row.\n"
-"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:71
-msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:74
-msgid "NIDS rules export"
-msgstr ""
-
-#: View/Events/automation.ctp:75
-msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:81
-msgid "The full API syntax is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:84
-msgid "The export format, can be \"suricata\" or \"snort\""
-msgstr ""
-
-#: View/Events/automation.ctp:86
-msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
-msgstr ""
-
-#: View/Events/automation.ctp:93
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:94
-msgid "Restrict the export to only use the given types."
-msgstr ""
-
-#: View/Events/automation.ctp:95;120;174;206;257
-msgid "All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:96
-msgid "All tags will be included even if not exportable."
-msgstr ""
-
-#: View/Events/automation.ctp:98
-msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
-msgstr ""
-
-#: View/Events/automation.ctp:100
-msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
-msgstr ""
-
-#: View/Events/automation.ctp:102
-msgid "Hash database export"
-msgstr ""
-
-#: View/Events/automation.ctp:103
-msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:104;188
-msgid "You can configure your tools to automatically download the following files"
-msgstr ""
-
-#: View/Events/automation.ctp:109
-msgid "The API's full format is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:111
-msgid "The export format, can be \"md5\" or \"sha1\""
-msgstr ""
-
-#: View/Events/automation.ctp:123
-msgid "For example, to only show sha1 values from events tagged tag1, use"
-msgstr ""
-
-#: View/Events/automation.ctp:126
-msgid "STIX export"
-msgstr ""
-
-#: View/Events/automation.ctp:127
-msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
-msgstr ""
-
-#: View/Events/automation.ctp:129
-msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:132;171
-msgid "The event's ID"
-msgstr ""
-
-#: View/Events/automation.ctp:133
-msgid "Encode attachments where applicable"
-msgstr ""
-
-#: View/Events/automation.ctp:151
-msgid "Various ways to narrow down the search results of the STIX export"
-msgstr ""
-
-#: View/Events/automation.ctp:152
-msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
-msgstr ""
-
-#: View/Events/automation.ctp:154
-msgid "To export the same events using a POST request use"
-msgstr ""
-
-#: View/Events/automation.ctp:156
-msgid "Together with this JSON object in the POST message"
-msgstr ""
-
-#: View/Events/automation.ctp:158
-msgid "XML is automagically assumed when using the stix export"
-msgstr ""
-
-#: View/Events/automation.ctp:160
-msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
-msgstr ""
-
-#: View/Events/automation.ctp:163
-msgid "RPZ export"
-msgstr ""
-
-#: View/Events/automation.ctp:164
-msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
-msgstr ""
-
-#: View/Events/automation.ctp:165
-msgid "It is possible to further restrict the exported values using the following filters"
-msgstr ""
-
-#: View/Events/automation.ctp:167
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
-"        "
-msgstr ""
-
-#: View/Events/automation.ctp:170
-msgid "Use semicolons instead (the search will automatically search for colons instead)"
-msgstr ""
-
-#: View/Events/automation.ctp:172
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
-msgstr ""
-
-#: View/Events/automation.ctp:173
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
-msgstr ""
-
-#: View/Events/automation.ctp:176
-msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:180
-msgid "To override the above values, either use the url parameters as described below"
-msgstr ""
-
-#: View/Events/automation.ctp:182
-msgid "or POST an XML or JSON object with the above listed options"
-msgstr ""
-
-#: View/Events/automation.ctp:186
-msgid "Text export"
-msgstr ""
-
-#: View/Events/automation.ctp:187
-msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:194
-msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
-msgstr ""
-
-#: View/Events/automation.ctp:197
-msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
-msgstr ""
-
-#: View/Events/automation.ctp:200
+#: View/Events/automation.ctp:28
+#: View/Events/legacy_automation.ctp:200
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'."
 msgstr ""
 
-#: View/Events/automation.ctp:201
-msgid "Only export the attributes of the given event ID"
+#: View/Events/automation.ctp:29
+#: View/Events/legacy_automation.ctp:278
+msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
 msgstr ""
 
-#: View/Events/automation.ctp:202
-msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+#: View/Events/automation.ctp:30;151
+#: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:207
-msgid "Include not published Events."
+#: View/Events/automation.ctp:31;152
+#: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:208;275
-msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:32
+#: View/Events/legacy_automation.ctp:282;307
+msgid "The events that should be included / excluded from the search"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:33
+#: View/Events/legacy_automation.ctp:283;308
+msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
+msgstr ""
+
+#: View/Events/automation.ctp:34
+#: View/Events/legacy_automation.ctp:284
+msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
+msgstr ""
+
+#: View/Events/automation.ctp:35
+#: View/Events/legacy_automation.ctp:285;309
+msgid "Restrict the results by uuid."
+msgstr ""
+
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:37
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:38
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:39
+#: View/Events/legacy_automation.ctp:288;311
+msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
+msgstr ""
+
+#: View/Events/automation.ctp:40
+#: View/Events/legacy_automation.ctp:289;313
+msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
+msgstr ""
+
+#: View/Events/automation.ctp:41
+#: View/Events/legacy_automation.ctp:314
+msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
+msgstr ""
+
+#: View/Events/automation.ctp:42
+#: View/Events/legacy_automation.ctp:315
+msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
+msgstr ""
+
+#: View/Events/automation.ctp:43
+#: View/Events/legacy_automation.ctp:316
+msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:44
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:45
+msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
+msgstr ""
+
+#: View/Events/automation.ctp:46
+msgid "Filter on the event's info field."
+msgstr ""
+
+#: View/Events/automation.ctp:47
+msgid "Search for a full or a substring (delimited by % for substrings) in the event info, event tags, attribute tags, attribute values or attribute comment fields."
+msgstr ""
+
+#: View/Events/automation.ctp:48
+msgid "CSV only, select the fields that you wish to include in the CSV export. By setting event level fields additionally, includeContext is not required to get event metadata."
+msgstr ""
+
+#: View/Events/automation.ctp:49
+msgid "CSV only, add additional event level data to the export. The additional fields can be added via requested_attributes too with more granularity."
+msgstr ""
+
+#: View/Events/automation.ctp:79
+msgid "CSV specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:81
+msgid "Limit the list of fields to be returned in the CSV."
+msgstr ""
+
+#: View/Events/automation.ctp:82
+msgid "Include the event level meta-data with each attribute."
+msgstr ""
+
+#: View/Events/automation.ctp:83
+msgid "The CSV created when this setting is set to true will not contain the header row."
+msgstr ""
+
+#: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
+msgid "RPZ specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:95
+#: View/Events/legacy_automation.ctp:164
+msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
+msgstr ""
+
+#: View/Events/automation.ctp:98
+#: View/Events/legacy_automation.ctp:176
+msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
+msgstr ""
+
+#: View/Events/automation.ctp:102
+#: View/Events/legacy_automation.ctp:180
+msgid "To override the above values, either use the url parameters as described below"
+msgstr ""
+
+#: View/Events/automation.ctp:104
+#: View/Events/legacy_automation.ctp:182
+msgid "or POST an XML or JSON object with the above listed options"
+msgstr ""
+
+#: View/Events/automation.ctp:108
+#: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
-msgstr ""
+msgstr "Bro IDS Export"
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:109
+#: View/Events/legacy_automation.ctp:212
 msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
 msgstr ""
 
-#: View/Events/automation.ctp:213
+#: View/Events/automation.ctp:110
+#: View/Events/legacy_automation.ctp:213
 msgid "You can configure your tools to automatically download a file one of the Bro types."
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:116
+#: View/Events/legacy_automation.ctp:219
 msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
 msgstr ""
 
-#: View/Events/automation.ctp:222
+#: View/Events/automation.ctp:119
+#: View/Events/legacy_automation.ctp:222
 msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
 msgstr ""
 
-#: View/Events/automation.ctp:240
+#: View/Events/automation.ctp:137
+#: View/Events/legacy_automation.ctp:240
 msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
 msgstr ""
 
-#: View/Events/automation.ctp:242
+#: View/Events/automation.ctp:139
+#: View/Events/legacy_automation.ctp:242
 msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:249;301
+#: View/Events/automation.ctp:146
+#: View/Events/legacy_automation.ctp:249;301
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
 "    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
 "    Use semicolons instead (the search will automatically search for colons instead)."
 msgstr ""
 
-#: View/Events/automation.ctp:252
+#: View/Events/automation.ctp:149
+#: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:150
+#: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:154
+#: View/Events/legacy_automation.ctp:95;120;174;206;257
+msgid "All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/automation.ctp:156
+#: View/Events/legacy_automation.ctp:41;70;97;122;259;290
+msgid "The keywords false or null should be used for optional empty parameters in the URL."
+msgstr ""
+
+#: View/Events/automation.ctp:157
+#: View/Events/legacy_automation.ctp:260
 msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
 msgstr ""
 
-#: View/Events/automation.ctp:263
-msgid "Searches with JSON/XML/OpenIOC results"
-msgstr ""
-
-#: View/Events/automation.ctp:264
-msgid "It is possible to search the database for attributes based on a list of criteria."
-msgstr ""
-
-#: View/Events/automation.ctp:265
-msgid "To return an event or a list of events in a desired format, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:267
-msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
-msgstr ""
-
-#: View/Events/automation.ctp:268;297
-msgid "Search for the given value in the attributes' value field."
-msgstr ""
-
-#: View/Events/automation.ctp:271;300
-msgid "Search by the creator organisation by supplying the organisation identifier."
-msgstr ""
-
-#: View/Events/automation.ctp:272
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
-msgstr ""
-
-#: View/Events/automation.ctp:278
-msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
-msgstr ""
-
-#: View/Events/automation.ctp:282;307
-msgid "The events that should be included / excluded from the search"
-msgstr ""
-
-#: View/Events/automation.ctp:283;308
-msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
-msgstr ""
-
-#: View/Events/automation.ctp:284
-msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
-msgstr ""
-
-#: View/Events/automation.ctp:285;309
-msgid "Restrict the results by uuid."
-msgstr ""
-
-#: View/Events/automation.ctp:286;310
-msgid "Restrict the results by the last publish timestamp (newer than)."
-msgstr ""
-
-#: View/Events/automation.ctp:287
-msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
-msgstr ""
-
-#: View/Events/automation.ctp:288;311
-msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
-msgstr ""
-
-#: View/Events/automation.ctp:289;313
-msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
-msgstr ""
-
-#: View/Events/automation.ctp:291
-msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
-msgstr ""
-
-#: View/Events/automation.ctp:294;320;349
-msgid "POST message payload (json)"
-msgstr ""
-
-#: View/Events/automation.ctp:296
-msgid "To just return a list of attributes, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:304
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
-msgstr ""
-
-#: View/Events/automation.ctp:305
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
-msgstr ""
-
-#: View/Events/automation.ctp:312
-msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
-msgstr ""
-
-#: View/Events/automation.ctp:314
-msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
-msgstr ""
-
-#: View/Events/automation.ctp:315
-msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
-msgstr ""
-
-#: View/Events/automation.ctp:316
-msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
-msgstr ""
-
-#: View/Events/automation.ctp:317
-msgid "Only return attributes from events that have received a modification after the given timestamp."
-msgstr ""
-
-#: View/Events/automation.ctp:322
-msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
-msgstr ""
-
-#: View/Events/automation.ctp:324
-msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
-"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:327
-msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
-msgstr ""
-
-#: View/Events/automation.ctp:329
+#: View/Events/automation.ctp:160
+#: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:330
+#: View/Events/automation.ctp:161
+#: View/Events/legacy_automation.ctp:330
 msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:332
+#: View/Events/automation.ctp:163
+#: View/Events/legacy_automation.ctp:332
 msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
 "    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
 "    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:168
+#: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:169
+#: View/Events/legacy_automation.ctp:338
 msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:340
+#: View/Events/automation.ctp:171
+#: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:341
+#: View/Events/automation.ctp:172
+#: View/Events/legacy_automation.ctp:341
 msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
 msgstr ""
 
-#: View/Events/automation.ctp:342
+#: View/Events/automation.ctp:173
+#: View/Events/legacy_automation.ctp:342
 msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
 msgstr ""
 
-#: View/Events/automation.ctp:343
+#: View/Events/automation.ctp:174
+#: View/Events/legacy_automation.ctp:343
 msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
 msgstr ""
 
-#: View/Events/automation.ctp:345
+#: View/Events/automation.ctp:176
+#: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:353
+#: View/Events/automation.ctp:180
+#: View/Events/legacy_automation.ctp:294;320;349
+msgid "POST message payload (json)"
+msgstr ""
+
+#: View/Events/automation.ctp:184
+#: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:354
+#: View/Events/automation.ctp:185
+#: View/Events/legacy_automation.ctp:354
 msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
 msgstr ""
 
-#: View/Events/automation.ctp:355
+#: View/Events/automation.ctp:186
+#: View/Events/legacy_automation.ctp:355
 msgid "If set, it will return all samples from events that have a match for the hash provided above."
 msgstr ""
 
-#: View/Events/automation.ctp:356
+#: View/Events/automation.ctp:187
+#: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:357
+#: View/Events/automation.ctp:188
+#: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:359
+#: View/Events/automation.ctp:190
+#: View/Events/legacy_automation.ctp:359
 msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
 msgstr ""
 
-#: View/Events/automation.ctp:360
+#: View/Events/automation.ctp:191
+#: View/Events/legacy_automation.ctp:360
 msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
 msgstr ""
 
-#: View/Events/automation.ctp:361
+#: View/Events/automation.ctp:192
+#: View/Events/legacy_automation.ctp:361
 msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
 msgstr ""
 
-#: View/Events/automation.ctp:362
+#: View/Events/automation.ctp:193
+#: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:371
+#: View/Events/automation.ctp:202
+#: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:372
+#: View/Events/automation.ctp:203
+#: View/Events/legacy_automation.ctp:372
 msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
 msgstr ""
 
-#: View/Events/automation.ctp:373
+#: View/Events/automation.ctp:204
+#: View/Events/legacy_automation.ctp:373
 msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:374
+#: View/Events/automation.ctp:205
+#: View/Events/legacy_automation.ctp:374
 msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
 msgstr ""
 
-#: View/Events/automation.ctp:375
+#: View/Events/automation.ctp:206
+#: View/Events/legacy_automation.ctp:375
 msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 msgstr ""
 
-#: View/Events/automation.ctp:376
+#: View/Events/automation.ctp:207
+#: View/Events/legacy_automation.ctp:376
 msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
 msgstr ""
 
-#: View/Events/automation.ctp:377
+#: View/Events/automation.ctp:208
+#: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:378
+#: View/Events/automation.ctp:209
+#: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:379
+#: View/Events/automation.ctp:210
+#: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr ""
 
-#: View/Events/automation.ctp:380
+#: View/Events/automation.ctp:211
+#: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:381
+#: View/Events/automation.ctp:212
+#: View/Events/legacy_automation.ctp:381
 msgid "You can add or remove an existing tag from an event in the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:384
+#: View/Events/automation.ctp:215
+#: View/Events/legacy_automation.ctp:384
 msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
 msgstr ""
 
-#: View/Events/automation.ctp:386
+#: View/Events/automation.ctp:217
+#: View/Events/legacy_automation.ctp:386
 msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:388
+#: View/Events/automation.ctp:219
+#: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:389
+#: View/Events/automation.ctp:220
+#: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr ""
 
-#: View/Events/automation.ctp:393
+#: View/Events/automation.ctp:224
+#: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
 
-#: View/Events/automation.ctp:394
+#: View/Events/automation.ctp:225
+#: View/Events/legacy_automation.ctp:394
 #: View/Pages/doc/using_the_system.ctp:445
-#: View/SharingGroups/add.ctp:52
-#: View/SharingGroups/edit.ctp:60
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
-#: View/Events/automation.ctp:395
+#: View/Events/automation.ctp:226
+#: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:396
+#: View/Events/automation.ctp:227
+#: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:397
-#: View/Servers/rest.ctp:53
+#: View/Events/automation.ctp:228
+#: View/Events/legacy_automation.ctp:397
+#: View/Servers/rest.ctp:115
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:402
+#: View/Events/automation.ctp:233
+#: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:404;424;425;431;432
+#: View/Events/automation.ctp:235;255;256;262;263
+#: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:409
+#: View/Events/automation.ctp:240
+#: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:411;418
+#: View/Events/automation.ctp:242;249
+#: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:416
+#: View/Events/automation.ctp:247
+#: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:423
+#: View/Events/automation.ctp:254
+#: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:430
+#: View/Events/automation.ctp:261
+#: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:437
+#: View/Events/automation.ctp:268
+#: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:439;446
+#: View/Events/automation.ctp:270;277
+#: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
 #: View/Pages/doc/using_the_system.ctp:254
 msgid "Message"
 msgstr ""
 
-#: View/Events/automation.ctp:444
+#: View/Events/automation.ctp:275
+#: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:449
+#: View/Events/automation.ctp:280
+#: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:454
+#: View/Events/automation.ctp:285
+#: View/Events/legacy_automation.ctp:454
 msgid "None of the above fields are mandatory, but at least one of them has to be provided."
 msgstr ""
 
-#: View/Events/automation.ctp:456
+#: View/Events/automation.ctp:287
+#: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:457
+#: View/Events/automation.ctp:288
+#: View/Events/legacy_automation.ctp:457
 msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
 msgstr ""
 
-#: View/Events/automation.ctp:461
+#: View/Events/automation.ctp:292
+#: View/Events/legacy_automation.ctp:461
 msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
 "    An example for a valid lookup"
 msgstr ""
 
-#: View/Events/automation.ctp:472
+#: View/Events/automation.ctp:303
+#: View/Events/legacy_automation.ctp:472
 msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
 msgstr ""
 
-#: View/Events/automation.ctp:473
+#: View/Events/automation.ctp:304
+#: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:474
+#: View/Events/automation.ctp:305
+#: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:475
+#: View/Events/automation.ctp:306
+#: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:476
+#: View/Events/automation.ctp:307
+#: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:477
+#: View/Events/automation.ctp:308
+#: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:478
+#: View/Events/automation.ctp:309
+#: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:479
+#: View/Events/automation.ctp:310
+#: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:480
+#: View/Events/automation.ctp:311
+#: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:481
+#: View/Events/automation.ctp:312
+#: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:482
+#: View/Events/automation.ctp:313
+#: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:483
+#: View/Events/automation.ctp:314
+#: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:484
+#: View/Events/automation.ctp:315
+#: View/Events/legacy_automation.ctp:484
 msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:485
+#: View/Events/automation.ctp:316
+#: View/Events/legacy_automation.ctp:485
 msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
+#: View/Events/automation.ctp:319
+msgid "Freetext Import API"
+msgstr ""
+
+#: View/Events/automation.ctp:321
+msgid "The freetext import tool is also exposed to the API."
+msgstr ""
+
+#: View/Events/automation.ctp:322
+msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
+msgstr ""
+
+#: View/Events/automation.ctp:323
+msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:324
+msgid "The contents of the POST body should be the text to be parsed."
+msgstr ""
+
 #: View/Events/contact.ctp:8
 msgid "Contact organization reporting event "
 msgstr ""
@@ -6364,7 +6755,7 @@ msgstr ""
 #: View/Events/export.ctp:26
 #: View/Pages/doc/using_the_system.ctp:378
 msgid "Last Update"
-msgstr ""
+msgstr "Letzte Aktualisierung"
 
 #: View/Events/export.ctp:28
 #: View/Pages/doc/using_the_system.ctp:380
@@ -6373,7 +6764,7 @@ msgstr ""
 
 #: View/Events/export.ctp:29
 msgid "Filesize"
-msgstr ""
+msgstr "Dateigröße"
 
 #: View/Events/export.ctp:30
 #: View/Pages/doc/administration.ctp:230
@@ -6391,7 +6782,7 @@ msgstr ""
 
 #: View/Events/export.ctp:81
 msgid "Loading…"
-msgstr ""
+msgstr "Wird geladen…"
 
 #: View/Events/export.ctp:100;104
 msgid "Generate"
@@ -6529,7 +6920,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:9;101
+#: View/Jobs/index.ctp:9;136
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr ""
@@ -6553,7 +6944,7 @@ msgid "All communities"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:53
+#: View/Feeds/index.ctp:103
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -6605,47 +6996,378 @@ msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/Organisations/view.ctp:97;98
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:33
 msgid "Events"
 msgstr ""
 
-#: View/Events/index.ctp:30
-msgid "Filter events"
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
 msgstr ""
 
-#: View/Events/index.ctp:31
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr ""
 
-#: View/Events/index.ctp:44
-msgid "Quickfilter"
+#: View/Events/index.ctp:73
+msgid "My events only"
 msgstr ""
 
-#: View/Events/index.ctp:44
-#: View/Organisations/index.ctp:59
-#: View/Servers/preview_index.ctp:45
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr ""
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr ""
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr ""
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
 msgid "Filter"
 msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My events only"
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
 msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My Events"
+#: View/Events/legacy_automation.ctp:3
+msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
+"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
 msgstr ""
 
-#: View/Events/index.ctp:72
-msgid "My organisation's events only"
+#: View/Events/legacy_automation.ctp:6
+msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
-#: View/Events/index.ctp:72
-msgid "Org Events"
+#: View/Events/legacy_automation.ctp:10
+msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:11
+msgid "Please use the use the following header"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:12
+msgid "Authorization"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:13
+msgid "XML Export"
+msgstr "XML-Export"
+
+#: View/Events/legacy_automation.ctp:14
+msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:15;47;76
+msgid "You can configure your tools to automatically download the following file"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:17
+msgid "If you only want to fetch a specific event append the eventid number"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:19;144
+msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:26
+msgid "The xml download also accepts two additional the following optional parameters in the URL"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:29;52;85
+msgid "Restrict the download to a single event"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:30
+msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:31;54;87;112;134
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:43
+msgid "Also check out the %s to read about the REST API."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:45
+msgid "CSV Export"
+msgstr "CSV-Export"
+
+#: View/Events/legacy_automation.ctp:46
+msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:49
+msgid "You can specify additional flags for CSV exports as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:53
+msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:58
+msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:63
+msgid "Include the event data with each attribute."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:66
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:67
+msgid "The CSV created when this setting is set to true will not contain the header row.\n"
+"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:71
+msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:74
+msgid "NIDS rules export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:75
+msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:81
+msgid "The full API syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:84
+msgid "The export format, can be \"suricata\" or \"snort\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:86
+msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:93
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:94
+msgid "Restrict the export to only use the given types."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:96
+msgid "All tags will be included even if not exportable."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:98
+msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:100
+msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:102
+msgid "Hash database export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:103
+msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:104;188
+msgid "You can configure your tools to automatically download the following files"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:109
+msgid "The API's full format is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:111
+msgid "The export format, can be \"md5\" or \"sha1\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:123
+msgid "For example, to only show sha1 values from events tagged tag1, use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:126
+msgid "STIX export"
+msgstr "STIX-Export"
+
+#: View/Events/legacy_automation.ctp:127
+msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:129
+msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:132;171
+msgid "The event's ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:133
+msgid "Encode attachments where applicable"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:151
+msgid "Various ways to narrow down the search results of the STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:152
+msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:154
+msgid "To export the same events using a POST request use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:156
+msgid "Together with this JSON object in the POST message"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:158
+msgid "XML is automagically assumed when using the stix export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:160
+msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:163
+msgid "RPZ export"
+msgstr "RPZ-Export"
+
+#: View/Events/legacy_automation.ctp:165
+msgid "It is possible to further restrict the exported values using the following filters"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:167
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
+"        "
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:170
+msgid "Use semicolons instead (the search will automatically search for colons instead)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:172
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:173
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:186
+msgid "Text export"
+msgstr "Text-Export"
+
+#: View/Events/legacy_automation.ctp:187
+msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:194
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:197
+msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:201
+msgid "Only export the attributes of the given event ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:202
+msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:207
+msgid "Include not published Events."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:208;275
+msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:263
+msgid "Searches with JSON/XML/OpenIOC results"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:267
+msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:272
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:291
+msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:296
+msgid "To just return a list of attributes, use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:304
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:305
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:312
+msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:322
+msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:324
+msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
+"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:327
+msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
 msgstr ""
 
 #: View/Events/merge.ctp:4
@@ -6671,21 +7393,21 @@ msgid "Proposals"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:93
+#: View/Events/view.ctp:106
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:113
-#: View/Jobs/index.ctp:65
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
 #: View/Logs/admin_search.ctp:6
 #: View/Pages/doc/administration.ctp:87;104;116;181;195
 #: View/Pages/doc/using_the_system.ctp:166
-#: View/Users/admin_view.ctp:24
-#: View/Users/view.ctp:9
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
 msgid "Email"
-msgstr ""
+msgstr "Email"
 
 #: View/Events/report_validation_issues_events.ctp:2
 msgid "Listing invalid event validations"
@@ -6761,16 +7483,13 @@ msgid "Successfully added attributes"
 msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Events/view.ctp:56
 #: View/Feeds/preview_event.ctp:11
 #: View/Galaxies/view.ctp:18
-#: View/ObjectTemplates/view.ctp:15
-#: View/Organisations/view.ctp:54
 #: View/Organisations/ajax/merge.ctp:58
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
-msgstr ""
+msgstr "UUID"
 
 #: View/Events/show_i_o_c_results.ctp:29
 msgid "Failed indicators"
@@ -6788,6 +7507,14 @@ msgstr ""
 msgid "Visualisation"
 msgstr ""
 
+#: View/Events/upload_analysis_file.ctp:6
+msgid "Import analysis file"
+msgstr ""
+
+#: View/Events/upload_analysis_file.ctp:61
+msgid "Create Objects"
+msgstr ""
+
 #: View/Events/upload_stix.ctp:6
 msgid "Import %s file"
 msgstr ""
@@ -6796,195 +7523,188 @@ msgstr ""
 msgid "%s file"
 msgstr ""
 
-#: View/Events/view.ctp:49
-msgid "Extended view"
+#: View/Events/upload_stix.ctp:24
+msgid "Include the original imported file as attachment"
 msgstr ""
 
-#: View/Events/view.ctp:51
+#: View/Events/view.ctp:53
 #: View/Servers/preview_event.ctp:12
 #: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Event ID"
 msgstr ""
 
-#: View/Events/view.ctp:63
+#: View/Events/view.ctp:57
 msgid "Source Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:68
+#: View/Events/view.ctp:66
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:83
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
 msgid "Owner org"
 msgstr ""
 
-#: View/Events/view.ctp:131
+#: View/Events/view.ctp:135
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
 #: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
 msgstr ""
 
-#: View/Events/view.ctp:139
+#: View/Events/view.ctp:140
 #: View/Feeds/preview_event.ctp:37
 #: View/Pages/doc/using_the_system.ctp:70;177;210
 #: View/Servers/preview_event.ctp:48
 msgid "Analysis"
 msgstr ""
 
-#: View/Events/view.ctp:159
+#: View/Events/view.ctp:161
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
-msgstr ""
+msgstr "Info"
 
-#: View/Events/view.ctp:165;167
+#: View/Events/view.ctp:165
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:169
+#: View/Events/view.ctp:173
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:171
-msgid "Last change"
+#: View/Events/view.ctp:177
+msgid "First recorded change"
 msgstr ""
 
-#: View/Events/view.ctp:176
+#: View/Events/view.ctp:181
+msgid "Last change"
+msgstr "Letzte Änderung"
+
+#: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:210
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:194
-msgid "Currently in "
+#: View/Events/view.ctp:217
+msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:202
-msgid "- restricted to own organisation only."
+#: View/Events/view.ctp:217
+msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:203
-msgid "Advanced Sightings"
-msgstr ""
-
-#: View/Events/view.ctp:219
-msgid "you"
-msgstr ""
-
-#: View/Events/view.ctp:220
-msgid " has"
-msgstr ""
-
-#: View/Events/view.ctp:223
-msgid "You have"
-msgstr ""
-
-#: View/Events/view.ctp:226
+#: View/Events/view.ctp:265
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:227
-msgid "%s requested that %s take over this event."
-msgstr ""
-
-#: View/Events/view.ctp:227
+#: View/Events/view.ctp:277
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:232
-msgid "Correlation"
-msgstr ""
-
-#: View/Events/view.ctp:238;247
-#: View/Users/admin_view.ctp:125
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:238
-msgid "enable"
-msgstr ""
-
-#: View/Events/view.ctp:242;249
-#: View/ObjectTemplates/index.ctp:32
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
 #: View/Taxonomies/view.ctp:24
-#: View/Warninglists/view.ctp:38
 msgid "Enabled"
 msgstr ""
 
-#: View/Events/view.ctp:242
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr ""
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:277
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr ""
+
+#: View/Events/view.ctp:328
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:335
+#: View/Events/view.ctp:386;415
 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."
+#: View/Events/view.ctp:387;416
+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
+#: View/Events/view.ctp:424
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "ATT&CK matrix"
-msgstr ""
+msgstr "ATT&CK Matrix"
 
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Discussion"
-msgstr ""
+msgstr "Diskussion"
 
 #: View/Events/view_graph.ctp:19
 msgid "Hover target"
@@ -7018,29 +7738,33 @@ msgstr ""
 msgid " Event #"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:7
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:6
 msgid "Publish Event%s"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:8
+msgid "Unpublish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:20
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
-#: View/Feeds/index.ctp:54
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Feeds/index.ctp:104
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
-msgstr ""
+msgstr "Veröffentlichen"
 
 #: View/Events/ajax/exportChoice.ctp:2
 msgid "Choose the format that you wish to download the event in"
 msgstr ""
 
-#: View/Events/ajax/exportChoice.ctp:17;18;27;28
-msgid "Export as %s"
-msgstr ""
-
 #: View/Events/ajax/importChoice.ctp:2
 msgid "Choose the format that you would like to use for the import"
 msgstr ""
@@ -7120,7 +7844,7 @@ msgstr ""
 #: View/Feeds/add.ctp:67
 #: View/Feeds/edit.ctp:44
 msgid "Username"
-msgstr ""
+msgstr "Username"
 
 #: View/Feeds/add.ctp:71
 #: View/Feeds/edit.ctp:48
@@ -7129,7 +7853,7 @@ msgstr ""
 #: View/Users/admin_edit.ctp:40
 #: View/Users/change_pw.ctp:9
 msgid "Password"
-msgstr ""
+msgstr "Passwort"
 
 #: View/Feeds/add.ctp:75
 #: View/Feeds/edit.ctp:52
@@ -7211,7 +7935,7 @@ msgstr ""
 
 #: View/Feeds/add.ctp:156
 #: View/Feeds/edit.ctp:153
-#: View/Feeds/index.ctp:55
+#: View/Feeds/index.ctp:105
 msgid "Delta Merge"
 msgstr ""
 
@@ -7252,16 +7976,16 @@ msgstr ""
 
 #: View/Feeds/add.ctp:196
 #: View/Feeds/edit.ctp:191
-#: View/Servers/add.ctp:113
-#: View/Servers/edit.ctp:152;158
+#: View/Servers/add.ctp:102
+#: View/Servers/edit.ctp:147;153
 msgid "Modify"
 msgstr ""
 
-#: View/Feeds/compare_feeds.ctp:58
+#: View/Feeds/compare_feeds.ctp:66
 msgid "None or less than 1% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
-#: View/Feeds/compare_feeds.ctp:59
+#: View/Feeds/compare_feeds.ctp:67
 msgid "%s\\% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
@@ -7282,53 +8006,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr ""
 
 #: View/Feeds/edit.ctp:207
-#: View/Servers/add.ctp:143
-#: View/Servers/edit.ctp:186
+#: View/Servers/add.ctp:132
+#: View/Servers/edit.ctp:181
 msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
 msgstr ""
 
 #: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:185
+#: View/Servers/add.ctp:133
+#: View/Servers/edit.ctp:180
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
 #: View/Feeds/edit.ctp:209
-#: View/Servers/add.ctp:145
-#: View/Servers/edit.ctp:187
+#: View/Servers/add.ctp:134
+#: View/Servers/edit.ctp:182
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:146
-#: View/Servers/edit.ctp:188
+#: View/Servers/add.ctp:135
+#: View/Servers/edit.ctp:183
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
 #: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:189
+#: View/Servers/add.ctp:136
+#: View/Servers/edit.ctp:184
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:212
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:185
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:191
+#: View/Servers/edit.ctp:186
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:192
+#: View/Servers/edit.ctp:187
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority."
 msgstr ""
 
 #: View/Feeds/edit.ctp:215
-#: View/Servers/add.ctp:151
-#: View/Servers/edit.ctp:194
+#: View/Servers/add.ctp:140
+#: View/Servers/edit.ctp:189
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -7342,7 +8066,7 @@ msgstr ""
 
 #: View/Feeds/freetext_index.ctp:35
 msgid "Correlations"
-msgstr ""
+msgstr "Korrelationen"
 
 #: View/Feeds/import_feeds.ctp:4
 msgid "Paste feed data"
@@ -7380,130 +8104,104 @@ msgstr ""
 msgid "Fetch and store all feed data"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
+#: View/Feeds/index.ctp:33
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
-msgid "Enable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:28
+#: View/Feeds/index.ctp:39
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:28
-msgid "Disable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:29
+#: View/Feeds/index.ctp:45
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:29
-msgid "Enable Caching for Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:51
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:30
-msgid "Disable Caching for  Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
-msgid "Default feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:61
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:31
+#: View/Feeds/index.ctp:66
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:32
+#: View/Feeds/index.ctp:71
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:32
-msgid "All Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:33
+#: View/Feeds/index.ctp:76
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:33
-msgid "Enabled Feeds"
+#: View/Feeds/index.ctp:95
+msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:48
+#: View/Feeds/index.ctp:96
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:98
 msgid "Feed Format"
 msgstr ""
 
-#: View/Feeds/index.ctp:50
-#: View/Jobs/index.ctp:76
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr ""
 
-#: View/Feeds/index.ctp:56
+#: View/Feeds/index.ctp:106
 msgid "Override IDS"
 msgstr ""
 
-#: View/Feeds/index.ctp:60
+#: View/Feeds/index.ctp:110
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:108
-#: View/Servers/index.ctp:73;74
+#: View/Feeds/index.ctp:158
+#: View/Servers/index.ctp:74;75
 msgid "Rules"
 msgstr ""
 
-#: View/Feeds/index.ctp:135
+#: View/Feeds/index.ctp:185
 msgid "Error: Invalid event!"
 msgstr ""
 
-#: View/Feeds/index.ctp:140
+#: View/Feeds/index.ctp:190
 msgid "Fixed event %s"
 msgstr ""
 
-#: View/Feeds/index.ctp:143
+#: View/Feeds/index.ctp:193
 msgid "New fixed event"
 msgstr ""
 
-#: View/Feeds/index.ctp:195
+#: View/Feeds/index.ctp:245
+#: View/Servers/index.ctp:94
 msgid "Age: "
 msgstr ""
 
-#: View/Feeds/index.ctp:197
+#: View/Feeds/index.ctp:247
+#: View/Servers/index.ctp:102
 msgid "Not cached"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:210
+#: View/Feeds/index.ctp:260
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 msgid "Are you sure you want to permanently remove the feed (%s)?"
 msgstr ""
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:267
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -7525,46 +8223,30 @@ msgid "Namespace"
 msgstr ""
 
 #: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:17
+#: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:19
+#: View/Warninglists/view.ctp:12
 msgid "Version"
+msgstr "Version"
+
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:2
-msgid "Select Cluster"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "Galaxy Cluster Deletion"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:11
-msgid "search clusters…"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies."
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:28
-msgid "Back to Galaxy Selection"
+#: View/GalaxyClusters/ajax/index.ctp:82
+msgid "Delete galaxy cluster"
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:2
-msgid "Select Cluster Source"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All clusters"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All Galaxies"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:2
-msgid "Select Galaxy Namespace Source"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All namespaces"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All Namespaces"
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
 msgstr ""
 
 #: View/Jobs/index.ctp:12
@@ -7579,37 +8261,37 @@ msgstr ""
 msgid "Completed."
 msgstr ""
 
-#: View/Jobs/index.ctp:63
+#: View/Jobs/index.ctp:68;98
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:74;99
 msgid "Show default queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:99
 #: View/Roles/admin_index.ctp:22
 #: View/Roles/index.ctp:22
 msgid "Default"
 msgstr ""
 
-#: View/Jobs/index.ctp:65
-msgid "Show email queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
-msgid "Show cache queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:101
 msgid "Cache"
 msgstr ""
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:127
 msgid "No worker active"
 msgstr ""
 
-#: View/Jobs/index.ctp:124
+#: View/Jobs/index.ctp:159
 msgid "View stacktrace"
 msgstr ""
 
@@ -7629,14 +8311,10 @@ msgstr ""
 msgid "No error data found. Generally job error data is purged from Redis after 24 hours, however, you can still view the errors in the log files in \"/app/tmp/logs\"."
 msgstr ""
 
-#: View/Jobs/ajax/error.ctp:34
-msgid "Close"
-msgstr ""
-
 #: View/Logs/admin_index.ctp:2
 #: View/Logs/event_index.ctp:6
 msgid "Logs"
-msgstr ""
+msgstr "Logs"
 
 #: View/Logs/admin_index.ctp:5
 msgid "Results for all log entries"
@@ -7674,22 +8352,20 @@ msgstr ""
 msgid "from IP"
 msgstr ""
 
-#: View/Logs/admin_index.ctp:20;21
-msgid "Search"
-msgstr ""
-
-#: View/Logs/admin_index.ctp:59
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr ""
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:50
-#: View/ObjectTemplates/view.ctp:13
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/Templates/view.ctp:33
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
 msgstr ""
 
@@ -7748,7 +8424,7 @@ msgstr ""
 
 #: View/Noticelists/index.ctp:35
 msgid "version"
-msgstr ""
+msgstr "Version"
 
 #: View/Noticelists/index.ctp:36
 #: View/Pages/doc/using_the_system.ctp:371
@@ -7775,12 +8451,12 @@ msgstr ""
 msgid "Target UUID"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:53
+#: View/ObjectReferences/ajax/add.ctp:54
 #: View/Objects/orphaned_object_diagnostics.ctp:38
 msgid "Object"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:68
+#: View/ObjectReferences/ajax/add.ctp:120
 msgid "Target Details"
 msgstr ""
 
@@ -7801,7 +8477,7 @@ msgid " The Attribute will be permanently deleted and unrecoverable. Also, this
 msgstr ""
 
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:24
-#: View/Pages/doc/categories_and_types.ctp:46
+#: View/Pages/doc/categories_and_types.ctp:40
 #: View/Pages/doc/md/categories_and_types.ctp:23
 msgid "Categories"
 msgstr ""
@@ -7822,43 +8498,35 @@ msgstr ""
 msgid "Object Template index"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:54
-#: View/ObjectTemplates/view.ctp:23
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:107
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:108
+#: View/ObjectTemplates/index.ctp:119
 msgid "Are you sure you want to delete template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:7
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/ObjectTemplates/view.ctp:33
 msgid " Object Template"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:9
-msgid "Object Template ID"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:2
-msgid "Select Object Category"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All meta-categories"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All Objects"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:50
-msgid "Back to categories"
-msgstr ""
-
 #: View/Objects/add.ctp:6
 msgid " Object"
 msgstr ""
@@ -7877,7 +8545,7 @@ msgstr ""
 
 #: View/Objects/add.ctp:92
 msgid "Save"
-msgstr ""
+msgstr "Speichern"
 
 #: View/Objects/add.ctp:93
 msgid "Name :: type"
@@ -7935,15 +8603,6 @@ msgstr ""
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:49
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/ajax/merge.ctp:65
-#: View/SharingGroups/add.ctp:32
-#: View/SharingGroups/edit.ctp:32
-msgid "UUID"
-msgstr ""
-
 #: View/Objects/ajax/delete.ctp:6
 msgid "Object Deletion"
 msgstr ""
@@ -7965,6 +8624,7 @@ msgid "Simply paste a list of all the organisation UUIDs that you wish to block
 msgstr ""
 
 #: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr ""
 
@@ -8089,9 +8749,9 @@ msgstr ""
 msgid "Click here"
 msgstr ""
 
-#: View/Organisations/index.ctp:5
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:51
+#: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr ""
@@ -8100,7 +8760,7 @@ msgstr ""
 msgid ", both local and remote"
 msgstr ""
 
-#: View/Organisations/index.ctp:9
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr ""
@@ -8109,7 +8769,7 @@ msgstr ""
 msgid " on other instances"
 msgstr ""
 
-#: View/Organisations/index.ctp:13
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr ""
@@ -8126,55 +8786,52 @@ msgstr ""
 msgid "View all"
 msgstr ""
 
-#: View/Organisations/index.ctp:65
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:30
 msgid "Logo"
 msgstr ""
 
-#: View/Organisations/index.ctp:76
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr ""
 
-#: View/Organisations/index.ctp:117
+#: View/Organisations/index.ctp:138
 #: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 ""
 
-#: View/Organisations/view.ctp:3
-msgid "Organisation "
-msgstr ""
-
-#: View/Organisations/view.ctp:7
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:4
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/Users/admin_view.ctp:9
-#: View/Users/view.ctp:4
-#: View/Warninglists/view.ctp:4
-msgid "Id"
-msgstr ""
-
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:12
 #: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr ""
 
-#: View/Organisations/view.ctp:26
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:40
-msgid "E-mail domain restrictions"
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
 msgstr ""
 
-#: View/Organisations/view.ctp:93;94
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr ""
+
+#: View/Organisations/view.ctp:62;63
 msgid "Members"
 msgstr ""
 
@@ -8187,7 +8844,6 @@ msgid "Available Organisations"
 msgstr ""
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
 msgid "Added Organisations"
 msgstr ""
 
@@ -8252,6 +8908,14 @@ msgstr ""
 msgid "Events need to have no validation issues"
 msgstr ""
 
+#: View/Pages/administration.ctp:15
+msgid "Recorrelate attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:16
+msgid "Recorrelate proposals"
+msgstr ""
+
 #: View/Pages/administration.ctp:18
 msgid "Verify Certificates"
 msgstr ""
@@ -8268,6 +8932,10 @@ msgstr ""
 msgid "Hotfix 2.3.57: Increase the max length of the organization field when adding a new server connection."
 msgstr ""
 
+#: View/Pages/administration.ctp:20
+msgid "Convert log fields to text"
+msgstr ""
+
 #: View/Pages/administration.ctp:20
 msgid "Hotfix 2.3.78: Some of the log fields that were varchar(255) ended up truncating the data. This function will change them to \"text\""
 msgstr ""
@@ -8280,18 +8948,34 @@ msgstr ""
 msgid "Hotfix 2.3.107: it was previously possible to get duplicate attribute UUIDs in the database, this script will remove all duplicates and ensure that duplicates will not be entered into the database in the future."
 msgstr ""
 
+#: View/Pages/administration.ctp:22
+msgid "Remove duplicate events (with the same UUID)"
+msgstr ""
+
 #: View/Pages/administration.ctp:22
 msgid "Hotfix 2.3.115: In some rare situations it could occur that a duplicate of an event was created on an instance, with the exact same uuid. This action will remove any such duplicates and make sure that this cannot happen again."
 msgstr ""
 
+#: View/Pages/administration.ctp:23
+msgid "Prune orphaned attributes"
+msgstr ""
+
 #: View/Pages/administration.ctp:23
 msgid "In some rare occasions it can happen that you end up with some attributes in your database that do not belong to an event - for example during a race condition between an event insert and a delete. This tool will collect and delete any such orphaned attributes. If you ever run into an issue where you cannot add an attribute with a specific valid value, this is probably the reason."
 msgstr ""
 
+#: View/Pages/administration.ctp:24
+msgid "Clean regex table of potentially malicious entries"
+msgstr ""
+
 #: View/Pages/administration.ctp:24
 msgid "Hotfix 2.3.160: Prior to this version it was possible for a user/admin with Regex permission to create a malicious regular expression that could be used to execute arbitrary code. Since this version it is no longer possible to input such expressions, but already existing malicious entries still have to be cleaned using this tool."
 msgstr ""
 
+#: View/Pages/administration.ctp:25
+msgid "Remove URL type attribute sanitisation"
+msgstr ""
+
 #: View/Pages/administration.ctp:25
 msgid "Hotfix 2.3.173: Sanitised URLs can cause issues with the NIDS exports and as of this version attributes will be modified on entry to correct this. To correct existing entries, run this script."
 msgstr ""
@@ -8345,7 +9029,6 @@ msgid "If the migration of your data from 2.4 is not complete this will lead to
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:3
-#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:3
 #: View/Pages/doc/general.ctp:3
 #: View/Pages/doc/quickstart.ctp:3;14
@@ -8355,7 +9038,6 @@ msgid "Quick Start"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:4
-#: View/Pages/doc/categories_and_types.ctp:4
 #: View/Pages/doc/concepts.ctp:4
 #: View/Pages/doc/general.ctp:4;14
 #: View/Pages/doc/quickstart.ctp:4
@@ -8365,7 +9047,6 @@ msgid "General Layout"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:5
-#: View/Pages/doc/categories_and_types.ctp:5
 #: View/Pages/doc/concepts.ctp:5;14
 #: View/Pages/doc/general.ctp:5
 #: View/Pages/doc/quickstart.ctp:5
@@ -8375,7 +9056,6 @@ msgid "General Concepts"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:6
-#: View/Pages/doc/categories_and_types.ctp:6
 #: View/Pages/doc/concepts.ctp:6
 #: View/Pages/doc/general.ctp:6
 #: View/Pages/doc/quickstart.ctp:6
@@ -8385,7 +9065,6 @@ msgid "User Management and Global actions"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:7
-#: View/Pages/doc/categories_and_types.ctp:7
 #: View/Pages/doc/concepts.ctp:7
 #: View/Pages/doc/general.ctp:7
 #: View/Pages/doc/quickstart.ctp:7
@@ -8428,7 +9107,7 @@ msgid "FAQ"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:22
-#: View/Pages/doc/categories_and_types.ctp:9
+#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:9
 #: View/Pages/doc/general.ctp:9
 #: View/Pages/doc/quickstart.ctp:9
@@ -8486,6 +9165,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
+#: View/Servers/edit.ctp:82
 msgid "Misc settings"
 msgstr ""
 
@@ -8704,8 +9384,8 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_view.ctp:40
-#: View/Users/view.ctp:34
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
 msgid "Authkey"
 msgstr ""
 
@@ -8758,8 +9438,8 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_view.ctp:29
-#: View/Users/view.ctp:24
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr ""
 
@@ -8780,8 +9460,6 @@ msgid "Shows the currently assigned NIDS ID."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:109;125
-#: View/Users/admin_view.ctp:100
-#: View/Users/view.ctp:55
 msgid "Termsaccepted"
 msgstr ""
 
@@ -8790,7 +9468,7 @@ msgid "This flag indicates whether the user has accepted the terms of use or not
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:110
-#: View/Users/admin_view.ctp:120
+#: View/Users/admin_view.ctp:84
 msgid "Newsread"
 msgstr ""
 
@@ -8852,7 +9530,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:133;184;197
 #: View/Pages/doc/using_the_system.ctp:269
-#: View/Taxonomies/view.ctp:78
+#: View/Taxonomies/view.ctp:89
 msgid "Action"
 msgstr ""
 
@@ -9329,16 +10007,16 @@ msgstr ""
 msgid "This will create a new password hash using the currently set salt."
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:13
+#: View/Pages/doc/categories_and_types.ctp:7
 msgid "Attribute Categories and Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:14
+#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/md/categories_and_types.ctp:1
 msgid "Attribute Categories vs. Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:80
+#: View/Pages/doc/categories_and_types.ctp:74
 msgid "Click here to get the .md version for gitbook generation."
 msgstr ""
 
@@ -9347,7 +10025,7 @@ msgid "Admins and Site Admins"
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:16
-msgid "There are two types of admins in MISP: Admins (also refered to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
+msgid "There are two types of admins in MISP: Admins (also referred to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:17
@@ -9478,10 +10156,6 @@ msgstr ""
 msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:20
-msgid "Event Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:20
 msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
 msgstr ""
@@ -9490,18 +10164,10 @@ msgstr ""
 msgid "Input filters alter what and how data can be entered into this instance. Apart from the basic validation of attribute entry by type, it is possible for the site administrators to define regular expression replacements and blacklists for certain values in addition to blocking certain values from being exportable. Users can view these replacement and blacklist rules here whilst administrator can alter them."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:22;54
-msgid "Global Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:22
 msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:23;66
-msgid "Sync Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:23
 msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
 msgstr ""
@@ -9627,6 +10293,11 @@ msgstr ""
 msgid "A link to this user guide."
 msgstr ""
 
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr ""
+
 #: View/Pages/doc/general.ctp:61
 msgid "View the terms &amp; conditions again."
 msgstr ""
@@ -9892,7 +10563,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:47
+#: View/Users/statistics_data.ctp:53
 msgid "Activity Heatmap"
 msgstr ""
 
@@ -10814,12 +11485,6 @@ msgstr ""
 msgid "As described earlier, users with tagging rights can arbitrarily tag events using tags chosen from a pool of available options. If you have tagging privileges and would like to create a new tag, navigate to Event Actions - Add Tag. You'll be presented with the following form"
 msgstr ""
 
-#: View/Pages/doc/using_the_system.ctp:303
-#: View/Templates/add.ctp:17
-#: View/Templates/edit.ctp:17
-msgid "Add tag"
-msgstr ""
-
 #: View/Pages/doc/using_the_system.ctp:303
 msgid "Enter a name for the tag and click on the color field to be able to pick a colour for it."
 msgstr ""
@@ -11149,8 +11814,8 @@ msgid "Make sure that you enter the authentication key that you have been given
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:397
-#: View/Servers/add.ctp:7
-#: View/Servers/edit.ctp:7
+#: View/Servers/add.ctp:8
+#: View/Servers/edit.ctp:8
 msgid "Base URL"
 msgstr ""
 
@@ -11251,7 +11916,7 @@ msgid "Clicking the delete button will delete the link to the instance."
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:418
-#: View/Servers/index.ctp:92
+#: View/Servers/index.ctp:128
 msgid "Push all"
 msgstr ""
 
@@ -11260,7 +11925,7 @@ msgid " By clicking this button, all events that are eligible to be pushed on th
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:419
-#: View/Servers/index.ctp:89
+#: View/Servers/index.ctp:125
 msgid "Pull all"
 msgstr ""
 
@@ -11414,7 +12079,7 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
-#: View/Roles/view.ctp:14
+#: View/Roles/view.ctp:5
 msgid "Permission level"
 msgstr ""
 
@@ -11422,136 +12087,155 @@ msgstr ""
 msgid "Add Server"
 msgstr ""
 
-#: View/Servers/add.ctp:10
-#: View/Servers/edit.ctp:10
+#: View/Servers/add.ctp:6
+#: View/Servers/edit.ctp:6
+msgid "Instance identification"
+msgstr ""
+
+#: View/Servers/add.ctp:11
+#: View/Servers/edit.ctp:11
 msgid "Instance name"
 msgstr ""
 
-#: View/Servers/add.ctp:16
+#: View/Servers/add.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change."
 msgstr ""
 
-#: View/Servers/add.ctp:19
-#: View/Servers/edit.ctp:19
+#: View/Servers/add.ctp:20
+#: View/Servers/edit.ctp:20
 msgid "Internal instance"
 msgstr ""
 
-#: View/Servers/add.ctp:29
+#: View/Servers/add.ctp:30
+#: View/Servers/edit.ctp:31
+msgid "Instance ownership and credentials"
+msgstr ""
+
+#: View/Servers/add.ctp:31
+#: View/Servers/edit.ctp:32
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr ""
 
-#: View/Servers/add.ctp:35
+#: View/Servers/add.ctp:37
 msgid "Remote Sync Organisation Type"
 msgstr ""
 
-#: View/Servers/add.ctp:40
-#: View/Servers/edit.ctp:37
+#: View/Servers/add.ctp:42
+#: View/Servers/edit.ctp:43
 msgid "External Organisation"
 msgstr ""
 
-#: View/Servers/add.ctp:46
-#: View/Servers/edit.ctp:48
-msgid "Local Organisation"
+#: View/Servers/add.ctp:48
+msgid "Owner of remote instance"
 msgstr ""
 
-#: View/Servers/add.ctp:52
-#: View/Servers/edit.ctp:59
+#: View/Servers/add.ctp:54
+#: View/Servers/edit.ctp:65
 msgid "Remote Organisation's Name"
 msgstr ""
 
-#: View/Servers/add.ctp:56
-#: View/Servers/edit.ctp:63
+#: View/Servers/add.ctp:58
+#: View/Servers/edit.ctp:69
 msgid "Remote Organisation's Uuid"
 msgstr ""
 
-#: View/Servers/add.ctp:97
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:78
+msgid "Enabled synchronisation methods"
+msgstr ""
+
+#: View/Servers/add.ctp:86
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:103
+#: View/Servers/add.ctp:92
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:108
-#: View/Servers/edit.ctp:147
+#: View/Servers/add.ctp:97
+#: View/Servers/edit.ctp:142
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:109;115
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:98;104
+#: View/Servers/edit.ctp:143;149
 msgid "Events with the following tags allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:110;116
-#: View/Servers/edit.ctp:149;155
+#: View/Servers/add.ctp:99;105
+#: View/Servers/edit.ctp:144;150
 msgid "Events with the following tags blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:111;117
-#: View/Servers/edit.ctp:150;156
+#: View/Servers/add.ctp:100;106
+#: View/Servers/edit.ctp:145;151
 msgid "Events with the following organisations allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:112;118
-#: View/Servers/edit.ctp:151;157
+#: View/Servers/add.ctp:101;107
+#: View/Servers/edit.ctp:146;152
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:114
-#: View/Servers/edit.ctp:153
+#: View/Servers/add.ctp:103
+#: View/Servers/edit.ctp:148
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:142
-#: View/Servers/edit.ctp:184
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:179
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:148
+#: View/Servers/add.ctp:137
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:149
+#: View/Servers/add.ctp:138
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:150
+#: View/Servers/add.ctp:139
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr ""
 
-#: View/Servers/edit.ctp:16
+#: View/Servers/edit.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change. This also requires that the current instance's host organisation and the remote sync organisation are the same."
 msgstr ""
 
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:37
 msgid "Organisation Type"
 msgstr ""
 
-#: View/Servers/edit.ctp:69
+#: View/Servers/edit.ctp:54
+msgid "Local Organisation"
+msgstr ""
+
+#: View/Servers/edit.ctp:75
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:104
+#: View/Servers/edit.ctp:99
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:112;134
+#: View/Servers/edit.ctp:107;129
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:113;135
+#: View/Servers/edit.ctp:108;130
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:126
+#: View/Servers/edit.ctp:121
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:193
+#: View/Servers/edit.ctp:188
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:250;254
+#: View/Servers/edit.ctp:245;249
 msgid "Not set."
 msgstr ""
 
@@ -11564,7 +12248,7 @@ msgid "Example:"
 msgstr ""
 
 #: View/Servers/filter_event_index.ctp:21
-msgid "Apply filters to the remote instance"
+msgid "Apply filters to the remote instance's index"
 msgstr ""
 
 #: View/Servers/index.ctp:2
@@ -11575,34 +12259,38 @@ msgstr ""
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:30
+#: View/Servers/index.ctp:31
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Internal instance that ignores distribution level degradation *WARNING: Only use this setting if you have several internal instances and the sync link is to an internal extension of the current MISP community*"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:86
+#: View/Servers/index.ctp:122
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:88
+#: View/Servers/index.ctp:124
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
+#: View/Servers/index.ctp:131
+msgid "Cache instance"
+msgstr ""
+
 #: View/Servers/preview_event.ctp:7
 msgid "You are currently viewing an event on the remote instance %s "
 msgstr ""
@@ -11619,15 +12307,15 @@ msgstr ""
 msgid "You are currently viewing the event index of the remote instance %s"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "published"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:147
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr ""
 
@@ -11671,19 +12359,23 @@ msgstr ""
 msgid "No succeeded pushes"
 msgstr ""
 
-#: View/Servers/rest.ctp:7;17
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:54
+#: View/Servers/rest.ctp:116
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:55
+#: View/Servers/rest.ctp:117
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:56
+#: View/Servers/rest.ctp:118
 msgid "Headers"
 msgstr ""
 
@@ -11703,6 +12395,10 @@ msgstr ""
 msgid "Available Instances"
 msgstr ""
 
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
+msgid "Added Instances"
+msgstr ""
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 msgid "Add servers to sharing group"
 msgstr ""
@@ -11750,39 +12446,31 @@ msgstr ""
 msgid "IDS Signature?"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:21
-msgid "Only list proposals of my organisation"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:21
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:26
-msgid "List all proposals"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:26
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:33
+#: View/ShadowAttributes/index.ctp:43
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:39
+#: View/ShadowAttributes/index.ctp:49
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:45
+#: View/ShadowAttributes/index.ctp:55
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:71
+#: View/ShadowAttributes/index.ctp:81
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:73
+#: View/ShadowAttributes/index.ctp:83
 msgid "New Attribute"
 msgstr ""
 
@@ -11810,166 +12498,166 @@ msgstr ""
 msgid "New Sharing Group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
-msgid "General tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
 msgid "General"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
 msgid "Organisations tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
-msgid "MISP instances tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
 msgid "MISP Instances"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
-msgid "Sharing group summary"
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:12
-#: View/SharingGroups/edit.ctp:12
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
 msgid "Example: Multinational sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:13
-#: View/SharingGroups/edit.ctp:13
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
 msgid "Releasable to"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:14
-#: View/SharingGroups/edit.ctp:14
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
 msgid "Example: Community1, Organisation1, Organisation2"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:16
-#: View/SharingGroups/edit.ctp:16
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
 msgid "A description of the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:18
-#: View/SharingGroups/edit.ctp:18
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
 msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:19
-#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
 msgid "Make the sharing group selectable (active)"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:21;38;59
-#: View/SharingGroups/edit.ctp:21;38;67
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
 msgid "Next page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation(s) to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisations to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:33
-#: View/SharingGroups/edit.ctp:33
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
 #: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:37;58;74
-#: View/SharingGroups/edit.ctp:37;66;82
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
 msgid "Previous page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:42
-#: View/SharingGroups/edit.ctp:50
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
 msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:43
-#: View/SharingGroups/edit.ctp:51
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
 msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:47
-#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:53
-#: View/SharingGroups/edit.ctp:61
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
 #: View/SharingGroups/view.ctp:69
 msgid "All orgs"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:63
+#: View/SharingGroups/add.ctp:103
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:64
+#: View/SharingGroups/add.ctp:104
 msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/add.ctp:105
 msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/add.ctp:106
 msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:67
-#: View/SharingGroups/edit.ctp:75
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
 msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:75
-#: View/SharingGroups/edit.ctp:83
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
 msgid "Submit and create sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:95
+#: View/SharingGroups/add.ctp:135
 msgid "Local instance"
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:71
+#: View/SharingGroups/edit.ctp:111
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
 "                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
 "                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:74
+#: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
@@ -11977,23 +12665,15 @@ msgstr ""
 msgid "Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:20
-msgid "View only active sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:20
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:21
-msgid "View only passive sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:21
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:61
+#: View/SharingGroups/index.ctp:80
 msgid "Distribution List"
 msgstr ""
 
@@ -12037,6 +12717,18 @@ msgstr ""
 msgid "Delete sighting"
 msgstr ""
 
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
+msgid "Add Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
+msgstr ""
+
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
 msgid "Remove Sighting"
 msgstr ""
@@ -12049,6 +12741,26 @@ msgstr ""
 msgid "Remove sighting"
 msgstr ""
 
+#: View/TagCollections/add.ctp:8
+msgid "Edit Tag Collection"
+msgstr ""
+
+#: View/TagCollections/add.ctp:16
+msgid "Visible to all orgs"
+msgstr ""
+
+#: View/TagCollections/import.ctp:4
+msgid "Paste tag collection data"
+msgstr ""
+
+#: View/TagCollections/import.ctp:5
+msgid "Paste a MISP tag collection JSON below to add tag collections."
+msgstr ""
+
+#: View/TagCollections/import.ctp:10
+msgid "Tag collection JSON"
+msgstr ""
+
 #: View/Tags/add.ctp:12
 #: View/Tags/edit.ctp:12
 msgid "Restrict tagging to org"
@@ -12059,6 +12771,10 @@ msgstr ""
 msgid "Restrict tagging to user"
 msgstr ""
 
+#: View/Tags/edit.ctp:31
+msgid "Unselectable Tag"
+msgstr ""
+
 #: View/Tags/index.ctp:10
 msgid "Your Favourite Tags"
 msgstr ""
@@ -12091,57 +12807,6 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:2
-msgid "Select Tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:16
-#: View/Tags/ajax/taxonomy_choice.ctp:4
-msgid "search tags…"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:25
-msgid "Attach tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Return to taxonomy selection"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Select Taxonomy"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Back to Taxonomy Selection"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:2
-msgid "Select Tag Source"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:10
-msgid "Favourite Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:14
-msgid "Custom Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:17
-msgid "All Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:21
-#: View/Taxonomies/view.ctp:2
-msgid "Taxonomy Library"
-msgstr ""
-
 #: View/Tasks/index.ctp:4
 msgid "Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks."
 msgstr ""
@@ -12179,7 +12844,8 @@ msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:41
-#: View/Taxonomies/view.ctp:29;143
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr ""
 
@@ -12189,7 +12855,8 @@ msgid "Are you sure you want to disable this taxonomy library?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:31;147
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr ""
 
@@ -12206,19 +12873,27 @@ msgstr ""
 msgid "Create and/or update selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:116
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
 msgid "Hidden"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:125
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:142
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:147
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr ""
 
@@ -12246,6 +12921,30 @@ msgstr ""
 msgid "Create / update all taxonomy entries as tags"
 msgstr ""
 
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
 #: View/TemplateElements/ajax/ajaxIndex.ctp:2
 msgid "Template Elements"
 msgstr ""
@@ -12498,6 +13197,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
 msgid "Terms accepted"
 msgstr ""
 
@@ -12564,15 +13265,19 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: View/Users/admin_email.ctp:36
+#: View/Users/admin_email.ctp:19
+msgid "All users of the same organisation"
+msgstr ""
+
+#: View/Users/admin_email.ctp:39
 msgid "Enter a custom message"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "New user registration"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "Password reset"
 msgstr ""
 
@@ -12596,10 +13301,6 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: View/Users/admin_index.ctp:40
-msgid "Filter user index"
-msgstr ""
-
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr ""
@@ -12612,42 +13313,48 @@ msgstr ""
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr ""
 
-#: View/Users/admin_view.ctp:35
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
 msgid "Contactalert"
 msgstr ""
 
-#: View/Users/admin_view.ctp:46
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/admin_view.ctp:44
 msgid "Invited By"
 msgstr ""
 
-#: View/Users/admin_view.ctp:51
-msgid "Org admin"
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:74
-#: View/Users/view.ctp:67
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr ""
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:80
-#: View/Users/view.ctp:73
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
 msgid "GnuPG status"
 msgstr ""
 
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:83
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
 msgid "SMIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:95
-msgid "Nids Sid"
-msgstr ""
-
-#: View/Users/admin_view.ctp:110
-msgid "Password change"
-msgstr ""
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr ""
@@ -12680,37 +13387,37 @@ msgid "Proposals active"
 msgstr ""
 
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:34
+#: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
 msgstr ""
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:39
+#: View/Users/statistics_data.ctp:45
 msgid "Discussion posts"
 msgstr ""
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:48
+#: View/Users/statistics_data.ctp:54
 msgid "A heatmap showing user activity for each day during this month and the 4 months that preceded it. Use the buttons below to only show the heatmap of a specific organisation."
 msgstr ""
 
 #: View/Users/statistics.ctp:60
-#: View/Users/statistics_data.ctp:65
+#: View/Users/statistics_data.ctp:71
 msgid "Go left"
 msgstr ""
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:71
+#: View/Users/statistics_data.ctp:77
 msgid "Go right"
 msgstr ""
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:118
+#: View/Users/statistics_data.ctp:124
 msgid "The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings."
 msgstr ""
 
 #: View/Users/statistics.ctp:117
-#: View/Users/statistics_data.ctp:122
+#: View/Users/statistics_data.ctp:128
 msgid "The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer."
 msgstr ""
 
@@ -12718,6 +13425,18 @@ msgstr ""
 msgid "A heatmap showing the usage of ATT&CK Tactic."
 msgstr ""
 
+#: View/Users/statistics_data.ctp:32
+msgid "Users with PGP keys"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:36
+msgid "Local Organisations"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:38
+msgid "Average Users / Org"
+msgstr ""
+
 #: View/Users/statistics_orgs.ctp:17
 msgid "Organisation list"
 msgstr ""
@@ -12786,12 +13505,12 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
-#: View/Users/view.ctp:45
-msgid "Request API access"
+#: View/Users/ajax/emailConfirmTemplate.ctp:2
+msgid "Confirm sending"
 msgstr ""
 
-#: View/Users/view.ctp:50
-msgid "NIDS Start SID"
+#: View/Users/ajax/emailConfirmTemplate.ctp:4
+msgid "You are about to send a mail to %s recipient(s)?"
 msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:2
@@ -12854,7 +13573,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:29
+#: View/Warninglists/view.ctp:14;16
 msgid "Accepted attribute types"
 msgstr ""
 
@@ -12930,6 +13649,7 @@ msgstr ""
 #: Model/Attribute.php:validation for field uuid
 #: Model/Event.php:validation for field uuid;validation for field extends_uuid
 #: Model/EventBlacklist.php:validation for field event_uuid
+#: Model/MispObject.php:validation for field uuid
 #: Model/OrgBlacklist.php:validation for field org_uuid
 #: Model/Organisation.php:validation for field uuid
 #: Model/ShadowAttribute.php:validation for field uuid
@@ -12938,6 +13658,7 @@ msgid "Please provide a valid UUID"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/MispObject.php:validation for field uuid
 msgid "The UUID provided is not unique"
 msgstr ""
 
@@ -12957,6 +13678,7 @@ msgstr ""
 #: Model/ServerTag.php:validation for field server_id;validation for field tag_id
 #: Model/SharingGroup.php:validation for field name
 #: Model/Tag.php:validation for field name;validation for field colour
+#: Model/TagCollection.php:validation for field name
 #: Model/TemplateElementAttribute.php:validation for field name;validation for field description
 #: Model/ThreatLevel.php:validation for field name;validation for field description;validation for field form_description
 #: Model/User.php:validation for field org_id;validation for field authkey
@@ -13056,6 +13778,7 @@ msgid "This field is required."
 msgstr ""
 
 #: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
 #: Model/Whitelist.php:validation for field name
 msgid "A similar name already exists."
 msgstr ""
diff --git a/app/Locale/fra/LC_MESSAGES/cake_dev.po b/app/Locale/fra/LC_MESSAGES/cake_dev.po
old mode 100644
new mode 100755
diff --git a/app/Locale/fra/LC_MESSAGES/default.po b/app/Locale/fra/LC_MESSAGES/default.po
index 50fecebaf..a90c69b26 100644
--- a/app/Locale/fra/LC_MESSAGES/default.po
+++ b/app/Locale/fra/LC_MESSAGES/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-01-22 21:22\n"
+"PO-Revision-Date: 2019-03-06 02:02\n"
 "Last-Translator: SteveClement <steve@localhost.lu>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -15,272 +15,285 @@ msgstr ""
 "Language: fr_FR\n"
 
 #: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:149;153;157
+#: Controller/AttributesController.php:125;129;133
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1001;1348;1352;1356;1385;1800;1876;1880;1884;2102;2166;2248;2903;5264;5429;5433;5442
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
 #: Controller/PostsController.php:56
+#: Model/Galaxy.php:292
 msgid "Invalid event"
 msgstr "Evénement invalide"
 
-#: Controller/AppController.php:607
+#: Console/Command/ServerShell.php:49
+#: Controller/ServersController.php:632
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+msgstr "Pull terminé. %s événements tirés, %s événements n'ont pas pu être tirés, %s propositions tirées."
+
+#: Console/Command/ServerShell.php:51
+msgid "ERROR: %s"
+msgstr "ERREUR : %s"
+
+#: Controller/AppController.php:383
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr "Une erreur s'est produite. Votre compte d'utilisateur avec lequel vous êtes authentifié n'existe plus."
+
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
+msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+msgstr "Cette clé d'authentification n'est pas autorisée à effectuer des exports. Merci de contacter votre administrateur."
+
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
+msgid "You have to be logged in to do that."
+msgstr "Vous devez être connecté pour cette action."
+
+#: Controller/AppController.php:627
+msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
+msgstr "Indiquez les termes de recherche dans l'url, ou POSTez un json avec les paramètres du filtre."
+
+#: Controller/AppController.php:752
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Terminé. attribute_count généré pour "
 
-#: Controller/AppController.php:726
-#: Controller/AttributesController.php:2668
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
 #: Controller/ShadowAttributesController.php:1276
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "Tâche mise en attente. Vous pouvez visualiser sa progression en accédant à la page des tâches actives (administration -> jobs)."
 
-#: Controller/AttributesController.php:140;1392
+#: Controller/AttributesController.php:116;1403
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "Aucun ID défini pour cet événement."
 
-#: Controller/AttributesController.php:143
+#: Controller/AttributesController.php:119
 msgid "You don't have permissions to create attributes"
 msgstr "Vous n'avez pas la permission de créer des attributs."
 
-#: Controller/AttributesController.php:163;489;666
+#: Controller/AttributesController.php:139;488;668
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1684;1705;1739
-#: Controller/ObjectsController.php:442
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
 msgid "You do not have permission to do that."
 msgstr "Vous n'avez pas la permission d'effectuer cette action."
 
-#: Controller/AttributesController.php:414;864;869;873;1072;1152;2684;2698;2731;2753;2762;3309;3313;3409;3413
-#: Controller/ShadowAttributesController.php:824;1067;1091;1124;1134
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
 #: Controller/TagsController.php:491
 msgid "Invalid attribute"
 msgstr "Attribut invalide"
 
-#: Controller/AttributesController.php:424
-#: Controller/ShadowAttributesController.php:500
+#: Controller/AttributesController.php:421
+#: Controller/ShadowAttributesController.php:499
 msgid "You do not have the permission to view this event."
 msgstr "Vous n'avez pas la permission de visualiser cet événement."
 
-#: Controller/AttributesController.php:472
+#: Controller/AttributesController.php:468
 msgid "Attribute not an attachment or malware-sample"
 msgstr "L'attribut n'est pas une pièce jointe ou un échantillon de maliciel"
 
-#: Controller/AttributesController.php:504;677
-#: Controller/ShadowAttributesController.php:548
-msgid "PHP says file was not uploaded. Are you attacking me?"
-msgstr "PHP indique que le fichier n'a pas été téléversé. M'attaqueriez vous ?"
-
-#: Controller/AttributesController.php:680
-#: Controller/ShadowAttributesController.php:551;561
-msgid "There was a problem to upload the file."
-msgstr "Le fichier n’a pas pu être envoyé."
-
-#: Controller/AttributesController.php:824
-msgid "The ThreatConnect data has been imported."
-msgstr "Les données ThreatConnect ont été importées."
-
-#: Controller/AttributesController.php:827
-msgid "%s entries imported."
-msgstr "%s entrée(s) importées."
-
-#: Controller/AttributesController.php:831
-msgid "%s entries could not be imported."
-msgstr "%s entrées n'ont pas pu être importées."
-
-#: Controller/AttributesController.php:881;924;926
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "Attribut invalide."
-
-#: Controller/AttributesController.php:920
-msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
-msgstr "L'attribut ne peut être sauvegardé. L'attribut présent dans la requête n'est pas plus récent que l'attribut présent localement."
-
-#: Controller/AttributesController.php:936;1401
-#: Controller/EventsController.php:4635;4648;5213;5227
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
 msgid "Invalid Event."
 msgstr "Événement invalide."
 
-#: Controller/AttributesController.php:953
+#: Controller/AttributesController.php:503;679
+#: Controller/ShadowAttributesController.php:546
+msgid "PHP says file was not uploaded. Are you attacking me?"
+msgstr "PHP indique que le fichier n'a pas été téléversé. M'attaqueriez vous ?"
+
+#: Controller/AttributesController.php:682
+#: Controller/ShadowAttributesController.php:549;559
+msgid "There was a problem to upload the file."
+msgstr "Le fichier n’a pas pu être envoyé."
+
+#: Controller/AttributesController.php:826
+msgid "The ThreatConnect data has been imported."
+msgstr "Les données ThreatConnect ont été importées."
+
+#: Controller/AttributesController.php:829
+msgid "%s entries imported."
+msgstr "%s entrée(s) importées."
+
+#: Controller/AttributesController.php:833
+msgid "%s entries could not be imported."
+msgstr "%s entrées n'ont pas pu être importées."
+
+#: Controller/AttributesController.php:883;931;933
+#: Controller/ShadowAttributesController.php:829
+msgid "Invalid attribute."
+msgstr "Attribut invalide."
+
+#: Controller/AttributesController.php:927
+msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
+msgstr "L'attribut ne peut être sauvegardé. L'attribut présent dans la requête n'est pas plus récent que l'attribut présent localement."
+
+#: Controller/AttributesController.php:960
 msgid "The attribute has been saved"
 msgstr "L'attribut a été sauvegardé"
 
-#: Controller/AttributesController.php:985
+#: Controller/AttributesController.php:995
 msgid "The attribute could not be saved. Please, try again."
 msgstr "L'attribut n'a pas pu être sauvegardé. Merci de réessayer."
 
-#: Controller/AttributesController.php:1076
+#: Controller/AttributesController.php:1087
 msgid "Invalid event id."
 msgstr "ID d'événement invalide."
 
-#: Controller/AttributesController.php:1106
-#: Controller/EventsController.php:2023
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
+#: Controller/ShadowAttributesController.php:729
 msgid "Invalid input."
 msgstr "Saisie incorrecte."
 
-#: Controller/AttributesController.php:1111
+#: Controller/AttributesController.php:1122
 msgid "Invalid field."
 msgstr "Champ invalide."
 
-#: Controller/AttributesController.php:1156
+#: Controller/AttributesController.php:1167
 msgid "Invalid attribute id."
 msgstr "ID d'attribut invalide."
 
-#: Controller/AttributesController.php:1231;1241
+#: Controller/AttributesController.php:1242;1252
 msgid "Attribute deleted"
 msgstr "Attribut supprimé"
 
-#: Controller/AttributesController.php:1236;1238
+#: Controller/AttributesController.php:1247;1249
 msgid "Attribute was not deleted"
 msgstr "L'attribut n' a pas été supprimé"
 
-#: Controller/AttributesController.php:1263;3155
-#: Controller/ShadowAttributesController.php:864
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
 msgid "Invalid Attribute"
 msgstr "Attribut invalide"
 
-#: Controller/AttributesController.php:1290
+#: Controller/AttributesController.php:1301
 msgid "Could not restore the attribute"
 msgstr "L'attribut n'a pu être restauré"
 
-#: Controller/AttributesController.php:1311;1318;1322
+#: Controller/AttributesController.php:1322;1329;1333
 msgid "Attribute not found or not authorised."
 msgstr "L'attribut est introuvable ou non autorisé."
 
-#: Controller/AttributesController.php:1372
+#: Controller/AttributesController.php:1383
 msgid "This function is only accessible via POST requests."
 msgstr "Cette fonction est disponible uniquement via une requête POST."
 
-#: Controller/AttributesController.php:1427
+#: Controller/AttributesController.php:1438
 msgid "No matching attributes found."
 msgstr "Aucun attribut correspondant trouvé."
 
-#: Controller/AttributesController.php:1461
+#: Controller/AttributesController.php:1472
 msgid "This method can only be accessed via AJAX."
 msgstr "Cette méthode n'est utilisable que via AJAX."
 
-#: Controller/AttributesController.php:1472
+#: Controller/AttributesController.php:1482
 msgid "You are not authorized to edit this event."
 msgstr "Vous n'êtes pas autorisé à modifier cet événément."
 
-#: Controller/AttributesController.php:1537
+#: Controller/AttributesController.php:1580
 msgid "No event ID provided."
 msgstr "Aucun ID d'évenement fourni."
 
-#: Controller/AttributesController.php:1640
-msgid "Invalid tag"
-msgstr "Étiquette invalide"
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
+msgid "Synonyms: "
+msgstr "Synonymes: "
 
-#: Controller/AttributesController.php:2107;2282;2391;2441;2524;2610
-#: Controller/EventsController.php:2484;2600;2662;2720;3079;3301;3993;4011
-msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
-msgstr "Cette clé d'authentification n'est pas autorisée à effectuer des exports. Merci de contacter votre administrateur."
-
-#: Controller/AttributesController.php:2112;2277;2384
-#: Controller/EventsController.php:3084
+#: Controller/AttributesController.php:1997;2104
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr "Requête non authorisée. Merci d'envoyer l'en-tête Authorization avec votre clé en paramètre ainsi que l'en-tête Accept pour application/xml"
 
-#: Controller/AttributesController.php:2123
-msgid "Content type and parameter mismatch. Expecting JSON."
-msgstr "Le Content-type et les paramètres fournis ne correspondent pas. Format JSON attendu."
-
-#: Controller/AttributesController.php:2128
-msgid "Content type and parameter mismatch. Expecting XML."
-msgstr "Le Content-type et les paramètres fournis ne correspondent pas. Format XML attendu."
-
-#: Controller/AttributesController.php:2132;2290
+#: Controller/AttributesController.php:2010
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
 msgstr "Spécifier les termes de recherche dans l’url, ou utiliser une requête POST pour fournir un tableau json/xml (avec l’élément racine « request » et sans oublier les en-têtes correspondants au format de donnés utilisés)."
 
-#: Controller/AttributesController.php:2310
+#: Controller/AttributesController.php:2030
 msgid "You don't have access to that event."
 msgstr "Vous n'avez pas les accès requis pour accéder à cet événement."
 
-#: Controller/AttributesController.php:2373
+#: Controller/AttributesController.php:2093
 msgid "No matches."
 msgstr "Aucun résultat."
 
-#: Controller/AttributesController.php:2395;2404
+#: Controller/AttributesController.php:2115;2124
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Attribut invalide ou vous n'êtes pas autorisé à le voir."
 
-#: Controller/AttributesController.php:2445;2528;2614
-#: Controller/EventsController.php:2488;2605;2667;2724;3305;3997;4015
-msgid "You have to be logged in to do that."
-msgstr "Vous devez être connecté pour cette action."
-
-#: Controller/AttributesController.php:2472
+#: Controller/AttributesController.php:2192
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
 msgstr "Spécifier les termes de recherche dans l’url, ou POSTé un tableau json / xml (avec l’élément racine étant « request » et spécifier les en-têtes corrects basés sur le type de contenu."
 
-#: Controller/AttributesController.php:2536
+#: Controller/AttributesController.php:2256
 msgid "Invalid event ID format."
 msgstr "Format d'ID d'événément invalide."
 
-#: Controller/AttributesController.php:2645
+#: Controller/AttributesController.php:2365
 #: Controller/ShadowAttributesController.php:1254
 msgid "All done. "
 msgstr "Terminé. "
 
-#: Controller/AttributesController.php:2677;2724
+#: Controller/AttributesController.php:2397;2444
 #: Controller/ShadowAttributesController.php:1062
 msgid "Invalid field requested."
 msgstr "Champ requêté invalide."
 
-#: Controller/AttributesController.php:2680;2727
+#: Controller/AttributesController.php:2400;2447
 msgid "This function can only be accessed via AJAX."
 msgstr "Cette fonction n'est accessible que via AJAX."
 
-#: Controller/AttributesController.php:2792;2800
-#: Controller/EventsController.php:3689;3967
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "Événement introuvable ou vous n'avez pas la permission de créer des attributs"
 
-#: Controller/AttributesController.php:2821
+#: Controller/AttributesController.php:2541
 msgid "This action can only be accessed via AJAX."
 msgstr "Cette action n'est accessible que via AJAX."
 
-#: Controller/AttributesController.php:2830;3081;3095;3106
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
 msgid "You are not authorised to do that."
 msgstr "Vous n'êtes pas autorisé à effectuer cette action."
 
-#: Controller/AttributesController.php:2935
-#: Controller/EventsController.php:4431
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
 msgid "This functionality requires API key access."
 msgstr "Cette fonctionnalité requiert son accès via une clé API"
 
-#: Controller/AttributesController.php:2943
+#: Controller/AttributesController.php:2663
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr "Cette action n'est disponible que via l'API. Merci de se réferrer au guide sur l'automatisation pour plus d'information sur comment l'utiliser."
 
-#: Controller/AttributesController.php:2955
+#: Controller/AttributesController.php:2675
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "Aucun hash ou ID d'évenement reçu. Vous devez spécifier au moins un de ses deux paramètres."
 
-#: Controller/AttributesController.php:3116
+#: Controller/AttributesController.php:2836
 msgid "Invalid script."
 msgstr "Script invalide."
 
-#: Controller/AttributesController.php:3181
+#: Controller/AttributesController.php:2901
 msgid "No valid enrichment options found for this attribute."
 msgstr "Aucune option d'enrichissement valide n'a été trouvé pour cet attribut."
 
-#: Controller/AttributesController.php:3245
+#: Controller/AttributesController.php:2964
 msgid "Invalid type requested."
 msgstr "Type requêté invalide."
 
-#: Controller/AttributesController.php:3476
-#: Controller/EventsController.php:5209
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "La désactivation de la corrélation n'est pas permise sur cette instance."
 
-#: Controller/AttributesController.php:3480;3495
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3243;3258
+#: Controller/ShadowAttributesController.php:677
 msgid "Invalid Attribute."
 msgstr "Attribut invalide."
 
-#: Controller/AttributesController.php:3483;3498
-#: Controller/EventsController.php:5216;5230
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
 msgid "You don't have permission to do that."
 msgstr "Vous n'avez pas la permission d'effectuer cette action."
 
@@ -288,254 +301,286 @@ msgstr "Vous n'avez pas la permission d'effectuer cette action."
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "La mise en liste noire d'événement n'est actuellement pas activée dans sur cet instance."
 
-#: Controller/EventsController.php:804
+#: Controller/EventsController.php:848
 msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
 msgstr "Il n'y a pas de certificat x509 ou clé GnuPG dans votre profil. Pour recevoir des courriels, renseignez votre certificat public ou votre clé GnuPG dans votre profil."
 
-#: Controller/EventsController.php:806
+#: Controller/EventsController.php:850
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "Il n'y a pas de clé GnuPG définie dans votre profil. Pour recevoir des courriels, renseignez votre clé public dans votre profil."
 
-#: Controller/EventsController.php:812
+#: Controller/EventsController.php:856
 msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
 msgstr "Aucun certificat x509 ou clé GnuPG dans votre profil. Pour recevoir des attributs par courriels, renseignez votre certificat public ou votre clé GnuPG dans votre profil."
 
-#: Controller/EventsController.php:814
+#: Controller/EventsController.php:858
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr "Il n'y a pas de clé GnuPG définie dans votre profil. Pour recevoir des attributs par courriels, renseignez votre clé publique dans votre profil."
 
-#: Controller/EventsController.php:1527
+#: Controller/EventsController.php:1559
+msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
+msgstr "Vous êtes actuellement connecté en tant qu'administrateur du site et éditez un événement qui n'appartient pas à votre organisation, qui va à l'encontre du modèle de partage de MISP. Veuillez utiliser ceci comme dernier recours et utiliser un compte utilisateur normal pour le travail quotidien."
+
+#: Controller/EventsController.php:1769
 msgid "You don't have permissions to create events"
 msgstr "Vous n'avez pas la permission de créer d'événements."
 
-#: Controller/EventsController.php:1533
+#: Controller/EventsController.php:1775
 msgid "No valid event data received."
 msgstr "Aucune données valides reçues."
 
-#: Controller/EventsController.php:1569
+#: Controller/EventsController.php:1811
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "Groupe de partage invalide ou non autorisé (les utilisateurs de type Sync ne sont pas dans le groupe de partage)."
 
-#: Controller/EventsController.php:1573;1577
+#: Controller/EventsController.php:1815;1819
 msgid "Invalid Sharing Group or not authorised."
 msgstr "Groupe de partage invalide ou non autorisé."
 
-#: Controller/EventsController.php:1601
+#: Controller/EventsController.php:1843
 msgid "Event blocked by local blacklist."
 msgstr "Événement bloqué par la liste noire locale."
 
-#: Controller/EventsController.php:1614;1693;1955
+#: Controller/EventsController.php:1856;1933;2197
 msgid "The event has been saved"
 msgstr "L'événement a été sauvegardé"
 
-#: Controller/EventsController.php:1622
+#: Controller/EventsController.php:1864
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "L'évenement existe déjà. Si vous souhaitez l'éditer, merci d'utiliser l'url dans l'en-tête de localisation."
 
-#: Controller/EventsController.php:1633
+#: Controller/EventsController.php:1870
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "Un entrée de la liste noire vous bloque dans la création de l'ensemble des événements. Merci de contacter l'équipe d'administration de l'instance."
 
-#: Controller/EventsController.php:1635;1958
+#: Controller/EventsController.php:1872;2200
 msgid "The event could not be saved. Please, try again."
 msgstr "L'événement n'a pas pu être sauvegardé. Merci de réessayer."
 
-#: Controller/EventsController.php:1719
+#: Controller/EventsController.php:1912
+msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
+msgstr "L'événement créé sera visible pour les organisations ayant un compte sur cette plateforme, mais pas synchronisé vers d'autres instances MISP jusqu'à ce qu'elle soit publiée."
+
+#: Controller/EventsController.php:1959
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "Vous ne pouvez envoyer que des fichiers au format MISP XML ou MISP JSON."
 
-#: Controller/EventsController.php:1720
+#: Controller/EventsController.php:1960
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "Téléversement du fichier échouée ou l'extension de fichier n'est pas celle attendue (.xml/.json)"
 
-#: Controller/EventsController.php:1768
+#: Controller/EventsController.php:2009
 msgid "STIX document imported, event's created: "
 msgstr "STIX document importé, événement créé : "
 
-#: Controller/EventsController.php:1771
+#: Controller/EventsController.php:2012
 msgid "STIX document imported."
 msgstr "Document STIX importé."
 
-#: Controller/EventsController.php:1774
+#: Controller/EventsController.php:2015
 msgid "Could not import STIX document: "
 msgstr "Impossible d’importer le document STIX : "
 
-#: Controller/EventsController.php:1781
+#: Controller/EventsController.php:2022
 msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
 msgstr "Téléversement de fichier a échoué. Assurez-vous que vous sélectionnez un fichier STIX et que le fichier ne dépasse pas la taille de fichier maximale "
 
-#: Controller/EventsController.php:1805;1890
+#: Controller/EventsController.php:2046;2131
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "Vous n'êtes pas autorisé à effectuer cette action. Pensez à utiliser la fonctionnalité 'proposer un attribut'."
 
-#: Controller/EventsController.php:1813
+#: Controller/EventsController.php:2054
 msgid "Invalid event ID entered."
 msgstr "Un ID d'événement invalide a été saisi."
 
-#: Controller/EventsController.php:1818
+#: Controller/EventsController.php:2059
 msgid "You are not authorised to read the selected event."
 msgstr "Vous n'êtes pas autorisé à lire l'événement sélectionné."
 
-#: Controller/EventsController.php:2109;2172
+#: Controller/EventsController.php:2349;2387;2450
 msgid "You don't have the permission to do that."
 msgstr "Vous n'avez pas la permission d'effectuer cette action."
 
-#: Controller/EventsController.php:2259
+#: Controller/EventsController.php:2358
+msgid "Event unpublished."
+msgstr "Événement dépublié."
+
+#: Controller/EventsController.php:2537
 msgid "Email sent to the reporter."
 msgstr "Un signalement à été envoyé au rapporteur."
 
-#: Controller/EventsController.php:2261
+#: Controller/EventsController.php:2539
 msgid "Sending of email failed"
 msgstr "L'envoi de courriels a échoué"
 
-#: Controller/EventsController.php:2397
+#: Controller/EventsController.php:2678
 msgid "This feature is currently disabled"
 msgstr "Cette fonctionnalité est actuellement désactivée."
 
-#: Controller/EventsController.php:2439;4025
+#: Controller/EventsController.php:2720;3986
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
 msgstr "Spécifier les termes de recherche dans l’url ou utiliser une requête POST contenant un xml (avec l’élément racine « request »)."
 
-#: Controller/EventsController.php:2475
+#: Controller/EventsController.php:2756
 msgid "Invalid Event ID."
 msgstr "ID d'événement invalide."
 
-#: Controller/EventsController.php:2522
+#: Controller/EventsController.php:2803
 msgid "No events found that match the passed parameters."
 msgstr "Aucun événement correspondant aux paramètres indiqués n'a été trouvé."
 
-#: Controller/EventsController.php:2547
+#: Controller/EventsController.php:2828
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
 msgstr "Spécifiez les termes de recherche dans l’url, ou POSTez un json ou xml avec les paramètres de filtre. Les filtres valides sont : id (ID de l’événement), tags (liste des balises), from (de date au format AAAA-MM-JJ), to (à la date au format AAAA-MM-JJ), last (événements avec un horodatage publié plus récent que - les options valides sont en temps + unité format 6D ou 2w, etc.)"
 
-#: Controller/EventsController.php:2622;2684
+#: Controller/EventsController.php:2903
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
 msgstr "Spécifiez les termes de rechercher dans l'URL, ou POSTez les paramètre de filtrage en JSON ou en XML."
 
-#: Controller/EventsController.php:2641
-#: Model/Attribute.php:1927
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
 msgid "Invalid hash type."
 msgstr "Type de hash invalide."
 
-#: Controller/EventsController.php:2871
+#: Controller/EventsController.php:3025
 msgid "Filename not allowed."
 msgstr "Nom de fichier non autorisé."
 
-#: Controller/EventsController.php:2892
+#: Controller/EventsController.php:3045
 msgid "Problem with writing the ioc file. Please report to administrator."
 msgstr "Le fichier ioc n’a pas pu être créé. Veuillez-vous adresser à un administrateur."
 
-#: Controller/EventsController.php:2986
+#: Controller/EventsController.php:3139
 msgid "This is not a valid MISP XML file."
 msgstr "Ce fichier n'est pas un fichier MISP XML valide."
 
-#: Controller/EventsController.php:3101
-msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type)."
-msgstr "Spécifiez les termes de recherche dans l'URL, ou POSTez un tableau json/xml (la racine de l'élément étant \"request\" et spécifiez le bon en-tête en se basant sur le content type)."
-
-#: Controller/EventsController.php:3294
+#: Controller/EventsController.php:3291
 msgid "Not yet implemented"
 msgstr "Cette fonction n'a pas encore été implémentée."
 
-#: Controller/EventsController.php:3312;3316
+#: Controller/EventsController.php:3309;3313
 msgid "Invalid event or not authorised."
 msgstr "Événement invalide ou affichage non autorisé."
 
-#: Controller/EventsController.php:3336;3406
+#: Controller/EventsController.php:3333;3403
 msgid "You don't have the privileges to access this."
 msgstr "Vous n'avez pas les privilèges suffisants pour accéder à cette ressource."
 
-#: Controller/EventsController.php:3920
-msgid "Could not add tags."
-msgstr "Ajout de tag impossible."
+#: Controller/EventsController.php:3610
+#: Controller/TagCollectionsController.php:307
+msgid "Invalid Tag."
+msgstr "Tag invalide."
 
-#: Controller/EventsController.php:3971;5055
-#: Controller/ObjectsController.php:46;140;144;438
+#: Controller/EventsController.php:3626
+#: Controller/TagCollectionsController.php:323
+msgid "Tag is already attached to this event."
+msgstr "Le tag est déjà attaché à cet événement."
+
+#: Controller/EventsController.php:3637;3643
+#: Controller/TagCollectionsController.php:330
+msgid "Tag(s) added."
+msgstr "Tag(s) ajouté(s)."
+
+#: Controller/EventsController.php:3639
+msgid "Tag could not be added."
+msgstr "Tag n’a pas pu être ajouté."
+
+#: Controller/EventsController.php:3645
+#: Controller/TagCollectionsController.php:338
+msgid "All tags are already present, nothing to add."
+msgstr "Tous les tags sont déjà présents, rien à ajouter."
+
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
 msgid "Invalid event."
 msgstr "Evenement invalide."
 
-#: Controller/EventsController.php:4085;4115;4131
+#: Controller/EventsController.php:3918
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
+msgstr "Indiquez les termes de recherche dans l'url, ou POSTez un xml (avec l'élément racine étant \"request\"."
+
+#: Controller/EventsController.php:4049;4079;4095
 msgid "You do not have the permission to do that."
 msgstr "Vous n'avez pas la permission d'effectuer cette action."
 
-#: Controller/EventsController.php:4196;4334
+#: Controller/EventsController.php:4160;4300
 msgid "Invalid ID"
 msgstr "ID invalide."
 
-#: Controller/EventsController.php:4200;4338
+#: Controller/EventsController.php:4164;4304
 msgid "Event not found or you are not authorised to view it."
 msgstr "Événement introuvable ou vous n'êtes pas autorisé à le voir."
 
-#: Controller/EventsController.php:4434;4441
+#: Controller/EventsController.php:4405;4412
 msgid "Please POST the samples as described on the automation page."
 msgstr "Merci d'effectuer une requête POST des samples comme décrit dans la page des automatisations."
 
-#: Controller/EventsController.php:4470
+#: Controller/EventsController.php:4441
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr "Aucun fichier reçus, ou alors le fichier n'est pas dans le bon format. Veuillez vous reporter à la documentation de l'API sur les automatisations."
 
-#: Controller/EventsController.php:4478
+#: Controller/EventsController.php:4449
 msgid "Event not found"
 msgstr "Evenement non trouvé."
 
-#: Controller/EventsController.php:4501
+#: Controller/EventsController.php:4472
 msgid "Event not found."
 msgstr "Événement introuvable."
 
-#: Controller/EventsController.php:4511
+#: Controller/EventsController.php:4482
 msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
 msgstr "Le niveau de distribution 5 n'est pas supporté pour téléverser un fichier malveillant sans passer un ID d'événement. Le niveau de distribution 5 doit être le niveau de distribution d'un événement existant."
 
-#: Controller/EventsController.php:4536
+#: Controller/EventsController.php:4507
 msgid "The creation of a new event with the supplied information has failed."
 msgstr "La création d'un événement avec les informations fournies à échouée."
 
-#: Controller/EventsController.php:4671;4693;4722;4747;4772;4802;4823
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
 msgid "Invalid type."
 msgstr "Type invalide."
 
-#: Controller/EventsController.php:4866
+#: Controller/EventsController.php:4906
 msgid "Invalid method."
 msgstr "Méthode invalide."
 
-#: Controller/EventsController.php:4946
+#: Controller/EventsController.php:4989
 msgid "%s services are not enabled."
 msgstr "Le %s service n'est pas activé."
 
-#: Controller/EventsController.php:4950
+#: Controller/EventsController.php:4993
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "Attribut introuvable ou vous n'êtes pas autorisé à le voir."
 
-#: Controller/EventsController.php:4956
+#: Controller/EventsController.php:4999
 msgid "No valid %s options found for this attribute."
 msgstr "Aucune option %s n'a été trouvée pour cet attribut."
 
-#: Controller/EventsController.php:4973
+#: Controller/EventsController.php:5016
 msgid "no valid %s options found for this attribute."
 msgstr "Aucune option %s n'a été trouvée pour cet attribut."
 
-#: Controller/EventsController.php:4995
+#: Controller/EventsController.php:5038
 msgid "%s service not reachable."
 msgstr "Le service %s est indisponible."
 
-#: Controller/EventsController.php:5007
+#: Controller/EventsController.php:5050
 msgid ": Enriched via the %s"
 msgstr ": Enrichi via %s"
 
-#: Controller/EventsController.php:5136
+#: Controller/EventsController.php:5184
 msgid "Import service not reachable."
 msgstr "Le service d'import est indisponible."
 
-#: Controller/EventsController.php:5303
+#: Controller/EventsController.php:5351
 msgid "Invalid ID."
 msgstr "ID invalide."
 
-#: Controller/EventsController.php:5351
-#: Controller/ShadowAttributesController.php:312;317;534
+#: Controller/EventsController.php:5399
+#: Controller/ShadowAttributesController.php:311;316;532
 msgid "Invalid Event"
 msgstr "Evenement invalide."
 
-#: Controller/EventsController.php:5369
+#: Controller/EventsController.php:5420
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "Tâche d’enrichissement en attente de traitement en arrière-plan. Revenez plus tard pour voir les résultats."
 
@@ -543,122 +588,138 @@ msgstr "Tâche d’enrichissement en attente de traitement en arrière-plan. Rev
 msgid "You don't have the required privileges to do that."
 msgstr "Vous n'avez pas de droits suffisants pour effectuer cette action."
 
-#: Controller/FeedsController.php:193;291
+#: Controller/FeedsController.php:205;303
 msgid "Feed added."
 msgstr "Flux ajouté."
 
-#: Controller/FeedsController.php:201
+#: Controller/FeedsController.php:213
 msgid "Feed could not be added. Invalid field: %s"
 msgstr "Flux n’a pas pu être ajouté. Champ invalide: %s"
 
-#: Controller/FeedsController.php:226;326;348;470;502;682
+#: Controller/FeedsController.php:238;338;360;482;517;721
 msgid "Invalid feed."
 msgstr "Flux invalide."
 
-#: Controller/FeedsController.php:299
+#: Controller/FeedsController.php:311
 msgid "Feed could not be updated. Invalid fields: %s"
 msgstr "Flux n’a pas pu être mis à jour. Champs invalides: %s"
 
-#: Controller/FeedsController.php:322
+#: Controller/FeedsController.php:334
 msgid "This action requires a post request."
 msgstr "Cette action nécessite une requête POST."
 
-#: Controller/FeedsController.php:355;474
+#: Controller/FeedsController.php:367;486
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "Le flux n'es actuellement pas activé. Soyez sûr de l'avoir activé."
 
-#: Controller/FeedsController.php:368;434
+#: Controller/FeedsController.php:380;446
 msgid "Starting fetch from Feed."
 msgstr "Début de la récupération du flux"
 
-#: Controller/FeedsController.php:379
+#: Controller/FeedsController.php:391
 msgid "Pull queued for background execution."
 msgstr "Envoyé en file d'attente pour une exécution en arrière-plan."
 
-#: Controller/FeedsController.php:384;386
+#: Controller/FeedsController.php:396;398
 msgid "Fetching the feed has failed."
 msgstr "La récupération du flux a échouée."
 
-#: Controller/FeedsController.php:390
+#: Controller/FeedsController.php:402
 msgid "Fetching the feed has successfuly completed."
 msgstr "La récupération du flux a eu lieu avec succès."
 
-#: Controller/FeedsController.php:451
+#: Controller/FeedsController.php:463
 msgid "Fetching the feed has successfully completed."
 msgstr "La récupération du flux a eu lieu avec succès."
 
-#: Controller/FeedsController.php:481
+#: Controller/FeedsController.php:493
 msgid "Event added."
 msgstr "Evenement ajouté."
 
-#: Controller/FeedsController.php:484
+#: Controller/FeedsController.php:496
 msgid "Event already up to date."
 msgstr "Evenement déjà à jour"
 
-#: Controller/FeedsController.php:486
+#: Controller/FeedsController.php:498
 msgid "Event updated."
 msgstr "Evenement mis à jour."
 
-#: Controller/FeedsController.php:490
+#: Controller/FeedsController.php:502
 msgid "Could not %s event."
 msgstr "Pouvait pas %s événement."
 
-#: Controller/FeedsController.php:493
+#: Controller/FeedsController.php:505
 msgid "Download failed."
 msgstr "Téléchargement échoué."
 
-#: Controller/FeedsController.php:561
+#: Controller/FeedsController.php:597
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "Le flux n'a pu être récupéré. L'erreur HTTP retourné est: "
 
-#: Controller/FeedsController.php:600;651
+#: Controller/FeedsController.php:636;687
 msgid "Invalid feed type."
 msgstr "Type de flux invalide"
 
-#: Controller/FeedsController.php:714
+#: Controller/FeedsController.php:753
 msgid "This event is blocked by the Feed filters."
 msgstr "Cet événement est bloqué par de filtres de flux."
 
-#: Controller/FeedsController.php:716
+#: Controller/FeedsController.php:755
 msgid "Could not download the selected Event"
 msgstr " Le téléchargement de l'événement sélectionné est impossible."
 
-#: Controller/FeedsController.php:752;756
+#: Controller/FeedsController.php:791;795
 msgid "Invalid Feed."
 msgstr "Flux invalide."
 
-#: Controller/FeedsController.php:777
+#: Controller/FeedsController.php:816
 msgid "Only POST requests are allowed."
 msgstr "Seulement les requêtes POST sont autorisés."
 
-#: Controller/FeedsController.php:781
+#: Controller/FeedsController.php:820
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: Controller/FeedsController.php:790
+#: Controller/FeedsController.php:829
 msgid "Data pulled."
 msgstr "Données transférés."
 
-#: Controller/FeedsController.php:792
+#: Controller/FeedsController.php:831
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "Récupération des données sélectionnées impossible. La raison est la suivante: %s"
 
-#: Controller/FeedsController.php:809
+#: Controller/FeedsController.php:848
 msgid "Starting feed caching."
 msgstr "Démarrage du mise en cache."
 
-#: Controller/FeedsController.php:824
+#: Controller/FeedsController.php:863
 msgid "Caching the feeds has failed."
 msgstr "La récupération des flux a échoué."
 
-#: Controller/FeedsController.php:827
+#: Controller/FeedsController.php:866
 msgid "Caching the feeds has successfully completed."
 msgstr "La récupération des flux a eu lieu avec succès."
 
-#: Controller/FeedsController.php:858
+#: Controller/FeedsController.php:900
 msgid "Invalid feed list received."
 msgstr "La liste de flux reçu est invalide."
 
+#: Controller/GalaxiesController.php:92
+msgid "All clusters"
+msgstr "Tout les clusters"
+
+#: Controller/GalaxiesController.php:135
+msgid "All namespaces"
+msgstr "Tout les espaces de nom"
+
+#: Controller/GalaxiesController.php:250
+msgid "Failed to parse request."
+msgstr "Impossible d'analyser la requête."
+
+#: Controller/GalaxiesController.php:253
+msgid "No clusters picked."
+msgstr "Aucun cluster sélectionné."
+
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr "Toutes les tâches terminées ont été purgés"
@@ -671,11 +732,23 @@ msgstr "Toutes les tâches ont été purgés"
 msgid "Invalid object"
 msgstr "Objet invalide"
 
-#: Controller/ObjectReferencesController.php:187
+#: Controller/ObjectReferencesController.php:188
 msgid "Invalid object reference"
 msgstr "La référence de l'objet est invalide"
 
-#: Controller/ObjectTemplatesController.php:88
+#: Controller/ObjectTemplatesController.php:31
+msgid "All Objects"
+msgstr "Tout les objets"
+
+#: Controller/ObjectTemplatesController.php:99
+msgid "Invalid object template"
+msgstr "Modèle d'objet invalide"
+
+#: Controller/ObjectTemplatesController.php:103
+msgid "Invalid object template id."
+msgstr "Id du modèle d'objet invalide."
+
+#: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
 msgstr "Le modèle de l'objet a été supprimé"
 
@@ -696,23 +769,23 @@ msgstr "Vous n'avez pas la permission de créer des objets."
 msgid "Invalid template."
 msgstr "Événement invalide."
 
-#: Controller/ObjectsController.php:303
+#: Controller/ObjectsController.php:311
 msgid "You don't have permissions to edit objects."
 msgstr "Vous n'avez pas la permission de modifier des objets."
 
-#: Controller/ObjectsController.php:317;328;427
+#: Controller/ObjectsController.php:325;336;439
 msgid "Invalid object."
 msgstr "Objet invalide."
 
-#: Controller/ObjectsController.php:421
+#: Controller/ObjectsController.php:433
 msgid "You don't have permissions to delete objects."
 msgstr "Vous n'avez pas la permission de supprimer des objets."
 
-#: Controller/ObjectsController.php:531;538;542
+#: Controller/ObjectsController.php:543;550;554
 msgid "Object not found or not authorised."
 msgstr "L'objet est introuvable ou non autorisé."
 
-#: Controller/ObjectsController.php:799
+#: Controller/ObjectsController.php:811
 msgid "%s objects successfully reconstructed."
 msgstr "%s objets reconstituées avec succès."
 
@@ -776,123 +849,147 @@ msgstr "Le role n'a pas été sauvegardé. Veuillez réessayer."
 msgid "Role deleted"
 msgstr "Rôle supprimé"
 
-#: Controller/ServersController.php:204;394
+#: Controller/ServersController.php:226;417
 msgid "The pull filter rules must be in valid JSON format."
 msgstr "Les règles du filtre Pull doivent être au format JSON valide."
 
-#: Controller/ServersController.php:214;404
+#: Controller/ServersController.php:236;427
 msgid "The push filter rules must be in valid JSON format."
 msgstr "Les règles du filtre Push doivent être au format JSON valide."
 
-#: Controller/ServersController.php:268;434
+#: Controller/ServersController.php:291;457
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr "Cette organisation n' a pas pu être créée car l'UUID est déjà utilisé."
 
-#: Controller/ServersController.php:280
+#: Controller/ServersController.php:303
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format? Also, make sure the organisation's name doesn't clash with an existing one."
 msgstr "Impossible d'enregistrer la nouvelle organisation, vous êtes sûr que l’uuid est dans le bon format ? Aussi, assurez-vous que le nom de l’organisation n’est pas en conflit avec un nom existant."
 
-#: Controller/ServersController.php:309;490
+#: Controller/ServersController.php:332;513
 msgid "The server has been saved"
 msgstr "Le serveur a été sauvegardé"
 
-#: Controller/ServersController.php:316;497
+#: Controller/ServersController.php:339;520
 msgid "The server could not be saved. Please, try again."
 msgstr "Le serveur n'a pas pu être sauvegardé. Veuillez réessayer."
 
-#: Controller/ServersController.php:369;565;590;598;659;1412
+#: Controller/ServersController.php:392;589;614;623;683;1360
 msgid "Invalid server"
 msgstr "Serveur invalide"
 
-#: Controller/ServersController.php:451
+#: Controller/ServersController.php:474
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr "La nouvelle organisation n'a pas pu être sauvegardée. L'UUID ne semble pas être au bon format."
 
-#: Controller/ServersController.php:572
+#: Controller/ServersController.php:596
 msgid "Server deleted"
 msgstr "Serveur supprimé"
 
-#: Controller/ServersController.php:575
+#: Controller/ServersController.php:599
 msgid "Server was not deleted"
 msgstr "Le serveur n'a pas été supprimé"
 
-#: Controller/ServersController.php:602
+#: Controller/ServersController.php:626
 msgid "Pull setting not enabled for this server."
 msgstr "Le paramètre Pull n'est pas activé pour ce serveur."
 
-#: Controller/ServersController.php:611
-msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
-msgstr "Action non autorisée. Ceci est dû soit à une clé d'authentification invalide, soit au fait que l'utilisateur de synchronisation n'a pas les droits d'authentification activés sur le serveur distant. Une autre raison pourrait être une mauvaise configuration du serveur de synchronisation."
+#: Controller/ServersController.php:659
+msgid "Pull queued for background execution. Job ID: %s"
+msgstr "Pull en attente pour l'exécution en arrière-plan. ID tâche : %s"
 
-#: Controller/ServersController.php:1309
+#: Controller/ServersController.php:696
+msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
+msgstr "Le serveur distant est trop obsolète pour lancer un push vers celui-ci. Veuillez aviser l'organisation d'hébergement de l'instance distante."
+
+#: Controller/ServersController.php:709
+msgid "Push complete. %s events pushed, %s events could not be pushed."
+msgstr "Envoi terminé. %s événements poussés, %s événements n'ont pas pu être poussés."
+
+#: Controller/ServersController.php:734
+msgid "Push queued for background execution. Job ID: %s"
+msgstr "Envoi en attente pour l'exécution de l'arrière-plan. ID de tâche : %s"
+
+#: Controller/ServersController.php:1257
 msgid "File not found."
 msgstr "Fichier introuvable."
 
-#: Controller/ServersController.php:1315
+#: Controller/ServersController.php:1263
 msgid "File could not be deleted."
 msgstr "Le fichier n'a pas été supprimé."
 
-#: Controller/ServersController.php:1338;1354
+#: Controller/ServersController.php:1286;1302
 msgid "Upload failed."
 msgstr "Le téléversement a échoué."
 
-#: Controller/ServersController.php:1346
+#: Controller/ServersController.php:1294
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "Le fichier est déjà présent. Pour le remplacer, veuillez le supprimer avant."
 
-#: Controller/ShadowAttributesController.php:212
+#: Controller/ServersController.php:1748
+msgid "Starting server caching."
+msgstr "Démarrage du mise en cache."
+
+#: Controller/ServersController.php:1763
+msgid "Caching the servers has failed."
+msgstr "La mise en cache des serveurs a échoué."
+
+#: Controller/ServersController.php:1766
+msgid "Caching the servers has successfully completed."
+msgstr "La mise en cache des serveurs est terminée avec succès."
+
+#: Controller/ShadowAttributesController.php:211
 msgid "Moving of the file that this attachment references failed."
 msgstr "Le déplacement de ce fichier faisant référence à cet attachement à échoué."
 
-#: Controller/ShadowAttributesController.php:280
+#: Controller/ShadowAttributesController.php:279
 msgid "Could not discard proposal."
 msgstr "Impossible d’écarter la proposition."
 
-#: Controller/ShadowAttributesController.php:341
+#: Controller/ShadowAttributesController.php:340
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr "L'attribut n'a pas été ajouté. Veuillez sélectionner \"Ajouter une pièce jointe\"(\"Add attachement\")"
 
-#: Controller/ShadowAttributesController.php:389;392;401
+#: Controller/ShadowAttributesController.php:388;391;400
 msgid "The lines"
 msgstr "Les lignes"
 
-#: Controller/ShadowAttributesController.php:441
+#: Controller/ShadowAttributesController.php:440
 msgid "The proposal has been saved"
 msgstr "La proposition a été sauvegardée"
 
-#: Controller/ShadowAttributesController.php:453;763
+#: Controller/ShadowAttributesController.php:452;761
 msgid "Could not save the proposal. Errors: %s"
 msgstr "Impossible de sauvegarder la proposition. Erreurs: %s"
 
-#: Controller/ShadowAttributesController.php:455
+#: Controller/ShadowAttributesController.php:454
 msgid "The proposal could not be saved. Please, try again."
 msgstr "La propose n’a pas pu être enrégistrer. Veuillez réessayer."
 
-#: Controller/ShadowAttributesController.php:492
+#: Controller/ShadowAttributesController.php:491
 msgid "Invalid Proposal"
 msgstr "Proposition invalide"
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:521
 msgid "Proposal not an attachment or malware-sample"
 msgstr "La proposition n'est pas une pièce jointe ou un échantillon de malware"
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:617
 msgid "The attachment has been uploaded"
 msgstr "La pièce jointe a été envoyée"
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:619
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr "La pièce jointe a été envoyée, mais certaines propositions n'ont pas pu être créées. Les erreurs sont : "
 
-#: Controller/ShadowAttributesController.php:624
+#: Controller/ShadowAttributesController.php:622
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr "La pièce jointe n'a pas pu être sauvegardée, veuillez contacter votre administrateur."
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:752
 msgid "The proposed Attribute has been saved"
 msgstr "L'attribut proposé a été sauvegardé"
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:763
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr "Le \"ShadowAttribute\" n'a pas été sauvegardé. Veuillez réessayer."
 
@@ -924,6 +1021,86 @@ msgstr "Groupe de partage supprimé"
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr "Le groupe de partage n'a pas pu être supprimé. Assurez-vous qu'il n'y a aucun événement, attribut ou discussion appartenant à ce groupe de partage."
 
+#: Controller/SightingsController.php:86
+msgid "Could not add the Sighting. Reason: "
+msgstr "Impossible d'ajouter le Sighting. Raison: "
+
+#: Controller/SightingsController.php:96;99
+msgid "Sighting added"
+msgstr "Sighting ajouté"
+
+#: Controller/SightingsController.php:152
+msgid "You are not authorised to remove sightings data as you don't have permission to modify your organisation's data."
+msgstr "Vous n'êtes pas autorisé à supprimer les données de navigation car vous n'avez pas la permission de modifier les données de votre organisation."
+
+#: Controller/SightingsController.php:158
+msgid "Attribute not found"
+msgstr "Attribut introuvable"
+
+#: Controller/SightingsController.php:176
+msgid "Invalid request."
+msgstr "Demande invalide."
+
+#: Controller/SightingsController.php:185
+msgid "Sighting added."
+msgstr "Sighting ajouté."
+
+#: Controller/SightingsController.php:187
+msgid "Sighting could not be added"
+msgstr "Le Sighting n'a pas pu être ajouté"
+
+#: Controller/TagCollectionsController.php:56;177
+msgid "The tag collection has been saved"
+msgstr "La collection de tags a été enregistrée"
+
+#: Controller/TagCollectionsController.php:64;185
+msgid "The tag collection could not be added. Reason: "
+msgstr "La collection de tag n'a pas pu être ajoutée. Raison : "
+
+#: Controller/TagCollectionsController.php:85
+msgid "%s new tag collections added."
+msgstr "%s nouvelles collections de tags ajoutées."
+
+#: Controller/TagCollectionsController.php:154
+msgid "Invalid Tag Collection"
+msgstr "Collection de tags invalide"
+
+#: Controller/TagCollectionsController.php:161
+msgid "You don't have editing rights on this Tag Collection."
+msgstr "Vous n'avez pas de droits d'édition sur cette collection de tags."
+
+#: Controller/TagCollectionsController.php:201;380
+msgid "Invalid tag collection."
+msgstr "Collection de tag invalide."
+
+#: Controller/TagCollectionsController.php:207
+msgid "Tag collection deleted."
+msgstr "Collection de tags supprimée."
+
+#: Controller/TagCollectionsController.php:215
+msgid "Tag collection could not be deleted."
+msgstr "La collection de tags n'a pas pu être supprimée."
+
+#: Controller/TagCollectionsController.php:224
+msgid "You are not allowed to delete that."
+msgstr "Vous n'êtes pas autorisé à supprimer cela."
+
+#: Controller/TagCollectionsController.php:332
+msgid "Tag(s) could not be added."
+msgstr "Tag(s) n'a pas pu être ajouté."
+
+#: Controller/TagCollectionsController.php:384
+msgid "Insufficient privileges to remove the tag from the collection."
+msgstr "Privilèges insuffisants pour supprimer le tag de la collection."
+
+#: Controller/TagCollectionsController.php:395
+msgid "Invalid tag or tag not associated with the collection."
+msgstr "Tag ou tag non associé à la collection."
+
+#: Controller/TagCollectionsController.php:399
+msgid "Failed to remove tag from the collection."
+msgstr "Impossible de supprimer le tag de la collection."
+
 #: Controller/TagsController.php:367
 msgid "Tag deleted"
 msgstr "Tag supprimé"
@@ -932,6 +1109,27 @@ msgstr "Tag supprimé"
 msgid "Tag was not deleted"
 msgstr "Le tag n'a pas été supprimé"
 
+#: Controller/TagsController.php:580
+msgid "Favourite Tags"
+msgstr "Tags préférés"
+
+#: Controller/TagsController.php:586
+msgid "Tag Collections"
+msgstr "Collections de tags"
+
+#: Controller/TagsController.php:591
+msgid "All Tags"
+msgstr "Toutes les balises"
+
+#: Controller/TagsController.php:601
+#: View/Taxonomies/view.ctp:2
+msgid "Taxonomy Library"
+msgstr "Bibliothèque de taxonomie"
+
+#: Controller/TagsController.php:756
+msgid "Includes: "
+msgstr "Comprend : "
+
 #: Controller/TemplatesController.php:408
 msgid "Event populated, "
 msgstr "Événement peuplé, "
@@ -940,15 +1138,15 @@ msgstr "Événement peuplé, "
 msgid "Event populated, but "
 msgstr "Événement peuplé, mais "
 
-#: Controller/UsersController.php:42;221
+#: Controller/UsersController.php:42;247
 msgid "Invalid user or not authorised."
 msgstr "Utilisateur invalide ou non autorisé."
 
-#: Controller/UsersController.php:54;430;657;907
+#: Controller/UsersController.php:54;456;683;929
 msgid "Invalid user"
 msgstr "Utilisateur invalide"
 
-#: Controller/UsersController.php:119;564;728
+#: Controller/UsersController.php:119;590;754
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr "Le domaine de courriel est invalide. Votre utilisateur est limité à la création d'utilisateurs pour les domaines suivants: "
 
@@ -960,59 +1158,75 @@ msgstr "Le profil a été mis à jour"
 msgid "The profile could not be updated. Please, try again."
 msgstr "Le profil n’a pas été mis à jour. Veuillez réessayer."
 
-#: Controller/UsersController.php:198
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr "Mot de passe invalide. Veuillez entrer votre mot de passe actuel pour continuer."
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr "Veuillez entrer votre mot de passe actuel pour continuer."
+
+#: Controller/UsersController.php:213
 msgid "Password Changed."
 msgstr "Mot de passe modifié."
 
-#: Controller/UsersController.php:203
+#: Controller/UsersController.php:222
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "Le mot de passe n’a pas été modifié. Vérifiez la longueur minimale et la complexité du mot de passe."
 
-#: Controller/UsersController.php:575
+#: Controller/UsersController.php:601
 msgid "The user could not be saved. Invalid organisation."
 msgstr "L’utilisateur n’a pas été sauvegardé. Organisation invalide."
 
-#: Controller/UsersController.php:597
+#: Controller/UsersController.php:623
 msgid "The user has been saved."
 msgstr "L’utilisateur a été sauvegardé."
 
-#: Controller/UsersController.php:606;843
+#: Controller/UsersController.php:632;865
 msgid "The user could not be saved. Please, try again."
 msgstr "L’utilisateur n’a pas été sauvegardé. Veuillez réessayer."
 
-#: Controller/UsersController.php:835
+#: Controller/UsersController.php:857
 msgid "The user has been saved"
 msgstr "L’utilisateur a été sauvegardé"
 
-#: Controller/UsersController.php:915
+#: Controller/UsersController.php:937
 msgid "User deleted"
 msgstr "Utilisateur supprimé"
 
-#: Controller/UsersController.php:919
+#: Controller/UsersController.php:941
 msgid "User was not deleted"
 msgstr "L’utilisateur n’a pas été supprimé"
 
-#: Controller/UsersController.php:997
+#: Controller/UsersController.php:1019
 msgid "Invalid username or password, try again"
 msgstr "Nom d’utilisateur ou mot de passe invalide, réessayez"
 
-#: Controller/UsersController.php:1080
+#: Controller/UsersController.php:1106
 msgid "Good-Bye"
 msgstr "Au revoir"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1147
 msgid "New authkey generated."
 msgstr "Nouvelle clé d’identification générée."
 
-#: Controller/UsersController.php:1230
+#: Controller/UsersController.php:1256
 msgid "You accepted the Terms and Conditions."
 msgstr "Vous avez accepté les Termes et Conditions."
 
-#: Controller/UsersController.php:1419
+#: Controller/UsersController.php:1438
+msgid "Recipient email not provided"
+msgstr "Email du destinataire non fourni"
+
+#: Controller/UsersController.php:1443
+msgid "Recipient organisation not provided"
+msgstr "Organisme bénéficiaire non fourni"
+
+#: Controller/UsersController.php:1480
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr "Courriels envoyés, mais n’a pas pu être envoyé aux destinataires suivants: "
 
-#: Controller/UsersController.php:1421
+#: Controller/UsersController.php:1482
 msgid "E-mails sent."
 msgstr "Courriels envoyés."
 
@@ -1040,972 +1254,1040 @@ msgstr "%s supprimé"
 msgid "%s was not deleted"
 msgstr "%s n'a pas été supprimé"
 
-#: Controller/Component/BlackListComponent.php:72
+#: Controller/Component/BlackListComponent.php:75
 msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
 msgstr "Fait. Les %d nouvelles entrées ont été ajoutées à la liste noire. %d entrées n’ont pas pu être enregistrées."
 
-#: Controller/Component/BlackListComponent.php:123
+#: Controller/Component/BlackListComponent.php:126
 msgid "Blacklist item added."
 msgstr "Objet de liste noire ajouté."
 
-#: Controller/Component/BlackListComponent.php:152
+#: Controller/Component/BlackListComponent.php:155
 msgid "Invalid blacklist entry"
 msgstr "Entrée de liste noire invalide"
 
-#: Controller/Component/BlackListComponent.php:156
+#: Controller/Component/BlackListComponent.php:159
 msgid "Blacklist entry removed"
 msgstr "Entrée de liste noire supprimée"
 
-#: Controller/Component/BlackListComponent.php:158
+#: Controller/Component/BlackListComponent.php:161
 msgid "Could not remove the blacklist entry"
 msgstr "Entrée de liste noire n’a pas été supprimée"
 
-#: Model/Attribute.php:567
+#: Model/Attribute.php:591
 msgid "Composite type, but value not explodable"
 msgstr "Type composé, mais la valeur ne peut être étendue"
 
-#: Model/Attribute.php:677
+#: Model/Attribute.php:703
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr "La suppression du fichier joint à échouée. Merci de le signaler à l'administrateur."
 
-#: Model/Attribute.php:802
+#: Model/Attribute.php:828
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr "L'entrée texte fournie est trop longue et va être tronquée. Merci d'envisager d'ajouter cette donnée en pièce jointe à la place"
 
-#: Model/Attribute.php:921
+#: Model/Attribute.php:953
 msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "La somme de contrôle a une longueur ou un format non valide (%s caractères en hexadécimal attendus). Merci de vérifier la valeur ou de sélectionner le type \"other\"."
 
-#: Model/Attribute.php:928
+#: Model/Attribute.php:960
 msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "La somme de contrôle a une longueur ou un format non valide (au moins 35 caractères en hexadécimal attendus). Merci de vérifier la valeur ou de sélectionner le type \"other\"."
 
-#: Model/Attribute.php:935
+#: Model/Attribute.php:967
 msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr "L'entrée ne correspond pas au format sha1 attendu (attendu: 40 caractères hexadécimaux). Gardez à l'esprit que MISP ne support actuellement que les SHA1 pour PEHashes, si vous souhaitez un support étendu pour d'autres types de hash, créez un ticket sur GitHub à propos de cette demande https://github.com/MISP/MISP!"
 
-#: Model/Attribute.php:946
+#: Model/Attribute.php:978
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr "Hash SSDeep invalide. Le format doit être blocksize:hash:hash"
 
-#: Model/Attribute.php:957
+#: Model/Attribute.php:989
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr "Format impfuzzy invalide. Le format doit être imports:hash:hash"
 
-#: Model/Attribute.php:972
+#: Model/Attribute.php:996
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr "L'entrée ne correspond pas au format attendu (attendu : 40 caractères hexadécimaux ou plus)"
+
+#: Model/Attribute.php:1011
 msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr "L'entrée ne correspond pas au format nom de fichier |sha1 attendu (attendu: nom de fichier |40 caractères hexadécimaux). Gardez à l'esprit que MISP ne support actuellement que les SHA1 pour PEHashes, si vous souhaitez un support étendu pour d'autres types de hash, créez un ticket sur GitHub à propos de cette demande https://github.com/MISP/MISP!"
 
-#: Model/Attribute.php:990
+#: Model/Attribute.php:1029
 msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "La somme de contrôle a une longueur ou un format non valide (nom_du_fichier|%s caractères en hexadécimal attendus). Merci de vérifier la valeur ou de sélectionner le type \"other\"."
 
-#: Model/Attribute.php:995
+#: Model/Attribute.php:1034
 msgid "Invalid composite type. The format has to be %s."
 msgstr "Type invalide. Le format doit être %s."
 
-#: Model/Attribute.php:1006
+#: Model/Attribute.php:1045
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr "Hash SSDeep invalide (le format attendu est blocksize:hash:hash)."
 
-#: Model/Attribute.php:1014
+#: Model/Attribute.php:1053
 msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "La somme de contrôle à une taille ou un format invalide (attendu: filename| au plus 35 caractères hexadécimaux). Merci de vérifier la valeur ou de sélectionner le type \"other\"."
 
-#: Model/Attribute.php:1025
+#: Model/Attribute.php:1064
 msgid "Invalid CIDR notation value found."
 msgstr "Notation CIDR invalide, valeur introuvable."
 
-#: Model/Attribute.php:1032;1083
+#: Model/Attribute.php:1071;1122
 msgid "IP address has an invalid format."
 msgstr "L'adresse IP a un format invalide."
 
-#: Model/Attribute.php:1037
+#: Model/Attribute.php:1076
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr "Le numéro de port doit être un entier positif entre 1 et 65535."
 
-#: Model/Attribute.php:1066
+#: Model/Attribute.php:1105
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr " nom a un format invalide. Merci de vérifier la valeur ou de sélectionner le type \"other\"."
 
-#: Model/Attribute.php:1086
+#: Model/Attribute.php:1125
 msgid "Domain name has an invalid format."
 msgstr "Nom de domaine a un format non valide."
 
-#: Model/Attribute.php:1099
+#: Model/Attribute.php:1138
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr "L'adresse email a un format non valide. Merci de vérifier la valeur ou sélectionner type « autre »."
 
-#: Model/Attribute.php:1107
+#: Model/Attribute.php:1146
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr "Format invalide. Format attendu: CVE-xxxx-xxxx..."
 
-#: Model/Attribute.php:1118
+#: Model/Attribute.php:1157
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr "Format non valide. Seulement les valeurs inférieurs à 256 caractères qui n’incluent pas les barres obliques vers l’avant ou vers l’arrière sont autorisées."
 
-#: Model/Attribute.php:1230
+#: Model/Attribute.php:1272
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr "La date et l'heure doivent être au format ISO 8601."
 
-#: Model/Attribute.php:1236
+#: Model/Attribute.php:1278
 msgid "The value has to be a number greater or equal 0."
 msgstr "La valeur doit être un nombre supérieur ou égal à zéro."
 
-#: Model/Attribute.php:1243
+#: Model/Attribute.php:1285
 msgid "The value has to be a number between 0 and 10."
 msgstr "La valeur doit être un nombre compris entre 0 et 10."
 
-#: Model/Attribute.php:1923;1991
+#: Model/Attribute.php:1968;2036
 msgid "Could not read user."
 msgstr "Impossible de lire l'utilisateur."
 
-#: Model/Attribute.php:2527
+#: Model/Attribute.php:2616
 msgid "This field is mandatory."
 msgstr "Ce champ est obligatoire."
 
-#: Model/Attribute.php:2885
+#: Model/Attribute.php:3069
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr "Quelque chose s'est mal passé. Un ID d'événement non numérique a été reçu lors de la tentative de création d'une archive zip d'un fichier malveilant."
 
-#: Model/Event.php:4532
+#: Model/Event.php:5392
 msgid "Issues while loading the stix file. "
 msgstr "Problèmes lors du chargement du fichier stix. "
 
-#: Model/Event.php:4534
+#: Model/Event.php:5394
 msgid "Issues with the maec library. "
 msgstr "Problèmes avec la bibliothèque maec. "
 
-#: Model/Event.php:4536
+#: Model/Event.php:5396
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "Problèmes en exécutant le script de l’ingestion ou l’entrée est invalide. "
 
-#: Model/Event.php:4539
+#: Model/Event.php:5399
 msgid "Please ask your administrator to "
 msgstr "S’il vous plaît demandez à votre administrateur de "
 
-#: Model/Event.php:4541
+#: Model/Event.php:5401
 msgid "Please "
 msgstr "S'il vous plait "
 
-#: Model/Event.php:4543
+#: Model/Event.php:5403
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr "vérifier si les dépendances pour STIX sont réunis par l’intermédiaire de l’outil de diagnostic."
 
-#: Model/Event.php:4575
+#: Model/Event.php:5435
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:4584
+#: Model/Event.php:5444
 msgid "%s not set"
 msgstr "%s n'est pas défini"
 
-#: Model/Server.php:114
+#: Model/Event.php:5667
+msgid "Could not add tags."
+msgstr "Ajout de tag impossible."
+
+#: Model/Galaxy.php:219;276;286;300
+msgid "Invalid %s."
+msgstr "Invalide %s."
+
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr "La Galaxie ne peut pas être représentée comme matrice"
+
+#: Model/Server.php:121
 msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
 msgstr "Certaines tâches d'administration sont disponibles via l'API. Cela permet d'effectuer la maintenance et la configuration de MISP de manière automatisée ou via des outils externes."
 
-#: Model/Server.php:115
+#: Model/Server.php:122
 msgid "Administering MISP via the CLI"
 msgstr "Administration de MISP via la ligne de commande"
 
-#: Model/Server.php:125
+#: Model/Server.php:132
 msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
 msgstr "Si vous souhaitez automatiser des tâches tel que la mise en cache ou la récupération depuis une autre instance, vous pouvez le faire en utilisant l'outil en ligne de commande suivant. Exécutez simplement la commande indiqué via la ligne de commande/créer le jobs cron facilement depuis celle-ci."
 
-#: Model/Server.php:126
+#: Model/Server.php:133
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr "Automatisation de certaines tâches de la console"
 
-#: Model/Server.php:135
+#: Model/Server.php:142
 msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
 msgstr "L’url racine de l’application (dans le format https://www.mymispinstance.com). Plusieurs fonctionnalités nécessitent ce paramètre."
 
-#: Model/Server.php:137
+#: Model/Server.php:144
 msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
 msgstr "L'url de base actuellement renseignée ne correspond pas à l'url avec laquel vous avez accès à cette page. Faites abstraction de cela si vous accédez à cette page depuis une URL alternative (par exemple une adresse IP)."
 
-#: Model/Server.php:143
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr "L'url de base de l'application (au format https://www.mymispinstance.com) comme visible externe/par d'autres MISPs. MISP va encoder cette URL dans les groupes de partage lorsqu'elle est incluse. Si cette valeur n'est pas définie, l'url de base est utilisée comme une erreur."
+
+#: Model/Server.php:158
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr "Tant que cette valeur n'est pas sur \"true\", l'instance ne sera accessible que pour les administrateurs du site."
 
-#: Model/Server.php:151
+#: Model/Server.php:166
 msgid "Select the language MISP should use. The default is english."
 msgstr "Sélectionnez le language que MISP devrait utiliser. Cette valeur est sur \"english\" par défaut."
 
-#: Model/Server.php:161
+#: Model/Server.php:176
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr "Activer certaines corrélations gourmandes en termes de performance (actuellement corrélation de CIDR)"
 
-#: Model/Server.php:170
+#: Model/Server.php:185
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr "Il est fortement recommandé d'installer toutes les dépendances python dans un virtualenv. L'emplacement recommandé est : %s/venv"
+
+#: Model/Server.php:195
 msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
 msgstr "Dans certains cas, un usage intensif de l'instance MISP peut générer des erreurs de trou noir non voulues à cause du nombre élevés de requêtes reçues par le serveur. Désactivez la fonctionnalité d'auto-déconnexion pour faciliter la charge du système."
 
-#: Model/Server.php:179
+#: Model/Server.php:204
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr "Définissez le score ssdeep auquel il faut considérer deux hashs ssdeep comme corrélables [1-100]"
 
-#: Model/Server.php:187
+#: Model/Server.php:212
 msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
 msgstr "Définir le nombre maximal de corrélations qui peut être atteint pour un seul événement. Pour les cas les plus extrêmes, cela peut prévenir des problèmes de mémoire. La valeur par défaut est de 5k."
 
-#: Model/Server.php:196
+#: Model/Server.php:221
 msgid "The message that users will see if the instance is not live."
 msgstr "Le message que les utilisateurs verront si l'instance n'est pas disponible."
 
-#: Model/Server.php:198
+#: Model/Server.php:223
 msgid "If this is not set the default value will be used."
 msgstr "Si cette valeur n'est pas renseignée, la valeur par défaut sera utilisée."
 
-#: Model/Server.php:204;212;230;254;262;270;278;335;383;391;457
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
 msgid "This setting is deprecated and can be safely removed."
 msgstr "Ce paramétrage est déprécié et peut être supprimé de manière sécurisée."
 
-#: Model/Server.php:220
+#: Model/Server.php:245
 msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
 msgstr "La mise en cache d'exports peut prendre une place considérable en terme d'espace disque et peut être désactivé en utilisant ce paramètre. Désactiver la mise en cache des exports n'est pas recommandé car il s'agit d'une fonctionnalité intéressant, cependant, su votre serveur a des soucis d'espace libre, il peut faire sens de désactiver cette option."
 
-#: Model/Server.php:238
+#: Model/Server.php:263
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr "Texte en pied de page avant le texte \"Powered by MISP\"."
 
-#: Model/Server.php:246
+#: Model/Server.php:271
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr "Texte en pied de page suivant le texte \"Powered by MISP\"."
 
-#: Model/Server.php:286
+#: Model/Server.php:311
 msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
 msgstr "Si défini, ce paramètre vous permet d’afficher un logo sur le côté droit du pied de page. Chargez-le sous une image personnalisée dans l’outil de gestion de fichier."
 
-#: Model/Server.php:294
+#: Model/Server.php:319
 msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
 msgstr "Si défini, ce paramètre vous permet d’afficher un logo à la place de l'icone d'accueil. Chargez-le en tant qu'image personnalisée dans l’outil de gestion de fichier."
 
-#: Model/Server.php:302
+#: Model/Server.php:327
 msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
 msgstr "Si ensemble, l’image spécifiée ici remplacera le logo MISP principal sur l’écran de connexion. Chargez-le comme une image personnalisée dans l’outil de gestion de fichier."
 
-#: Model/Server.php:310
+#: Model/Server.php:335
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr "Le nom de l'organisation hébergeant l'instance. Ce nom sera utilisé dans le sujet des e-mail."
 
-#: Model/Server.php:318
+#: Model/Server.php:343
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr "L'organisation hébergeant cette instance. Si non sélectionné, alors la réplication d'instances ne peut être ajoutée."
 
-#: Model/Server.php:327
+#: Model/Server.php:352
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr "L'UUID de l'instance MISP. L'UUID est utilisé pour identifier cette instance."
 
-#: Model/Server.php:329
+#: Model/Server.php:354
 msgid "No valid UUID set"
 msgstr "Aucun UUID valide entré"
 
-#: Model/Server.php:343
+#: Model/Server.php:368
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr "Définir ce paramètre en 'false' va masque le nom/logo des organisations."
 
-#: Model/Server.php:351
+#: Model/Server.php:376
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr "Mettre le niveau de menace de l'événement dans le sujet des e-mail de notification."
 
-#: Model/Server.php:359
+#: Model/Server.php:384
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr "Il s'agit de la chaîne TLP pour les mails lorqu'email_subject_tag n'est pas trouvé."
 
-#: Model/Server.php:367
+#: Model/Server.php:392
 msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
 msgstr "Si cette balise est paramétrée sur un événement, sa valeur sera envoyée en tant que sujet de l'e-mail. La balise email_subject_TLP_string sera utilisé si la balise n’est pas définie."
 
-#: Model/Server.php:375
+#: Model/Server.php:400
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr "Inclure le nom de \"email_subject_tag\" dans le sujet. Quand placé sur \"false\", seule la valeur du tag est utilisée."
 
-#: Model/Server.php:399
+#: Model/Server.php:424
 msgid "Enables the use of MISP's background processing."
 msgstr "Activer l'usage de traitements MISP en arrière-plan."
 
-#: Model/Server.php:407
+#: Model/Server.php:432
 msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
 msgstr "Le répertoire ou les pièces jointes sont stockées. MISP ne migrera pas les données existantes si vous changez ce paramètre. Le seul moyen sûr de changer ce paramètre est de le faire dans config.php, quand MISP n'est pas démarré, et après avoir déplacé/copié les données existantes dans le nouveau répertoire. MISP doit avoir les droits d'accès en lecture et en écriture sur le nouveau répertoire."
 
-#: Model/Server.php:416
+#: Model/Server.php:441
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr "Autoriser le cache XML à inclure des pièces jointes encodées."
 
-#: Model/Server.php:424
+#: Model/Server.php:449
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr "Toujours télécharger les pièces jointes quand elles sont chargés par un utilisateur dans un navigateur"
 
-#: Model/Server.php:432
+#: Model/Server.php:457
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr "L'adresse e-mail utilisée par MISP pour l'ensemble des notifications"
 
-#: Model/Server.php:440
+#: Model/Server.php:465
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr "Vous pouvez désactiver l'envoi d'e-mail en utilisant ce paramètre. Quand celui-ci est activé, aucun e-mail ne sera transmis par MISP."
 
-#: Model/Server.php:449
+#: Model/Server.php:474
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr "L'adresse mail de contact de l'équipe de support que MISP devrait inclure."
 
-#: Model/Server.php:465
+#: Model/Server.php:490
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr "Transformer les attributs de type \"Vulnerability\" en liens cliquables vers la table de CVE fournie"
 
-#: Model/Server.php:473
+#: Model/Server.php:498
 msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
 msgstr "Ce paramètre contrôle si les mails de notification vont être envoyés ou non lorsqu'un événement est créé par l'interface REST. Cela peut être une bonne idée de désactivé ce paramètre lors du premier paramétrage d'un lien à une autre instance pour éviter le spam des utilisateurs durant la première récupération. Récapitulatif rapide: True = Les mails ne sont pas envoyés, False, les mail sont envoyé pour les événements publiés par synchronisation/REST API."
 
-#: Model/Server.php:481
+#: Model/Server.php:506
 msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
 msgstr "activer cet indicateur va permettre la transmission de la description de l'événement dans le sujet des mails d'alertes. Soyez attentif au fait que le sujet n'est pas chiffré par GnuPG don n'activez cette option seulement si vous acceptez qu'une partie de la description de l'événement soit transmise en clair."
 
-#: Model/Server.php:489
+#: Model/Server.php:514
 msgid "The default distribution setting for events (0-3)."
 msgstr "Le paramètre de la distribution par défaut pour les événements (0-3)."
 
-#: Model/Server.php:498
+#: Model/Server.php:523
 msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
 msgstr "Le niveau de distribution par défaut, à définir sur \"event\" si vous souhaitez que les attributs prennent par défaut le niveau de distribution de l'événement (0-3 ou \"event\")"
 
-#: Model/Server.php:507
+#: Model/Server.php:532
 msgid "The default threat level setting when creating events."
 msgstr "Le réglage du niveau de menace par défaut lors de la création d'événements."
 
-#: Model/Server.php:516
+#: Model/Server.php:541
+msgid "The tag collection to be applied to all events created manually."
+msgstr "La collection de balises à appliquer à tous les événements créés manuellement."
+
+#: Model/Server.php:550
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr "Activer l'option de taggage de MISP. Cette fonction est hautement recommandée."
 
-#: Model/Server.php:524
+#: Model/Server.php:558
 msgid "Show the full tag names on the event index."
 msgstr "Voir le nom complet du tag en index de l'événement."
 
-#: Model/Server.php:533
+#: Model/Server.php:567
 msgid "Used on the login page, before the MISP logo"
 msgstr "Utilisé sur la page de connexion avant le logo MISP"
 
-#: Model/Server.php:541
+#: Model/Server.php:575
 msgid "Used on the login page, after the MISP logo"
 msgstr "Utilisé sur la page de connexion après le logo MISP"
 
-#: Model/Server.php:549
+#: Model/Server.php:583
 msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
 msgstr "Utilisé sur la page de connexion, à gauche du logo du MISP, chargez-le sous une image personnalisée dans l’outil de gestion de fichier."
 
-#: Model/Server.php:557
+#: Model/Server.php:591
 msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
 msgstr "Utilisé sur la page de connexion, à droite du logo du MISP, chargez-le sous une image personnalisée dans l’outil de gestion de fichier."
 
-#: Model/Server.php:565
+#: Model/Server.php:599
 msgid "Used in the page title, after the name of the page"
 msgstr "Utilisé en titre de page, après le nom de la page"
 
-#: Model/Server.php:573
+#: Model/Server.php:607
 msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
 msgstr "Autoriser les utilisateurs à prendre la propriété d'un événement téléversé via le bouton \"Ajouter un fichier XML MISP\". Cela permet de prendre la place du créateur d'un événement manuellement importé, cassant l'intention originelle de transmission. La synchronisation vers une instance ayant un créateur différent pour le même événement peut avoir des conséquences inattendues."
 
-#: Model/Server.php:581
+#: Model/Server.php:615
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr "Choisissez si les conditions d'utilisations doivent être affichée (false) ou disponibles en téléchargement (true)"
 
-#: Model/Server.php:589
+#: Model/Server.php:623
 msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
 msgstr "Le nom de fichier du fichier des conditions générales d'utilisation. Vérifiez auparavant que le fichier se trouve dans le répertoire MISP/app/files/terms"
 
-#: Model/Server.php:597
+#: Model/Server.php:631
 msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
 msgstr "L'option \"True\" active le champ \"Organisation alternative\" dans l'index des événements (\"Organisation source\" et \"Organisation membre\") à la place de ne voir que le champ \"Organisation\". Cela permet aux utilisateur des voir si un événements à été transmis par une Organisation membre de l'instance ou d'une instance connectée."
 
-#: Model/Server.php:605
+#: Model/Server.php:639
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr "Si défini en \"True\", l'accès aux événements non publiés sera interdit pour les utilisateurs en dehors de l'organisation des créateurs, exceptés les administrateurs d'instance."
 
-#: Model/Server.php:614
+#: Model/Server.php:648
 msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr "Le message envoyé aux utilisateur après la création d'un compte (doit être envoyé manuellement depuis l'interface d'administration). Utilisez \\n pour les retours à la ligne. Les variables suivantes seront automatiquement remplacées dans le texte: $password = un nouveau mot de passe temporaire généré par MISP, $username = l'adresse e-mail de l'utilisateur, $misp = l'url de l'instance, $org = l'organisation à laquelle l'instance est rattachée, comme indiqué dans MISP.org, $contact = l'adresse e-mail utilisée pour contacter l'équipe de support, comme défini dans MISP.contact. Par exemple, \"le mot de passe pour $username est $password\" va apparaître pour un utilisateur dont l'adresse mail est user@misp.org tel que \"le mot de passe pour user@misp.org est hNamJae81\"."
 
-#: Model/Server.php:623
+#: Model/Server.php:657
 msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr "Le message envoyé aux utilisateurs après une demande de réinitialisation de mort de passe. Utilisez \\n pour les retours à la ligne. Les variables suivantes seront automatiquement remplacées dans le texte: $password = un nouveau mot de passe temporaire généré par MISP, $username = l'adresse e-mail de l'utilisateur, $misp = l'url de l'instance, $org = l'organisation à laquelle l'instance est rattachée, comme indiqué dans MISP.org, $contact = l'adresse e-mail utilisée pour contacter l'équipe de support, comme défini dans MISP.contact. Par exemple, \"le mot de passe pour $username est $password\" va apparaître pour un utilisateur dont l'adresse mail est user@misp.org tel que \"le mot de passe pour user@misp.org est hNamJae81\"."
 
-#: Model/Server.php:631
+#: Model/Server.php:665
 msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
 msgstr "Depuis la version 2.3.107 vous pouvez mettre des UUIDs d'événements sur une liste noire pour éviter que celle-ci soit poussée sur votre instance. Cette fonctionnalité va aussi s'activer en arrière-plan si un événement est supprimé, ce qui évite un événement d'être poussé en retour d'une autre instance."
 
-#: Model/Server.php:638
+#: Model/Server.php:672
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr "Mettre en liste noire des UUIDs d'oganisations permet d'éviter la création d'événements par l'oganisation mise en liste noire."
 
-#: Model/Server.php:645
+#: Model/Server.php:679
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr "Si activé, l'ensemble des entrées du journal inclurons l'IP de l'utilisateur."
 
-#: Model/Server.php:654
+#: Model/Server.php:688
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr "Si activé, MISP journalisera toute les authentifications utilisant des clés d'API. Les URLs requêtées seront aussi journalisées."
 
-#: Model/Server.php:662
+#: Model/Server.php:696
 msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
 msgstr "Cette fonctionnalité permet aux utilisateurs de créer des événements accessible seulement à l'organisation et à une autre organisation de prendre la propriété de l'événement. Cela permet à des organisations de rester anonyme en demandant à un partenaire de la publier à sa place."
 
-#: Model/Server.php:671
+#: Model/Server.php:705
 msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
 msgstr "Quand activé, le nombre de corrélations visibles pour les utilisateurs actuellement connectés sera visible dans l'index de l'interface d'événement. Cela a un coût élevé en performance mais peut être utile pour voir la corrélation sur un événement observé."
 
-#: Model/Server.php:680
+#: Model/Server.php:714
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr "Quand cette option est activé, le nombre de proposition pour les événements sont indiqués dans l'index."
 
-#: Model/Server.php:689
+#: Model/Server.php:723
 msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
 msgstr "Lorsqu'activé, l'aggrégation du nombre d'avis à l'intérieur d'un événement devient visble pour les utilisateurs actuellement connectés sur l'index de l'interface des événements."
 
-#: Model/Server.php:698
+#: Model/Server.php:732
 msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
 msgstr "Lorsqu'activé, l'aggrégation du nombre de posts de discussionà l'intérieur d'un événement devient visble pour les utilisateurs actuellement connectés sur l'index de l'interface des événements."
 
-#: Model/Server.php:707
+#: Model/Server.php:741
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr "Quand ce paramètre est activé, seuls les administrateurs d'une organisation ou de l'instance peuvent éditer un profil utilisateur."
 
-#: Model/Server.php:717
+#: Model/Server.php:751
 msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
 msgstr "Activer ce paramètre pour commencer à bloquer les mails d'alertes pour les événements ayant certains tags. Définissez les tags dans MISP.block_event_alert_tag."
 
-#: Model/Server.php:726
+#: Model/Server.php:760
 msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
 msgstr "Si l'option MISP.block_event_alert est définie, les courriels d'alerte pour les événement ayant le tag défini par le paramètre vont être bloqués."
 
-#: Model/Server.php:735
+#: Model/Server.php:769
 msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
 msgstr "Activer cette option pour commencer à bloquer les mails d'alertes pour les événements anciens. Le temps exact pour ce qui constitue un ancien événement est défini dans MISP.block_old_event_alert_age."
 
-#: Model/Server.php:744
+#: Model/Server.php:778
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
 msgstr "Si le paramètre MISP.block_old_event_alert est défini, ce paramètre va contrôler quel âge l'event peut avoir pour alerter ou non. Le champ \"Date\" de l'événément est utilisé. Format attendu: chiffre, en jours"
 
-#: Model/Server.php:753
+#: Model/Server.php:787
 msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
 msgstr "Merci d'indiquer le répertoire temporaire que vous souhaitez utiliser pour certaines fonctionnalités dans MISP. Par défaut, il est défini sur \"/tmp\" et va être utilisé pour stocker certains fichiers temporaires extraits depuis les imports durant le process d'import."
 
-#: Model/Server.php:762
-msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/webroot/css directory and enter the name here."
-msgstr "Si vous souhaitez personnaliser le css, laissez un fichier css dans le répertoire /var/www/MISP/webroot/css et entrez le nom ici."
+#: Model/Server.php:796
+msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
+msgstr "Si vous souhaitez personnaliser les css, déposez simplement un fichier css dans le répertoire /var/www/MISP/app/webroot/css et entrez le nom ici."
 
-#: Model/Server.php:771
+#: Model/Server.php:805
 msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
 msgstr "Activez ce paramètre pour autoriser le blocage des attributs pour les exports de type IDS si une proposition de suppression de l'indicateur IDS ou pour supprimer l'attribut a été effectuée. Il s'agit d'un outil puissant pour gérer les faux-positifs."
 
-#: Model/Server.php:780
+#: Model/Server.php:814
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr "Activer cette option si de nouveaux tags synchronisés / ajoutés depuis des événements entrants depuis n'importe quelle source ne doivent pas être sélectionnable par défaut pour les utilisateurs."
 
-#: Model/Server.php:789
+#: Model/Server.php:823
 msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
 msgstr "*ATTENTION* Ce paramètre va complètement désactiver la corrélation sur cet instance et supprimer toutes les corrélations existantes. L'activer va générer une recorrélation complète de l'ensemble des données, ce qui peut être extrêmement long et coûteux en terme de performance. A n'activer seulement si vous être sûr de ce que vous faîtes."
 
-#: Model/Server.php:799
+#: Model/Server.php:833
 msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
 msgstr "*ATTENTION* Ce paramètre va donner la possibilité aux créateurs d'événement de désactiver la corrélation sur les événement/attributs individuels qu'ils ont créés."
 
-#: Model/Server.php:808
+#: Model/Server.php:842
 msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr "L’hôte exécutant le serveur redis à utiliser pour des tâches MISP génériques telles que la mise en cache. Cela ne veut ne doit pas être confondu avec le serveur redis utilisé par le traitement en arrière-plan."
 
-#: Model/Server.php:816
+#: Model/Server.php:850
 msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr "Le port utilisé par le serveur redis à utiliser pour des tâches MISP génériques telles que la mise en cache. Cela ne veut ne doit pas être confondu avec le serveur redis utilisé par le traitement en arrière-plan."
 
-#: Model/Server.php:824
+#: Model/Server.php:858
 msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
 msgstr "La base de données sur le serveur redis à utiliser pour des tâches génériques MISP. Si vous exécutez plusieurs instances MISP, s’il vous plaît assurez-vous d’utiliser une autre base de données pour chaque instance."
 
-#: Model/Server.php:832
+#: Model/Server.php:866
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr "Le mot de passe du serveur redis (si utilisé) à utiliser pour les tâches MISP génériques."
 
-#: Model/Server.php:841
+#: Model/Server.php:875
 msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
 msgstr "Spécifiez les champs sur lesquels filtrer lorsque vous recherchez dans la vue événement. Les valeurs par défaut sont: \"Id, uuid, value, comment, type, category, Tag.name\""
 
-#: Model/Server.php:849
+#: Model/Server.php:883
+msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
+msgstr "Définissez ceci à faux si vous souhaitez désactiver MISP la gestion de ses propres processus de travail (par exemple, si vous gérez les travailleurs avec une unité système)."
+
+#: Model/Server.php:891
 msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
 msgstr "Activez ceci uniquement si vous avez des outils utilisant MISP avec une haute consommation de ressources. Les performance générales seront abaissées et certaines requêtes transactionnelles seront évités en faveur de verrous de base de données plus court."
 
-#: Model/Server.php:861
+#: Model/Server.php:903
 msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
 msgstr "L'emplacement de l'éxécutable de GnuPG. Si vous souhaitez utiliser un exécutable GnuPG différent de \"/usr/bin/gnupg\", vous pouvez le définir ici. Si le paramètre par défaut est correct, gardez juste le paramètre par défaut suggéré par MISP."
 
-#: Model/Server.php:869
+#: Model/Server.php:911
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr "Autorise les mails non chiffrés à être transmis à des utilisateurs n'ayant pas de clés GnuPG."
 
-#: Model/Server.php:877
+#: Model/Server.php:919
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr "Autoriser le corps des mails non chiffrés à contenir des détails à propos de l'événement."
 
-#: Model/Server.php:885
+#: Model/Server.php:927
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr "Activer la signature des mails GnuPG. Par défaut, les mails GnuPG sont signés"
 
-#: Model/Server.php:893
+#: Model/Server.php:935
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr "L'adresse mail à laquelle est attachée la clé GnuPG de l'instance."
 
-#: Model/Server.php:901
+#: Model/Server.php:943
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr "Le mot de passe (si renseigné) de la clé GnuPG de l'instance."
 
-#: Model/Server.php:910
+#: Model/Server.php:952
 msgid "The location of the GnuPG homedir."
 msgstr "L’emplacement du répertoire de base pour GnuPG."
 
-#: Model/Server.php:921
+#: Model/Server.php:963
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr "Activer le chiffrement SMIME. La posture de chiffrement des paramètres GnuPG.onlyencrypted et GnuPG.bodyonlyencrypted est héritée si SMIME est activé."
 
-#: Model/Server.php:929
+#: Model/Server.php:971
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr "L'adresse mail à laquelle est attachée la clé SMIME de l'instance."
 
-#: Model/Server.php:937
+#: Model/Server.php:979
 msgid "The location of the public half of the signing certificate."
 msgstr "La localisation de la partie publique du certificat de signature."
 
-#: Model/Server.php:945
+#: Model/Server.php:987
 msgid "The location of the private half of the signing certificate."
 msgstr "La localisation de la partie privée du certificat de signature."
 
-#: Model/Server.php:953
+#: Model/Server.php:995
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr "Le mot de passe (si renseigné) de la clé SMIME de l'instance."
 
-#: Model/Server.php:965
+#: Model/Server.php:1007
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr "Le nom d'ĥôte du proxy HTTP pour les requêtes de synchronisation externe. Laisser vide pour ne pas utiliser de proxy."
 
-#: Model/Server.php:973
+#: Model/Server.php:1015
 msgid "The TCP port for the HTTP proxy."
 msgstr "Le port TCP pour le proxy HTTP."
 
-#: Model/Server.php:981
+#: Model/Server.php:1023
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr "La méthode d'authentification pour le proxy HTTP. Les modes actuellement supportés sont \"Basic\" et \"Digest\". Laisser vide pour ne pas activer d'authentification proxy."
 
-#: Model/Server.php:989
+#: Model/Server.php:1031
 msgid "The authentication username for the HTTP proxy."
 msgstr "Le nom d'utilisateur pour le proxy HTTP."
 
-#: Model/Server.php:997
+#: Model/Server.php:1039
 msgid "The authentication password for the HTTP proxy."
 msgstr "Le mot de passe pour le proxy HTTP."
 
-#: Model/Server.php:1008
+#: Model/Server.php:1050
 msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
 msgstr "Le sel utilisé pour hasher les mot de passe. Vous ne pouvez pas réinitialiser cette valeur depuis l'interface, seulement depuis le fichier settings.php. Gardez à l'esprit que cette action va invalider l'ensemble des mots de passe présents dans la base de données."
 
-#: Model/Server.php:1017
+#: Model/Server.php:1059
 msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
 msgstr "Activer ce paramètre pour transmettre tout les logs d'audit directement vers syslog. Gardez à l'esprit que cela peut être verbeux et va inclure les données d'utilisateurs, d'organisation et d'événements."
 
-#: Model/Server.php:1026
+#: Model/Server.php:1068
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr "Taille du mot de passe requise. Si non définie ou définie sur 0, alors la valeur par défaut est supposée (12)."
 
-#: Model/Server.php:1034
+#: Model/Server.php:1076
 msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 msgstr "Complexité de mot de passe requise. Laisser vide pour le paramètre par défaut (3 sur 4, avec au moins un chiffre ou un caractères spécial) ou entrez votre propre regex. Gardez à l'esprit que la longueur est testé dans une autre clé. Par défaut (simplement 3 type de caractères différents sur 4 ou un minimum de 16 caractères): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 
-#: Model/Server.php:1042
+#: Model/Server.php:1084
 msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
 msgstr "Activer ce paramètre va demander à l'utilisateur de soumettre sont mot de passe pour chaque édition de son profil (incluant le changement de mot de passe). Pour les administrateurs, la confirmation sera requise à chaque changement sur le profil d'un utilisateur. Cette fonction peut potentiellement servir de mitigation dans le cas ou un attaquant tenterait de changer le mot de passe d'un utilisateur compromis dans le but d'établir une persistance, dans l'autre sens, cette fonctionnalité peut être extrêmement ennuyant pour les utilisateurs."
 
-#: Model/Server.php:1051
+#: Model/Server.php:1093
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr "L’activation de ce paramètre va assainir le contenu d’un attribut lors de sa suppression"
 
-#: Model/Server.php:1060
+#: Model/Server.php:1102
 msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
 msgstr "Activer ce paramètre va bloquer les organisations de l'index d'être visibles par d'autres personnes que les administrateurs de l'instance. Gardez à l'esprit que les utilisateurs peuvent toujours voir les organisation qui produisent de la donnée via des événements, propositions, journaux d'événement, etc."
 
-#: Model/Server.php:1069
+#: Model/Server.php:1111
 msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
 msgstr "Autoriser le passage de la clé API via le paramètre d'URL \"apikey\" - option fortement déconseillé mais si vous avez de vieux outils ne pouvant pas utiliser d'en-têtes d'authorization, cela peut être une solution. N'utilisez cette option qu'en dernier ressort."
 
-#: Model/Server.php:1071
+#: Model/Server.php:1113
 msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
 msgstr "Vous avez activé le passage de la clé d'API dans les paramètres d'URL. Cette activation est fortement déconseillée, Souhaitez-vous vraiment révéler votre clé d'API dans vos logs?..."
 
-#: Model/Server.php:1081
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr "Autoriser les requêtes d'origine croisée à cette instance, les origines correspondantes données dans Security.cors_origin. Mettre à faux pour désactiver totalement"
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr "Définit les origines à partir desquelles MISP permettra des requêtes d'origine croisée. Utile pour l'intégration externe. Comma séparé si vous avez besoin de plus d'un."
+
+#: Model/Server.php:1141
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr "Le nombre d'essais qu'un utilisateur a pour tenter de se connecter et se tromper avant le déclenchement de la protection anti-bruteforce."
 
-#: Model/Server.php:1089
+#: Model/Server.php:1149
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr "La durée (en secondes) de blocage de l'utilisateur lorsque celui-ci dépasse le nombre d'authentifications échouées."
 
-#: Model/Server.php:1100
+#: Model/Server.php:1160
 msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
 msgstr "Définir sur \"true\" pour regénérer automatiquement les sessions après x nombres de requêtes. Cela peut générer une déconnexion de l'utilisateur durant sont travail, ce qui peut être frustrant. N'activez cette option que si vous devez regénérer des session. (Non recommandé)"
 
-#: Model/Server.php:1108
+#: Model/Server.php:1168
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr "Définir sur \"True\" pour vérifier le user-agent de chaque requête. Cela peut ocasionner des déconnexions intempestives (non recommandé)."
 
-#: Model/Server.php:1116
+#: Model/Server.php:1176
 msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
 msgstr "Le type de session utilisé par MISP. Le paramétrage par défaut est php, qui va lui-même utiliser ce qui est configuré dans php.ini pour les données de session (options supportées: php, base de donnée). L'option recommandée est php et le paramétrage de PHP afin qu'il utilise des sessions Redis via votre php.ini. Ajoutez juste 'session.save_handler = redis' et \"session.save_path = 'tcp://localhost:6379'\" (remplacer la valeur avec votre connexion redis) vers "
 
-#: Model/Server.php:1125
-msgid "The timeout duration of sessions (in MINUTES)."
-msgstr "Le délai d’expiration des sessions (en MINUTES)."
+#: Model/Server.php:1185
+msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
+msgstr "La durée d'expiration des sessions (en MINUTES). 0 ne signifie pas infini pour le gestionnaire de session PHP, les sessions seront invalidées immédiatement."
 
-#: Model/Server.php:1133
+#: Model/Server.php:1193
 msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
 msgstr "Le délai d'expiration du cookie (en MINUTES). Le délai d'expiration de la session est rafraîchit fréquement alors que ceux des cookies ne le sont pas. Généralement, il est recommandé d'avoir un plus grands délai d'expiration pour les cookies que celui des sessions."
 
-#: Model/Server.php:1144
+#: Model/Server.php:1204
 msgid "The default policy action for the values added to the RPZ."
 msgstr "La politique d'action par défaut pour les valeurs ajoutées au RPZ."
 
-#: Model/Server.php:1153
+#: Model/Server.php:1213
 msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
 msgstr "La valeur par défaut utilisé en vase clos par l'exportation RPZ si le paramètre de vase clos est activé pour l'export."
 
-#: Model/Server.php:1161
+#: Model/Server.php:1221
 msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
 msgstr "Le numéro de série dans la portion SOA du fichier de zone. (en nombre, la meilleure manière est yyyymmmddrr ou rr sont les deux chiffres de la révision du fichier. $date va automatiquement être converti vers l'actuel yyyymmdd, alors $date00 est un paramètre valide)."
 
-#: Model/Server.php:1169
+#: Model/Server.php:1229
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Le TTL de raffraichissement spécifié dans la partie SOA du fichier de zone. (en secondes, ou la durée encodée tels que 15m)"
 
-#: Model/Server.php:1177
+#: Model/Server.php:1237
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Le TTL de nouvelle tentative spécifié dans la partie SOA du fichier de zone. (en secondes, ou la durée encodée tels que 15m)"
 
-#: Model/Server.php:1185
+#: Model/Server.php:1245
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Le TTL d'expiration spécifié dans la partie SOA du fichier de zone. (en secondes, ou la durée encodée tels que 15m)"
 
-#: Model/Server.php:1193
+#: Model/Server.php:1253
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Le TTL minimum spécifié dans la partie SOA du fichier de zone. (en secondes, ou la durée encodée tels que 15m)"
 
-#: Model/Server.php:1201
+#: Model/Server.php:1261
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "La durée de vie du fichier de zone. (en secondes, ou la durée codée tels que 15 m)"
 
-#: Model/Server.php:1217
+#: Model/Server.php:1277
 msgid "Alternate nameserver"
 msgstr "Serveur de noms alternatif"
 
-#: Model/Server.php:1225
+#: Model/Server.php:1285
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr "L'adresse e-mail indiquée dans la partie SOA du fichier de zone."
 
-#: Model/Server.php:1233
+#: Model/Server.php:1293
 msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
 msgstr "Activer ou désactiver la fonctionnalité de publication/souscription de MISP. Vérifier que l'installation des pré-requis a été effectuée pour que le plugin fonctionne. Référez vous aux instructions d'installation pour plus d'informations."
 
-#: Model/Server.php:1242
+#: Model/Server.php:1302
 msgid "The port that the pub/sub feature will use."
 msgstr "Le port qui sera utilisé par la fonctionnalité de publication/abonnement."
 
-#: Model/Server.php:1251
+#: Model/Server.php:1311
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr "Emplacement de la base de données Redis utilisée par MISP et le script PUB Python pour mettre en file d'attente les données devant être publiées."
 
-#: Model/Server.php:1260
+#: Model/Server.php:1320
 msgid "The port that Redis is listening on."
 msgstr "Le port sur lequel Redis écoute."
 
-#: Model/Server.php:1269
+#: Model/Server.php:1329
 msgid "The password, if set for Redis."
 msgstr "Le mot de passe de Redis."
 
-#: Model/Server.php:1278
+#: Model/Server.php:1338
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr "La base de données à utiliser pour les files d’attente de messages sur la fonctionnalité de publication/abonnement."
 
-#: Model/Server.php:1287
+#: Model/Server.php:1347
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr "L'espace à utiliser pour les files d’attente de messages sur la fonctionnalité de publication/abonnement."
 
-#: Model/Server.php:1296
+#: Model/Server.php:1356
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr "Activer ce paramètre pour inclure les charges encodées en base 64 des échantillons de malware/pièces jointes dans les éléments sortants."
 
-#: Model/Server.php:1304
+#: Model/Server.php:1364
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr "Active ou désactive la publication de toute création/modification/suppression d'événements."
 
-#: Model/Server.php:1312
+#: Model/Server.php:1372
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr "Active ou désactive la publication de n’importe quel créations/modifications/suppressions d'objet."
 
-#: Model/Server.php:1320
+#: Model/Server.php:1380
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr "Active ou désactive la publication de la création/suppression de toute référence à un objet."
 
-#: Model/Server.php:1328
+#: Model/Server.php:1388
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr "Activer ou désactiver la publication des créations/éditions/suppression d'attributs."
 
-#: Model/Server.php:1336
+#: Model/Server.php:1396
 msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr "Active ou désactive la publication d'une création/modification/suppression de tag à chaque fois qu'un tag est attaché/détaché de divers éléments MISP."
 
-#: Model/Server.php:1344
+#: Model/Server.php:1404
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr "Active ou désactive la publication des nouvelles observations pour la publication/abonnement des flux ZMQ."
 
-#: Model/Server.php:1352
+#: Model/Server.php:1412
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr "Active ou désactive la publication des utilisateur nouvellement créé/modifié vers le flux de publication/abonnement ZeroMQ."
 
-#: Model/Server.php:1360
+#: Model/Server.php:1420
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr "Active ou désactive la publication des organisations nouvellement créées/modifiées vers le flux de publication/abonnement ZeroMQ."
 
-#: Model/Server.php:1368
+#: Model/Server.php:1428
 msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr "Active ou désactive la publication d'entrées de logs dans le flux de publication/souscription ZeroMQ. Gardez à l'esprit que cette option peut être potentiellement verbeuse selon vos paramètrages de journalisation."
 
-#: Model/Server.php:1376
+#: Model/Server.php:1436
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr "Activer la connexion à une instance ElasticSearch"
 
-#: Model/Server.php:1384
-msgid "The URL(s) at which to access ElasticSearch - comma seperate if you want to have more than one."
-msgstr "L'URL(s) pour accéder à ElasticSearch - séparée par des virgules si vous en avez plusieurs."
+#: Model/Server.php:1444
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
+msgstr "L'URL(s) à laquelle accéder à ElasticSearch - une virgule séparée si vous voulez avoir plus d'une."
 
-#: Model/Server.php:1392
+#: Model/Server.php:1452
 msgid "The index in which to place logs"
 msgstr "L'index dans lequel doivent être placés les logs"
 
-#: Model/Server.php:1400
+#: Model/Server.php:1460
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr "Activer ou désactiver le téléversement de fichier malveillants vers S3 plutôt que vers le disque (ATTENTION: Demandez la permission à Amazon auparavant)"
 
-#: Model/Server.php:1408
+#: Model/Server.php:1468
 msgid "Bucket name to upload to"
 msgstr "Nom du bucket vers lequel téléverser"
 
-#: Model/Server.php:1416
+#: Model/Server.php:1476
 msgid "Region in which your S3 bucket resides"
 msgstr "La région dans laquelle est votre bucket S3"
 
-#: Model/Server.php:1424
+#: Model/Server.php:1484
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr "Clé AWS à utiliser lors du téléversement des fichiers malveillants (AVERTISSEMENT : il ' hautement recommandé d’utiliser si possible des rôles EC2 IAM)"
 
-#: Model/Server.php:1432
+#: Model/Server.php:1492
 msgid "AWS secret key to use when uploading samples"
 msgstr "Clé secrète AWS à utiliser pour transférer des malwares"
 
-#: Model/Server.php:1440
+#: Model/Server.php:1500
 msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
 msgstr "Ce paramètre défini qui va avoir un accès à la vue des avis apportés. Le paramètre par défaut est que seul le propriétaire de l'événement peut les voir (en plus de toute personne pouvant voir sa propre contribution) avec l'autre option d'être apporteur d'avis (ce qui signifie que le propriétaire de l'événement et tout ceux qui contribue aux avis concernant cet événement) et Tout le monde (ce qui signifie toute personne ayant accès à l'événement/attribut)."
 
-#: Model/Server.php:1449
+#: Model/Server.php:1509
 msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
 msgstr "Activer l'anonymisation des avis va simplement agréger tout les avis à la place de montrer les organisation les ayant rapportés. Les utilisateurs seront en mesure de voir le nombre d'avis soumis par leur organisation et le nombre d'avis des autres organisations"
 
-#: Model/Server.php:1457
+#: Model/Server.php:1517
 msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
 msgstr "Définissez la plage dans laquelle les observations vont être prise en compte lors de la génération de graphes. Par exemple, pour une observation dont la sighted_date est 7 jours avant, celle-ci ne sera plus considérée comme valable. Le paramètre est en nombre de jour, par défaut, 365"
 
-#: Model/Server.php:1465
+#: Model/Server.php:1525
 msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
 msgstr "Activez cette fonctionallité si vous souhaitez effectuer que l'authentification soit effectuée par un outil externe et que l'authentification sur MISP se fasse par un en-tête personnalisé."
 
-#: Model/Server.php:1475
+#: Model/Server.php:1535
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr "Définir l'en-tête que MISP devrait rechercher. Si laissé vide, l'en-tête par défaut sera \"Authorization\"."
 
-#: Model/Server.php:1484
+#: Model/Server.php:1544
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr "Utiliser un nom d'en-tête pour l'en-tête d'authentification - paramètrage par défaut activé"
 
-#: Model/Server.php:1493
+#: Model/Server.php:1553
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr "L'espace de nom de l'en-tête par défaut pour l'authentification - la valeur par défaut est HTTP_"
 
-#: Model/Server.php:1502
+#: Model/Server.php:1562
 msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
 msgstr "Si ce paramètre est activé, alors le seul moyen de s'authentifier sera l'utilisation d'en-tête personnalisé. Alternativement, vous pouvez utiliser un mode hybride permettant de journaliser les actions utilisateurs si l'en-tête est trouvé, les autres utilisateurs seront redirigés vers la page de connexion habituelle."
 
-#: Model/Server.php:1511
+#: Model/Server.php:1571
 msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
 msgstr "Si vous utilisez un outil externe pour vous authentifier avec MISP et voulez autoriser seulement l'URL de l'outil comme un point valide d'entrée, alors définissez ce champ. "
 
-#: Model/Server.php:1520
+#: Model/Server.php:1580
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr "Le nom de la méthode d'authentification, il ne s'agit que d'un nom cosmétique qui sera vu dans la page de création des utilisateurs et dans les journaux d'événements."
 
-#: Model/Server.php:1529
+#: Model/Server.php:1589
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr "Désactiver le bouton de déconnexion pour les utilisateurs authentifiés avec un système d'authentification externe."
 
-#: Model/Server.php:1537
+#: Model/Server.php:1597
 msgid "Enable/disable the enrichment services"
 msgstr "Activer/désactiver les services d'enrichissement"
 
-#: Model/Server.php:1545
+#: Model/Server.php:1605
 msgid "Set a timeout for the enrichment services"
 msgstr "Définir un temps d'expiration pour les services d'enrichissement"
 
-#: Model/Server.php:1553;1665
+#: Model/Server.php:1613;1725
 msgid "Enable/disable the import services"
 msgstr "Activer/Désactiver le service d'import"
 
-#: Model/Server.php:1561;1682
+#: Model/Server.php:1621;1742
 msgid "Set a timeout for the import services"
 msgstr "Définir un temps d'expiration pour les services d'importation"
 
-#: Model/Server.php:1569
+#: Model/Server.php:1629
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "L'url utilisée pour accéder aux services d'import. Par défaut, il est accessible avec 127.0.0.1:6666"
 
-#: Model/Server.php:1577
+#: Model/Server.php:1637
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Le prot utilisé pour accéder aux services d'import. Par défaut, il est accessible avec 127.0.0.1:6666"
 
-#: Model/Server.php:1585
+#: Model/Server.php:1645
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "L'url utilisée pour accéder aux services d'export. Par défaut, il est accessible avec 127.0.0.1:6666"
 
-#: Model/Server.php:1593
+#: Model/Server.php:1653
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Le port utilisé pour accéder aux services d'export. Par défaut, il est accessible avec 127.0.0.1:6666"
 
-#: Model/Server.php:1601
+#: Model/Server.php:1661
 msgid "Enable/disable the export services"
 msgstr "Activer/Désactiver le service d'export"
 
-#: Model/Server.php:1609
+#: Model/Server.php:1669
 msgid "Set a timeout for the export services"
 msgstr "Définir un temps d'expiration pour les services d'exportation"
 
-#: Model/Server.php:1617
+#: Model/Server.php:1677
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr "Activer/désactiver le survol des informations provenant des modules d’enrichissement"
 
-#: Model/Server.php:1625
+#: Model/Server.php:1685
 msgid "Set a timeout for the hover services"
 msgstr "Définir une expiration pour les services d'exportation"
 
-#: Model/Server.php:1633
+#: Model/Server.php:1693
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "L'url utilisée pour accéder aux services d'enrichissement. Par défaut, il est accessible avec 127.0.0.1:6666"
 
-#: Model/Server.php:1641
+#: Model/Server.php:1701
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "Le port utilisé pour accéder aux services d'enrichissement. Par défaut, il est accessible avec 127.0.0.1:6666"
 
-#: Model/Server.php:1649
+#: Model/Server.php:1709
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr "L'Url a utiliser pour accéder à Cortex. Par défaut, celui-ci est accesible à http://cortex-url"
 
-#: Model/Server.php:1657
+#: Model/Server.php:1717
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr "Le port utilisé pour accéder à Cortex. Par défaut, il s'agit du port 9000"
 
-#: Model/Server.php:1673
+#: Model/Server.php:1733
 msgid "Set an authentication key to be passed to Cortex"
 msgstr "Définissez une clé d’authentification devant être transmise à Cortex"
 
-#: Model/Server.php:1690
+#: Model/Server.php:1750
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr "Définir en \"false\" pour désactiver la vérification SSL. Ce n'est pas recommandé."
 
-#: Model/Server.php:1699
+#: Model/Server.php:1759
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr "Indiquer comme \"false\" si vous souhaitez ignorer les erreurs de nom d'hôtes lors de la validation de certificats."
 
-#: Model/Server.php:1708
+#: Model/Server.php:1768
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr "Si défini sur \"True\", les certificats auto-signés seront acceptés. Cela requiert l'activation de Cortex_ssl_verify_peer."
 
-#: Model/Server.php:1717
+#: Model/Server.php:1777
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr "Définissez le chemin absolu du fichier de Certificat Autoritaire que vous souhaitez utiliser pour la vérification des certificats SSL."
 
-#: Model/Server.php:1726
+#: Model/Server.php:1786
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr "Fournir une méthode d'authentification personalisée pour les utilisateurs ayant une URL externe de réinitialisation de mot de passe."
 
-#: Model/Server.php:1735
+#: Model/Server.php:1795
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr "Fournir une URL de déconnexion personnalisée pour vos utilisateur qui permettra de journaliser leur déconnexion en utilisant votre système d'authentification."
 
-#: Model/Server.php:1745
+#: Model/Server.php:1805
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr "Le niveau de débogage de l’instance, utilisez toujours 0 pour les instances en production."
 
-#: Model/Server.php:1754
+#: Model/Server.php:1814
 msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
 msgstr "Le niveau de debuggage de l'instance pour les adminstrateurs. Cette option permet aux administrateurs de l'instance de lancer le mode debug sur une instance active sans exposer les autres utilisateurs. L'option la plus verbeuse de debug et site_admin_debug sont utilisés pour les administrateurs d'instance."
 
-#: Model/Server.php:2401
+#: Model/Server.php:1947
+msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
+msgstr "Bloqué une modification à un événement qui a été créé localement. Cela peut se produire si un événement synchronisé qui a été créé sur cette instance a été modifié par un administrateur du côté distant."
+
+#: Model/Server.php:2054
+msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+msgstr "Action non autorisée. Ceci est dû soit à une clé d'authentification invalide, soit au fait que l'utilisateur de synchronisation n'a pas les droits d'authentification activés sur le serveur distant. Une autre raison pourrait être une mauvaise configuration du serveur de synchronisation."
+
+#: Model/Server.php:2056
+msgid "Sorry, this is not yet implemented"
+msgstr "Désolé, ce n'est pas encore implémenté"
+
+#: Model/Server.php:2057
+msgid "Something went wrong while trying to pull"
+msgstr "Une erreur s'est produite en essayant de tirer"
+
+#: Model/Server.php:2069;2071
+msgid "Unknown issue."
+msgstr "Problème inconnu."
+
+#: Model/Server.php:2535
 msgid "Enable or disable the %s module."
 msgstr "Activer ou désactiver le %s module."
 
-#: Model/Server.php:2404
+#: Model/Server.php:2538
 msgid "Restrict the %s module to the given organisation."
 msgstr "Restreindre le module %s à l’organisation indiquée."
 
-#: Model/Server.php:2412
+#: Model/Server.php:2546
 msgid "Set this required module specific setting."
 msgstr "Définir ce paramètre spécifique est requis pour ce module."
 
-#: Model/Server.php:2527
+#: Model/Server.php:2661
 msgid "Value not set."
 msgstr "Valeur non définie."
 
-#: Model/Server.php:3130
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr "Quelque chose s'est mal passé. MISP a essayé d'enregistrer un fichier de configuration mal formé. Paramétrage de changement restauré."
+
+#: Model/Server.php:3475
 msgid "Organisation logos"
 msgstr "Logos de l'organisation"
 
-#: Model/Server.php:3131
+#: Model/Server.php:3476
 msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
 msgstr "Le logo utilisé par une organisation dans l'index d'événement, la vue d'événement, le discussions, propositions, etc... Vérifiez que le nom du fichier est du format org.png, ou org est le nom de l'organisation (attention à la casse)."
 
-#: Model/Server.php:3133
+#: Model/Server.php:3478
 msgid "48x48 pixel .png files"
 msgstr "Fichier .png (48x48 pixels)"
 
-#: Model/Server.php:3136;3151
+#: Model/Server.php:3481;3496
 msgid "Filename must be in the following format: *.png"
 msgstr "Le nom du fichier doit être dans le format suivant: *.png"
 
-#: Model/Server.php:3140
+#: Model/Server.php:3485
 msgid "Additional image files"
 msgstr "Fichiers image additionnels"
 
-#: Model/Server.php:3141
+#: Model/Server.php:3486
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr "Les fichiers d’images envoyés vers ce répertoire peuvent être utilisés à des fins diverses, comme p. ex. logos de page login"
 
-#: Model/Server.php:3148
+#: Model/Server.php:3493
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr "text/html si indiqué en ligne, tout ce qui exprime les conditions d'utilisation si indiqués sous forme de téléchargement"
 
-#: Model/Server.php:3765
+#: Model/Server.php:3665
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr "Erreur : Le serveur n'a pas envoyé la réponse attendue. Cela peut être parce que la version du serveur distant est obsolète."
+
+#: Model/Server.php:4115
 msgid "Removing a dead worker."
 msgstr "Supprimer un processus mort."
 
-#: Model/Server.php:3766
+#: Model/Server.php:4116
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr "Suppression des données du processus mort. Le processus était de type %s avec le pid %s"
 
-#: Model/Server.php:3770
+#: Model/Server.php:4120
 msgid "Stopping a worker."
 msgstr "Stopper un processus."
 
-#: Model/Server.php:3771
+#: Model/Server.php:4121
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr "Processus en cours d'arrêt. Le processus était de type %s avec le pid %s"
 
@@ -2029,7 +2311,7 @@ msgstr "a les objets dépendants suivants"
 
 #: View/Attributes/add.ctp:7
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Ajouter attribut"
@@ -2074,7 +2356,7 @@ msgstr "Type "
 #: View/Attributes/add.ctp:36
 #: View/Attributes/add_attachment.ctp:24
 #: View/Attributes/edit.ctp:24
-#: View/Events/add.ctp:24
+#: View/Events/add.ctp:20
 msgid "Distribution "
 msgstr "Distribution "
 
@@ -2082,7 +2364,7 @@ msgstr "Distribution "
 #: View/Attributes/add_attachment.ctp:33
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
-#: View/Events/add.ctp:34
+#: View/Events/add.ctp:30
 #: View/Events/edit.ctp:26
 #: View/Feeds/add.ctp:176
 #: View/Feeds/edit.ctp:172
@@ -2109,23 +2391,24 @@ msgstr "Commentaire contextuelle"
 msgid "for Intrusion Detection System"
 msgstr "pour système de détection d’intrusion"
 
-#: View/Attributes/add.ctp:87
+#: View/Attributes/add.ctp:91
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_mitre_attack_matrix.ctp:14;113
+#: View/Elements/view_galaxy_matrix.ctp:76;199
 #: View/Events/contact.ctp:29
 #: View/Events/edit.ctp:59
 #: View/Events/free_text_import.ctp:27
 #: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:78
+#: View/ObjectReferences/ajax/add.ctp:130
 #: View/Objects/add.ctp:147
 #: View/Objects/revise_object.ctp:85
 #: View/Organisations/admin_add.ctp:49
 #: View/Organisations/admin_edit.ctp:60
-#: View/Servers/add.ctp:126
-#: View/Servers/edit.ctp:167
-#: View/SharingGroups/add.ctp:75
+#: View/Servers/add.ctp:115
+#: View/Servers/edit.ctp:162
+#: View/SharingGroups/add.ctp:115
+#: View/TagCollections/add.ctp:21
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
 #: View/TemplateElements/ajax/template_element_add_file.ctp:67
 #: View/TemplateElements/ajax/template_element_add_text.ctp:29
@@ -2134,7 +2417,7 @@ msgstr "pour système de détection d’intrusion"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/Users/admin_add.ctp:97
 #: View/Users/admin_edit.ctp:91
-#: View/Users/admin_email.ctp:51
+#: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
 #: View/Users/change_pw.ctp:23
 #: View/Users/edit.ctp:41
@@ -2142,14 +2425,17 @@ msgstr "pour système de détection d’intrusion"
 msgid "Submit"
 msgstr "Envoyer"
 
-#: View/Attributes/add.ctp:88
+#: View/Attributes/add.ctp:92
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:62
+#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/exportSearch.ctp:32
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Elements/eventattributecreation.ctp:89
-#: View/Elements/view_mitre_attack_matrix.ctp:114
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/view_galaxy_matrix.ctp:200
 #: View/Elements/serverRuleElements/pull.ctp:70
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2158,21 +2444,18 @@ msgstr "Envoyer"
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/ajax/enrich_event.ctp:21
+#: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:15
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/exportChoice.ctp:51
 #: View/Events/ajax/importChoice.ctp:12
 #: View/Events/ajax/quick_edit.ctp:6
-#: View/Galaxies/ajax/cluster_choice.ctp:32
-#: View/Galaxies/ajax/galaxy_choice.ctp:22
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:15
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
-#: View/ObjectReferences/ajax/add.ctp:82
+#: View/ObjectReferences/ajax/add.ctp:134
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/ObjectTemplates/ajax/object_choice.ctp:10
 #: View/Objects/add.ctp:153
 #: View/Objects/revise_object.ctp:87
 #: View/Objects/ajax/delete.ctp:24
@@ -2187,11 +2470,12 @@ msgstr "Envoyer"
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
 #: View/Sightings/ajax/advanced.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
-#: View/Tags/ajax/select_tag.ctp:32
-#: View/Tags/ajax/taxonomy_choice.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:6
 #: View/TemplateElements/ajax/template_element_add_file.ctp:73
@@ -2201,6 +2485,7 @@ msgstr "Envoyer"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:35
 #: View/Templates/ajax/template_choices.ctp:15
 #: View/Users/admin_filter_user_index.ctp:107
+#: View/Users/ajax/emailConfirmTemplate.ctp:14
 #: View/Users/ajax/fetchpgpkey.ctp:24
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
@@ -2239,8 +2524,6 @@ msgstr "ID d’événement"
 #: View/Elements/Users/userIndexTable.ctp:4
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_view.ctp:14
-#: View/Users/view.ctp:14
 msgid "Org"
 msgstr "Org"
 
@@ -2255,7 +2538,7 @@ msgid "Event date"
 msgstr "Date d’événement"
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Event graph"
 msgstr "Graphique d’événement"
 
@@ -2283,12 +2566,12 @@ msgstr "Marquer les nouveaux attributs en to_ids"
 
 #: View/Attributes/attribute_replace.ctp:26
 #: View/Noticelists/view.ctp:36
-#: View/Warninglists/view.ctp:54
+#: View/Warninglists/view.ctp:35
 msgid "Values"
 msgstr "Valeurs"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:75
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:46
@@ -2322,7 +2605,7 @@ msgstr "Pas d’échec Composants"
 msgid "disabled"
 msgstr "désactivé"
 
-#: View/Attributes/edit.ctp:64
+#: View/Attributes/edit.ctp:68
 #: View/ShadowAttributes/add.ctp:55
 #: View/ShadowAttributes/edit.ctp:45;54
 msgid "Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this."
@@ -2330,7 +2613,7 @@ msgstr "Attention: Vous êtes sur le point de partager des données classifiées
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -2338,10 +2621,6 @@ msgstr "Attention: Vous êtes sur le point de partager des données classifiées
 msgid "Attributes"
 msgstr "Attribut"
 
-#: View/Attributes/index.ctp:7
-msgid "Results for all attributes"
-msgstr "Résultat des attributs"
-
 #: View/Attributes/index.ctp:8
 msgid " with the value containing "
 msgstr " avec une valeur contenant "
@@ -2354,57 +2633,67 @@ msgstr " marqué avec "
 msgid " from the events "
 msgstr " des événements "
 
-#: View/Attributes/index.ctp:12
-msgid " of category "
-msgstr " de la catégorie "
+#: View/Attributes/index.ctp:11
+msgid " carrying the tag(s) "
+msgstr " portant le(s) tag(s) "
 
-#: View/Attributes/index.ctp:13
+#: View/Attributes/index.ctp:12
 msgid " of type "
 msgstr " de type "
 
-#: View/Attributes/index.ctp:14
-msgid " created by the organisation "
-msgstr " créé par l’organisation "
+#: View/Attributes/index.ctp:13
+msgid " of category "
+msgstr " de la catégorie "
 
-#: View/Attributes/index.ctp:28;173
-#: View/Elements/eventattribute.ctp:60;258
+#: View/Attributes/index.ctp:14
+msgid " created by organisation "
+msgstr " créé par l'organisation "
+
+#: View/Attributes/index.ctp:26
+msgid "Results for all attributes"
+msgstr "Résultat des attributs"
+
+#: View/Attributes/index.ctp:39;132
+#: View/Elements/eventattribute.ctp:60;229
 #: View/Elements/eventdiscussion.ctp:15;126
+#: View/Elements/generic_table.ctp:16
+#: View/Elements/generic_table_row.ctp:16
 #: View/Elements/Feeds/eventattribute.ctp:20;86
 #: View/Elements/Servers/eventattribute.ctp:20;86
 #: View/EventBlacklists/index.ctp:13;54
-#: View/Events/index.ctp:12;89
+#: View/Events/index.ctp:12;115
 #: View/Events/proposal_event_index.ctp:12;95
 #: View/Events/ajax/index.ctp:13;39
 #: View/Feeds/freetext_index.ctp:22;86
-#: View/Feeds/index.ctp:20;230
-#: View/Feeds/preview_index.ctp:14;82
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
 #: View/Galaxies/index.ctp:13;53
-#: View/GalaxyClusters/ajax/index.ctp:11;96
+#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:33;162
-#: View/Logs/admin_index.ctp:37;111
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
 #: View/Logs/event_index.ctp:17;61
 #: View/News/index.ctp:39
 #: View/Noticelists/index.ctp:13;83
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
-#: View/ObjectTemplates/index.ctp:13;126
+#: View/ObjectTemplates/index.ctp:13;137
 #: View/OrgBlacklists/index.ctp:13;52
-#: View/Organisations/index.ctp:42;138
+#: View/Organisations/index.ctp:42;159
 #: View/Regexp/admin_index.ctp:13;51
 #: View/Regexp/index.ctp:13;45
 #: View/Roles/admin_index.ctp:13;82
 #: View/Roles/index.ctp:13;55
-#: View/Servers/index.ctp:13;117
-#: View/Servers/preview_index.ctp:15;164
-#: View/ShadowAttributes/index.ctp:12;108
-#: View/SharingGroups/index.ctp:13;86
+#: View/Servers/index.ctp:13;156
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;63
-#: View/Taxonomies/view.ctp:53;169
+#: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:12;56
+#: View/Users/admin_index.ctp:12;86
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -2412,45 +2701,47 @@ msgstr " créé par l’organisation "
 msgid "previous"
 msgstr "précédent"
 
-#: View/Attributes/index.ctp:30;175
-#: View/Elements/eventattribute.ctp:62;260
+#: View/Attributes/index.ctp:41;134
+#: View/Elements/eventattribute.ctp:62;231
 #: View/Elements/eventdiscussion.ctp:17;128
+#: View/Elements/generic_table.ctp:18
+#: View/Elements/generic_table_row.ctp:18
 #: View/Elements/Feeds/eventattribute.ctp:22;88
 #: View/Elements/Servers/eventattribute.ctp:22;88
 #: View/EventBlacklists/index.ctp:15;56
-#: View/Events/index.ctp:14;91
+#: View/Events/index.ctp:14;117
 #: View/Events/proposal_event_index.ctp:14;97
 #: View/Events/ajax/index.ctp:15;41
 #: View/Feeds/freetext_index.ctp:24;88
-#: View/Feeds/index.ctp:22;232
-#: View/Feeds/preview_index.ctp:16;84
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
 #: View/Galaxies/index.ctp:15;55
-#: View/GalaxyClusters/ajax/index.ctp:13;98
+#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:35;164
-#: View/Logs/admin_index.ctp:39;113
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
 #: View/Logs/event_index.ctp:19;63
 #: View/News/index.ctp:41
 #: View/Noticelists/index.ctp:15;85
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
-#: View/ObjectTemplates/index.ctp:15;128
+#: View/ObjectTemplates/index.ctp:15;139
 #: View/OrgBlacklists/index.ctp:15;54
-#: View/Organisations/index.ctp:44;140
+#: View/Organisations/index.ctp:44;161
 #: View/Regexp/admin_index.ctp:15;53
 #: View/Regexp/index.ctp:15;47
 #: View/Roles/admin_index.ctp:15;84
 #: View/Roles/index.ctp:15;57
-#: View/Servers/index.ctp:15;119
-#: View/Servers/preview_index.ctp:17;166
-#: View/ShadowAttributes/index.ctp:14;110
-#: View/SharingGroups/index.ctp:15;88
+#: View/Servers/index.ctp:15;158
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;65
-#: View/Taxonomies/view.ctp:55;171
+#: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:14;58
+#: View/Users/admin_index.ctp:14;88
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -2458,66 +2749,144 @@ msgstr "précédent"
 msgid "next"
 msgstr "suivant"
 
-#: View/Attributes/index.ctp:148
-msgid "Are you sure you want to delete this attribute?"
-msgstr "Etes-vous certain de vouloir supprimer cet attribut?"
+#: View/Attributes/index.ctp:53
+#: View/Elements/eventattribute.ctp:152
+#: View/Elements/Events/eventIndexTable.ctp:37
+#: View/Elements/Feeds/eventattribute.ctp:45
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/view.ctp:117
+#: View/Feeds/preview_event.ctp:16
+#: View/Noticelists/view.ctp:43
+#: View/Pages/doc/using_the_system.ctp:164;207;318
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
+#: View/Tags/index.ctp:10
+#: View/Templates/add.ctp:12
+#: View/Templates/edit.ctp:12
+#: View/Templates/view.ctp:19
+msgid "Tags"
+msgstr "Tags"
 
-#: View/Attributes/index.ctp:151
-msgid "Propose an edit"
-msgstr "Proposer un changement"
+#: View/Attributes/index.ctp:54
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/Galaxies/index.ctp:2
+msgid "Galaxies"
+msgstr "Galaxies"
 
-#: View/Attributes/index.ctp:155
-#: View/Elements/Events/eventIndexTable.ctp:82;86;229
-#: View/Elements/Users/userIndexTable.ctp:94
-#: View/Elements/dashboard/dashboard_events.ctp:4;5
-#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
-#: View/Events/proposal_event_index.ctp:45;49
-#: View/Feeds/preview_index.ctp:66
-#: View/Noticelists/index.ctp:66
-#: View/ObjectTemplates/index.ctp:104
-#: View/Organisations/index.ctp:122
-#: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/preview_index.ctp:148
-#: View/Taxonomies/index.ctp:47
-#: View/Warninglists/index.ctp:60
-msgid "View"
-msgstr "Aperçu"
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:161
+msgid "Correlate"
+msgstr "Corréler"
 
-#: View/Attributes/index.ctp:166
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Events/view.ctp:314
+#: View/Feeds/preview_event.ctp:73
+#: View/Pages/doc/using_the_system.ctp:235
+#: View/Servers/preview_event.ctp:95
+msgid "Related Events"
+msgstr "Evénements relatifs"
+
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:163
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+msgid "Feed hits"
+msgstr "Hits de Flux"
+
+#: View/Attributes/index.ctp:61
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
+msgid "Sightings"
+msgstr "Observations"
+
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
+#: View/Tags/index.ctp:73
+msgid "Activity"
+msgstr "Activités"
+
+#: View/Attributes/index.ctp:63
+#: View/Elements/eventattribute.ctp:168
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/healthElements/files.ctp:33
+#: View/Elements/healthElements/workers.ctp:60
+#: View/Elements/templateElements/templateRowAttribute.ctp:94
+#: View/Elements/templateElements/templateRowFile.ctp:71
+#: View/Elements/templateElements/templateRowText.ctp:28
+#: View/EventBlacklists/index.ctp:27
+#: View/Events/export.ctp:31
+#: View/Events/resolved_attributes.ctp:53
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:51
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:66
+#: View/OrgBlacklists/index.ctp:26
+#: View/Organisations/index.ctp:102
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:25
+#: View/Roles/admin_index.ctp:35
+#: View/Servers/index.ctp:37
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:27
+#: View/Templates/index.ctp:27
+#: View/Threads/index.ctp:28
+#: View/Warninglists/index.ctp:38
+#: View/Whitelists/admin_index.ctp:24
+msgid "Actions"
+msgstr "Actions"
+
+#: View/Attributes/index.ctp:125
 #: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
 #: View/EventBlacklists/index.ctp:47
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:223
-#: View/Feeds/preview_index.ctp:74
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
 #: View/Galaxies/index.ctp:46
-#: View/GalaxyClusters/ajax/index.ctp:90
+#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:155
-#: View/Logs/admin_index.ctp:104
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
 #: View/Logs/event_index.ctp:54
 #: View/News/index.ctp:33
 #: View/Noticelists/index.ctp:76
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:66
-#: View/ObjectTemplates/index.ctp:119
+#: View/ObjectTemplates/index.ctp:130
 #: View/OrgBlacklists/index.ctp:45
-#: View/Organisations/index.ctp:131
+#: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
 #: View/Roles/admin_index.ctp:75
 #: View/Roles/index.ctp:48
-#: View/Servers/index.ctp:110
-#: View/Servers/preview_index.ctp:156
-#: View/ShadowAttributes/index.ctp:101
-#: View/SharingGroups/index.ctp:79
+#: View/Servers/index.ctp:149
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:56
-#: View/Taxonomies/view.ctp:162
+#: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:49
+#: View/Users/admin_index.ctp:79
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -2564,26 +2933,22 @@ msgid "Containing the following expressions"
 msgstr "Contenant les expressions suivantes"
 
 #: View/Attributes/search.ctp:11
-msgid "Being an attribute matching the following tags"
-msgstr "Etant un attribut qui correspond aux tags suivants"
+msgid "Having tag or being an attribute of an event having the tag"
+msgstr "Avoir un tag ou être un attribut d'un événement ayant le tag"
 
 #: View/Attributes/search.ctp:12
 msgid "Being attributes of the following event IDs, event UUIDs or attribute UUIDs"
 msgstr "Etant des attributs des ID d’événements, des UUID d’événements ou d’UUID d’attributs"
 
-#: View/Attributes/search.ctp:13
-msgid "Being an attribute of an event matching the following tags"
-msgstr "Etant un attribut qui correspond aux tags suivants"
-
-#: View/Attributes/search.ctp:20
+#: View/Attributes/search.ctp:15
 msgid "From the following organisation(s)"
 msgstr "Des organisations suivantes"
 
-#: View/Attributes/search.ctp:36
-msgid "Only find IOCs to use in IDS"
-msgstr "Trouver exclusivement les IOCs à utiliser dans les IDS"
+#: View/Attributes/search.ctp:29
+msgid "Only find IOCs flagged as to_ids"
+msgstr "Trouvez uniquement les IOC marqués comme to_ids"
 
-#: View/Attributes/search.ctp:40
+#: View/Attributes/search.ctp:33
 msgid "Alternate Search Result (Events)"
 msgstr "Résultats de recherche alternatifs"
 
@@ -2601,26 +2966,26 @@ msgstr "Êtes vous sûr de vouloir mettre à la corbeille l'attribut %s ? L'attr
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90
-#: View/Elements/galaxyQuickView.ctp:23
-#: View/Elements/side_menu.ctp:351
-#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/eventIndexTable.ctp:229
 #: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:30
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Roles/admin_index.ctp:67
-#: View/Servers/index.ctp:99
+#: View/Servers/index.ctp:138
 #: View/Tags/index.ctp:125
 msgid "Delete"
 msgstr "Supprimer"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
@@ -2634,34 +2999,36 @@ msgstr "Supprimer"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:56
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:168
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
 #: View/Events/ajax/handleSelected.ctp:17
 #: View/Events/ajax/toggle_correlation.ctp:20
 #: View/Feeds/preview_event.ctp:56
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:79
 #: View/Servers/ajax/update.ctp:11
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
 #: View/Templates/view.ctp:41
-#: View/Users/admin_view.ctp:32;37;104;114;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:27
 msgid "Yes"
 msgstr "Oui"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:21
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
@@ -2675,29 +3042,30 @@ msgstr "Oui"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:58;176
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:166
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/handleSelected.ctp:22
 #: View/Events/ajax/toggle_correlation.ctp:25
 #: View/Feeds/preview_event.ctp:61;66
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:89
 #: View/Servers/ajax/update.ctp:16
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
 #: View/Templates/view.ctp:42
-#: View/Users/admin_view.ctp:32;37;106;116;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
 msgid "No"
@@ -2706,7 +3074,6 @@ msgstr "Non"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:5
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:5
 #: View/Attributes/ajax/attributeEditValueForm.ctp:6
 msgid "Accept change"
@@ -2715,7 +3082,6 @@ msgstr "Accepter le changement"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:6
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
 msgid "Discard change"
@@ -2732,7 +3098,7 @@ msgstr "Ne pas modifier les préférences actuelles"
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/view.ctp:143
+#: View/Events/view.ctp:145
 #: View/Feeds/add.ctp:167
 #: View/Feeds/edit.ctp:164
 #: View/Feeds/freetext_index.ctp:36
@@ -2754,6 +3120,50 @@ msgstr "Pour système de détection d’intrusion"
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr "Laisser ce champ vide afin de préserver les attributs sélectionnés."
 
+#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+msgid "Tags to <b>remove</b>"
+msgstr "Tags à <b>supprimer</b>"
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+msgid "Tags to <b>add</b>"
+msgstr "Tags à <b>ajouter</b>"
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+msgid "Clusters to <b>remove</b>"
+msgstr "Clusters à <b>supprimer</b>"
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+msgid "Clusters to <b>add</b>"
+msgstr "Clusters à <b>ajouter</b>"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr "Basculer le flag IDS %s "
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr "allumé"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr "éteint"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr "Définir le flag IDS pour cet attribut."
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr "Dédéfinir le flag IDS pour cet attribut."
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr "Basculer le flag IDS pour l'attribut"
+
 #: View/Attributes/ajax/attributeRestorationForm.ctp:5
 msgid "Attribute Restoration"
 msgstr "Restauration d’attribut"
@@ -2762,6 +3172,15 @@ msgstr "Restauration d’attribut"
 msgid "Are you sure you want to undelete Attribute #%s?"
 msgstr "Etes-vous certain de vouloir restaurer l'attribut #%s?"
 
+#: View/Attributes/ajax/exportSearch.ctp:2
+msgid "Choose the format that you wish to download the search results in"
+msgstr "Choisissez le format dans lequel vous souhaitez télécharger les résultats de recherche"
+
+#: View/Attributes/ajax/exportSearch.ctp:10;23
+#: View/Events/ajax/exportChoice.ctp:17;18;27;28
+msgid "Export as %s"
+msgstr "Exporter en tant que %s"
+
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
 msgid "Remove Tag"
 msgstr "Supprimer tag"
@@ -2782,16 +3201,6 @@ msgstr "Supprimer"
 msgid "Toggle Correlation %s "
 msgstr "Switcher la corrélation %s "
 
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "on"
-msgstr "allumé"
-
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "off"
-msgstr "éteint"
-
 #: View/Attributes/ajax/toggle_correlation.ctp:11
 msgid "Re-enable the correlation for this attribute."
 msgstr "Restaurer la corrélation pour cet attribut."
@@ -2804,13 +3213,21 @@ msgstr "Cela va supprimer toutes corrélations existantes pour cet attribut et e
 msgid "Toggle correlation for attribute"
 msgstr "Restaurer la corrélation pour cet attribut"
 
-#: View/Elements/ajaxAttributeTags.ctp:25
+#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Elements/ajaxTagCollectionTags.ctp:16
 #: View/Elements/ajaxTags.ctp:14
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr "Supprimer tag"
 
+#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Pages/doc/using_the_system.ctp:303
+#: View/Templates/add.ctp:17
+#: View/Templates/edit.ctp:17
+msgid "Add tag"
+msgstr "Ajouter un tag"
+
 #: View/Elements/ajaxTags.ctp:17
 msgid "Remove tag %s"
 msgstr "Supprimer tag %s"
@@ -2821,215 +3238,33 @@ msgstr "Supprimer tag %s"
 msgid "Add a tag"
 msgstr "Ajouter tag"
 
-#: View/Elements/eventattribute.ctp:71;269
+#: View/Elements/eventattribute.ctp:71;240
 #: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
 #: View/Elements/Servers/eventattribute.ctp:28;31;94;97
 msgid "view all"
 msgstr "voir tout"
 
-#: View/Elements/eventattribute.ctp:117
-#: View/Pages/doc/using_the_system.ctp:86
-msgid "Add attribute"
-msgstr "Ajouter un attribut"
-
-#: View/Elements/eventattribute.ctp:118
-msgid "Edit selected Attributes"
-msgstr "Editer l'attribut sélectionné"
-
-#: View/Elements/eventattribute.ctp:119
-msgid "Tag selected Attributes"
-msgstr "Taguer les attributs sélectionnés"
-
-#: View/Elements/eventattribute.ctp:120
-msgid "Delete selected Attributes"
-msgstr "Supprimer les attributs sélectionnés"
-
-#: View/Elements/eventattribute.ctp:121
-msgid "Accept selected Proposals"
-msgstr "Accepter les propositions sélectionnées"
-
-#: View/Elements/eventattribute.ctp:122
-msgid "Discard selected Proposals"
-msgstr "Supprimer les propositions sélectionnées"
-
-#: View/Elements/eventattribute.ctp:123
-msgid "Sightings display for selected attributes"
-msgstr "Affichage des observations pour les attributs sélectionnés"
-
-#: View/Elements/eventattribute.ctp:127
-msgid "Populate using a template"
-msgstr "Remplir en utilisant un modèle"
-
-#: View/Elements/eventattribute.ctp:129
-msgid "Populate using the freetext import tool"
-msgstr "Remplir en utilisant l'outil d'import freetext"
-
-#: View/Elements/eventattribute.ctp:131
-msgid "Replace all attributes of a category/type combination within the event"
-msgstr "Remplacer tout les attributs d'une combinaison catégorie/type à l'intérieur de l'événement"
-
-#: View/Elements/eventattribute.ctp:140;159
-msgid "Show all attributes"
-msgstr "Voir tout les attributs"
-
-#: View/Elements/eventattribute.ctp:144
-msgid "Only show %s related attributes"
-msgstr "Voir seulement les attributs relatifs à %s"
-
-#: View/Elements/eventattribute.ctp:148
-msgid "Only show proposals"
-msgstr "Voir les propositions uniquement"
-
-#: View/Elements/eventattribute.ctp:148
-#: View/Logs/event_index.ctp:44
-msgid "Proposal"
-msgstr "Proposition"
-
-#: View/Elements/eventattribute.ctp:149
-msgid "Only show correlating attributes"
-msgstr "Voir les attributs corrélés uniquement"
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Only show potentially false positive attributes"
-msgstr "Voir les attributs étant potentiellement des faux-positifs uniquement"
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Warnings"
-msgstr "Avertissements"
-
-#: View/Elements/eventattribute.ctp:152
-msgid "Include deleted attributes"
-msgstr "Inclure les attributs supprimés"
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show attribute context fields"
-msgstr "Afficher le champ contextuel de l'attribut"
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show context fields"
-msgstr "Afficher le champ contextuel"
-
-#: View/Elements/eventattribute.ctp:157
-msgid "Filter on attributes value"
-msgstr "Filtrer sur la valeur des attributs"
-
-#: View/Elements/eventattribute.ctp:159
-#: View/Events/index.ctp:41
-#: View/Servers/preview_index.ctp:42
-#: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:37
-msgid "Remove filters"
-msgstr "Supprimer les filtres"
-
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all"
 msgstr "Sélectionner tout"
 
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 msgid "Select all attributes/proposals on current page"
 msgstr "Sélectionner l'ensemble des attributs/propositions de la page actuelle"
 
-#: View/Elements/eventattribute.ctp:188
-#: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/view.ctp:121
-#: View/Feeds/preview_event.ctp:16
-#: View/Noticelists/view.ctp:43
-#: View/Pages/doc/using_the_system.ctp:164;207;318
-#: View/Servers/preview_event.ctp:27
-#: View/Servers/preview_index.ctp:68
-#: View/Tags/index.ctp:10
-#: View/Templates/add.ctp:12
-#: View/Templates/edit.ctp:12
-#: View/Templates/view.ctp:19
-msgid "Tags"
-msgstr "Tags"
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
+msgstr "Tags associés"
 
-#: View/Elements/eventattribute.ctp:189
-#: View/Elements/global_menu.ctp:56
-#: View/Events/view.ctp:387
-#: View/Galaxies/index.ctp:2
-msgid "Galaxies"
-msgstr "Galaxies"
-
-#: View/Elements/eventattribute.ctp:191
-msgid "Correlate"
-msgstr "Corréler"
-
-#: View/Elements/eventattribute.ctp:192
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:263
-#: View/Feeds/preview_event.ctp:73
-#: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:95
-msgid "Related Events"
-msgstr "Evénements relatifs"
-
-#: View/Elements/eventattribute.ctp:193
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
-msgid "Feed hits"
-msgstr "Hits de Flux"
-
-#: View/Elements/eventattribute.ctp:196
-#: View/Events/view.ctp:198
-msgid "Sightings"
-msgstr "Observations"
-
-#: View/Elements/eventattribute.ctp:197
-#: View/Events/view.ctp:205
-#: View/Tags/index.ctp:73
-msgid "Activity"
-msgstr "Activités"
-
-#: View/Elements/eventattribute.ctp:198
-#: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/healthElements/files.ctp:33
-#: View/Elements/healthElements/workers.ctp:55
-#: View/Elements/templateElements/templateRowAttribute.ctp:94
-#: View/Elements/templateElements/templateRowFile.ctp:71
-#: View/Elements/templateElements/templateRowText.ctp:28
-#: View/EventBlacklists/index.ctp:27
-#: View/Events/export.ctp:31
-#: View/Events/resolved_attributes.ctp:53
-#: View/Feeds/index.ctp:61
-#: View/Feeds/preview_index.ctp:38
-#: View/GalaxyClusters/ajax/index.ctp:51
-#: View/Noticelists/index.ctp:37
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:55
-#: View/OrgBlacklists/index.ctp:26
-#: View/Organisations/index.ctp:81
-#: View/Pages/doc/using_the_system.ctp:187;238;286;382
-#: View/Regexp/admin_index.ctp:25
-#: View/Roles/admin_index.ctp:35
-#: View/Servers/index.ctp:36
-#: View/Servers/preview_index.ctp:80
-#: View/SharingGroups/add.ctp:34;54
-#: View/SharingGroups/edit.ctp:34;62
-#: View/SharingGroups/index.ctp:30
-#: View/Sightings/ajax/list_sightings.ctp:11
-#: View/Tags/index.ctp:76
-#: View/Taxonomies/index.ctp:27
-#: View/Templates/index.ctp:27
-#: View/Threads/index.ctp:28
-#: View/Warninglists/index.ctp:38
-#: View/Whitelists/admin_index.ctp:24
-msgid "Actions"
-msgstr "Actions"
-
-#: View/Elements/eventattribute.ctp:238
+#: View/Elements/eventattribute.ctp:209
 msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
 "a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
 "attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
 msgstr "Avertisselent attribut: cet événement n'a aucun attribut visible pour vous.Le propriétaire de l'événement à défini un schéma spécifique de distribution par attribut et souhaite distribuer l'événement seulement, que ce soit pour notification ou une contribution potentielle avec des attributs sans cette restriction. Ou le propriétaire a oublié d'ajouter les attrbuts ou le niveau de distribution approprié. Si vous pensez qu'il s'agit d'une erreur ou souhaitez contribuer avec des attributs en se basant sur les métadonnées de l'événement, sentez vous libre de faire une proposition."
 
-#: View/Elements/eventattribute.ctp:242
+#: View/Elements/eventattribute.ctp:213
 msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
 msgstr "Mise en garde attributs: Cet événement ne contient aucun attribut. Il est fortement recommandé de remplir cet événement avec des attributs (indicateurs, observables ou informations) pour fournir du sens à l'événement"
 
@@ -3037,6 +3272,140 @@ msgstr "Mise en garde attributs: Cet événement ne contient aucun attribut. Il
 msgid "Create multiple attributes one per line"
 msgstr "Créer de multiples attributs, un par ligne"
 
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr "Voir tout les attributs"
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr "Tout"
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr "Voir seulement les attributs relatifs à %s"
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr "Voir les propositions uniquement"
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr "Proposition"
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr "Voir les attributs corrélés uniquement"
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr "Corrélation"
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr "Voir les attributs étant potentiellement des faux-positifs uniquement"
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr "Attention"
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr "Ajouter un attribut"
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr "Editer l'attribut sélectionné"
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr "Taguer les attributs sélectionnés"
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr "Ajouter un nouveau cluster aux attributs sélectionnés"
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr "Supprimer les attributs sélectionnés"
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr "Accepter les propositions sélectionnées"
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr "Supprimer les propositions sélectionnées"
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr "Affichage des observations pour les attributs sélectionnés"
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr "Remplir en utilisant un modèle"
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr "Remplir en utilisant l'outil d'import freetext"
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr "Remplacer tout les attributs d'une combinaison catégorie/type à l'intérieur de l'événement"
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr "Utiliser une liste de scopes simples pour filtrer les données"
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr "Ḿodifiez le scope"
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr "Inclure les attributs supprimés"
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr "Supprimée"
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr "Afficher le champ contextuel de l'attribut"
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr "Contexte"
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr "Outil de filtrage avancé"
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr "Outil de filtrage"
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr "%s règle(s) actives"
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr "Supprimer les filtres"
+
 #: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr "Date: "
@@ -3046,14 +3415,14 @@ msgid "Deactivated user"
 msgstr "Désactiver l'utilisateur"
 
 #: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:223
-#: View/Elements/Events/View/row_attribute.ctp:299
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/View/row_attribute.ctp:380
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/Feeds/edit.ctp:193
 #: View/OrgBlacklists/edit.ctp:22
 #: View/Pages/doc/using_the_system.ctp:191
-#: View/Servers/index.ctp:98
-#: View/Tags/edit.ctp:35
+#: View/Servers/index.ctp:137
+#: View/Tags/edit.ctp:36
 #: View/Templates/edit.ctp:49
 msgid "Edit"
 msgstr "Modifier"
@@ -3081,12 +3450,12 @@ msgid "Insert a link to an event - just enter the event ID between the [event][/
 msgstr "Insérez le lien vers un événement - Entrez juste l'ID de l'événement entre les tags [event][/event]."
 
 #: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:180;191
+#: View/Events/view.ctp:196;207
 #: View/Objects/orphaned_object_diagnostics.ctp:21
 #: View/Pages/doc/administration.ctp:167
 #: View/Pages/doc/using_the_system.ctp:200;279
 #: View/Posts/add.ctp:33
-#: View/ShadowAttributes/index.ctp:31
+#: View/ShadowAttributes/index.ctp:41
 msgid "Event"
 msgstr "Événement"
 
@@ -3121,9 +3490,19 @@ msgid "Code"
 msgstr "Code"
 
 #: View/Elements/eventdiscussion.ctp:156
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr "Envoyer"
 
+#: View/Elements/flashErrorMessage.ctp:2
+msgid "Errors"
+msgstr "Erreurs"
+
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Jobs/ajax/error.ctp:34
+msgid "Close"
+msgstr "FermerFermer"
+
 #: View/Elements/footer.ctp:5
 msgid "Keyboard shortcuts for this page"
 msgstr "Raccourcis clavier pour cette page"
@@ -3135,8 +3514,8 @@ msgstr "aucun"
 #: View/Elements/footer.ctp:15
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:60
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
 msgid "GnuPG key"
 msgstr "Clé GnuPG"
 
@@ -3152,32 +3531,36 @@ msgstr "Localisation du certificat SMIME impossible."
 msgid "View details about this galaxy"
 msgstr "Voir les détails de cette galaxie"
 
-#: View/Elements/galaxyQuickView.ctp:17
+#: View/Elements/galaxyQuickView.ctp:19
 #: View/Elements/galaxyQuickViewMini.ctp:69
 msgid "View details about this cluster"
 msgstr "Voir les détails de ce cluster"
 
-#: View/Elements/galaxyQuickView.ctp:18
+#: View/Elements/galaxyQuickView.ctp:20
 #: View/Elements/galaxyQuickViewMini.ctp:70
 msgid "View all events containing this cluster."
 msgstr "Voir tout les événements contenant ce cluster."
 
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr "détacher"
+
 #: View/Elements/galaxyQuickView.ctp:24
 msgid "Are you sure you want to detach %s from this event?"
 msgstr "Etes-vous certain de vouloir détacher %s de cet événement?"
 
-#: View/Elements/galaxyQuickViewMini.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:74
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr "Êtes-vous certain de vouloir détacher %s de %s ?"
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 msgid "Add new cluster"
 msgstr "Ajouter un nouveau cluster"
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 #: View/EventBlacklists/add.ctp:35
 #: View/EventBlacklists/edit.ctp:29
-#: View/Events/add.ctp:72
+#: View/Events/add.ctp:68
 #: View/Events/filter_event_index.ctp:125
 #: View/Feeds/add.ctp:198
 #: View/Feeds/import_feeds.ctp:19
@@ -3187,113 +3570,139 @@ msgstr "Ajouter un nouveau cluster"
 #: View/Roles/admin_add.ctp:44
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 #: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:19
 #: View/Tags/add.ctp:35
 #: View/Users/admin_filter_user_index.ctp:62
 #: View/Whitelists/admin_add.ctp:13
 msgid "Add"
 msgstr "Ajouter"
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/side_menu.ctp:174;188
+#: View/Elements/generic_picker.ctp:205
+msgid "Due to the large number of options, no contextual information is provided."
+msgstr "En raison du grand nombre d'options, aucune information contextuelle n'est fournie."
+
+#: View/Elements/generic_picker.ctp:273
+msgid "Nothing to pick"
+msgstr "Rien à choisir"
+
+#: View/Elements/global_menu.ctp:11
+#: View/Pages/doc/general.ctp:20
+msgid "Event Actions"
+msgstr "Actions d'événement"
+
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr "Liste d’événements"
 
-#: View/Elements/global_menu.ctp:26
-#: View/Elements/side_menu.ctp:179;194
-#: View/Events/add.ctp:8
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
+#: View/Events/add.ctp:4
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
 msgstr "Ajouter événement"
 
-#: View/Elements/global_menu.ctp:28
-#: View/Elements/side_menu.ctp:213
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr "Liste d’attributs"
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/side_menu.ctp:218
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr "Chercher attributs"
 
-#: View/Elements/global_menu.ctp:30
-#: View/Elements/side_menu.ctp:206
-#: View/Servers/rest.ctp:4
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
+#: View/Servers/rest.ctp:20
 msgid "REST client"
 msgstr "Client REST"
 
-#: View/Elements/global_menu.ctp:32
-#: View/Elements/side_menu.ctp:238
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "Voir propositions"
 
-#: View/Elements/global_menu.ctp:35
-#: View/Elements/side_menu.ctp:446
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
+#: View/Pages/doc/general.ctp:39
+msgid "Events with proposals"
+msgstr "Evénements avec propositions"
+
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "Lister les étiquettes"
 
-#: View/Elements/global_menu.ctp:37
-#: View/Elements/side_menu.ctp:450
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
+msgid "List Tag Collections"
+msgstr "Liste des collections de tags"
+
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 #: View/Tags/edit.ctp:4
 msgid "Add Tag"
 msgstr "Ajouter étiquette"
 
-#: View/Elements/global_menu.ctp:39
-#: View/Elements/side_menu.ctp:471
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 msgid "List Taxonomies"
 msgstr "Lister les taxonomies"
 
-#: View/Elements/global_menu.ctp:41
-#: View/Elements/side_menu.ctp:485
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "Lister les modèles"
 
-#: View/Elements/global_menu.ctp:43
-#: View/Elements/side_menu.ctp:487
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "Ajouter modèle"
 
-#: View/Elements/global_menu.ctp:46
-#: View/Elements/side_menu.ctp:247
+#: View/Elements/global_menu.ctp:78
 #: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
 msgstr "Export"
 
-#: View/Elements/global_menu.ctp:48
-#: View/Elements/side_menu.ctp:253
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
+#: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
 #: View/Pages/doc/using_the_system.ctp:15;361
 msgid "Automation"
 msgstr "Automatisation"
 
-#: View/Elements/global_menu.ctp:60
-#: View/Elements/side_menu.ctp:529
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 msgid "List Galaxies"
 msgstr "Lister les Galaxies"
 
-#: View/Elements/global_menu.ctp:67
+#: View/Elements/global_menu.ctp:101
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr "Filtres de saisie"
 
-#: View/Elements/global_menu.ctp:72;76
+#: View/Elements/global_menu.ctp:104;109
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -3302,7 +3711,7 @@ msgstr "Filtres de saisie"
 msgid "Import Regexp"
 msgstr "Importer une expression régulière"
 
-#: View/Elements/global_menu.ctp:73;77
+#: View/Elements/global_menu.ctp:114;119
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -3311,82 +3720,88 @@ msgstr "Importer une expression régulière"
 msgid "Signature Whitelist"
 msgstr "Liste blanche des signatures"
 
-#: View/Elements/global_menu.ctp:79
-#: View/Elements/side_menu.ctp:274
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 msgid "List Warninglists"
 msgstr "Lister les listes d’avertissements"
 
-#: View/Elements/global_menu.ctp:80
-#: View/Elements/side_menu.ctp:283
+#: View/Elements/global_menu.ctp:128
 msgid "List Noticelists"
 msgstr "Lister la liste d'avis"
 
-#: View/Elements/global_menu.ctp:90
+#: View/Elements/global_menu.ctp:135
+#: View/Pages/doc/general.ctp:22;54
+msgid "Global Actions"
+msgstr "Actions globales"
+
+#: View/Elements/global_menu.ctp:139
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
 msgstr "Actualités"
 
-#: View/Elements/global_menu.ctp:91
-#: View/Elements/side_menu.ctp:311
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "Mon Profil"
 
-#: View/Elements/global_menu.ctp:92;203
-#: View/Elements/side_menu.ctp:312
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
-#: View/Elements/global_menu.ctp:96
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
-#: View/Users/statistics_data.ctp:32
+#: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr "Organisations"
 
-#: View/Elements/global_menu.ctp:100
-#: View/Elements/side_menu.ctp:325
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "Permissions de rôle"
 
-#: View/Elements/global_menu.ctp:102
-#: View/Elements/side_menu.ctp:552
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "List Object Templates"
 msgstr "Lister les modèles d’objets"
 
-#: View/Elements/global_menu.ctp:104
-#: View/Elements/side_menu.ctp:331
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Sharing Groups"
 msgstr "Lister les groupes de partage"
 
-#: View/Elements/global_menu.ctp:106
-#: View/Elements/side_menu.ctp:332
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
 msgid "Add Sharing Group"
 msgstr "Ajouter groupe de partage"
 
-#: View/Elements/global_menu.ctp:109
-#: View/Elements/side_menu.ctp:334
-#: View/Events/automation.ctp:42
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
+#: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
 msgstr "Guide d’utilisateur"
 
-#: View/Elements/global_menu.ctp:110
-#: View/Elements/side_menu.ctp:335
-#: View/Pages/doc/general.ctp:61
-#: View/Pages/doc/user_management.ctp:54
-msgid "Terms &amp; Conditions"
-msgstr "Termes &amp; conditions"
+#: View/Elements/global_menu.ctp:186
+msgid "Categories & Types"
+msgstr "Catégories & Types"
 
-#: View/Elements/global_menu.ctp:111
-#: View/Elements/side_menu.ctp:336
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
+msgstr "Conditions générales"
+
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -3399,30 +3814,34 @@ msgstr "Termes &amp; conditions"
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: View/Elements/global_menu.ctp:113
+#: View/Elements/global_menu.ctp:201
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr "Lister les discussions"
 
-#: View/Elements/global_menu.ctp:114
+#: View/Elements/global_menu.ctp:205
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr "Démarrer la discussion"
 
-#: View/Elements/global_menu.ctp:125
-#: View/Elements/side_menu.ctp:354
+#: View/Elements/global_menu.ctp:212
+#: View/Pages/doc/general.ctp:23;66
+msgid "Sync Actions"
+msgstr "Actions de synchronisation"
+
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "Lister serveur"
 
-#: View/Elements/global_menu.ctp:127
-#: View/Elements/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
 msgid "List Feeds"
 msgstr "Lister les Flux"
 
-#: View/Elements/global_menu.ctp:136
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/administration.ctp:8
-#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
 #: View/Pages/doc/quickstart.ctp:8
@@ -3431,95 +3850,100 @@ msgstr "Lister les Flux"
 msgid "Administration"
 msgstr "Administration"
 
-#: View/Elements/global_menu.ctp:140
-#: View/Elements/side_menu.ctp:376
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "Lister les utilisateurs"
 
-#: View/Elements/global_menu.ctp:141
-#: View/Elements/side_menu.ctp:375
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
 msgid "Add User"
 msgstr "Ajouter utilisateur"
 
-#: View/Elements/global_menu.ctp:142
-#: View/Elements/side_menu.ctp:379
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr "Contacter les utilisateurs"
 
-#: View/Elements/global_menu.ctp:144
-#: View/Elements/side_menu.ctp:316;391
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
 msgid "List Organisations"
 msgstr "Lister les organisations"
 
-#: View/Elements/global_menu.ctp:146
-#: View/Elements/side_menu.ctp:383
-msgid "Add Organisation"
-msgstr "Ajouter une organisation"
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
+msgstr "Ajouter des organisations"
 
-#: View/Elements/global_menu.ctp:149
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr "Lister les rôles"
 
-#: View/Elements/global_menu.ctp:151
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
-msgstr "Ajouter un rôle"
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
+msgstr "Ajouter des rôles"
 
-#: View/Elements/global_menu.ctp:155
-msgid "Maintenance"
-msgstr "Maintenance"
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
+msgstr "Paramètres du serveur et maintenance"
 
-#: View/Elements/global_menu.ctp:158
-#: View/Elements/side_menu.ctp:401
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "Tâches"
 
-#: View/Elements/global_menu.ctp:160
-#: View/Elements/side_menu.ctp:403
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
 msgstr "Tâches programmées"
 
-#: View/Elements/global_menu.ctp:165
-#: View/Elements/side_menu.ctp:407
+#: View/Elements/global_menu.ctp:300
+msgid "Blacklist Event"
+msgstr "Evénement sur liste noire"
+
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
 msgid "Manage Event Blacklists"
 msgstr "Gérer les événements sur liste noire"
 
-#: View/Elements/global_menu.ctp:169
+#: View/Elements/global_menu.ctp:314
 msgid "Blacklist Organisation"
 msgstr "Mettre une organisation en liste noire"
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/side_menu.ctp:411
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
 msgid "Manage Org Blacklists"
 msgstr "Gérer les organisations sur liste noire"
 
-#: View/Elements/global_menu.ctp:180
+#: View/Elements/global_menu.ctp:327
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr "Audit"
 
-#: View/Elements/global_menu.ctp:184
-#: View/Elements/side_menu.ctp:417
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "Lister les Logs"
 
-#: View/Elements/global_menu.ctp:185
-#: View/Elements/side_menu.ctp:418
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "Chercher les logs"
 
-#: View/Elements/global_menu.ctp:207;209
+#: View/Elements/global_menu.ctp:362;367
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr "Déconnexion"
@@ -3540,407 +3964,8 @@ msgstr "Switcher histogramme"
 msgid "Attributes per organization"
 msgstr "Attributs par organisation"
 
-#: View/Elements/side_menu.ctp:17;78
-msgid "Populate From Template"
-msgstr "Remplir depuis un modèle"
-
-#: View/Elements/side_menu.ctp:24
-msgid "Freetext Import Result"
-msgstr "Résultat de l'import Freetext"
-
-#: View/Elements/side_menu.ctp:31
-msgid "View Event"
-msgstr "Voir l'événement"
-
-#: View/Elements/side_menu.ctp:36;465;540
-msgid "View Correlation Graph"
-msgstr "Voir graphique de corrélation"
-
-#: View/Elements/side_menu.ctp:41
-msgid "View Event History"
-msgstr "Voir l'historique de l'événement"
-
-#: View/Elements/side_menu.ctp:48
-#: View/Events/edit.ctp:8
-msgid "Edit Event"
-msgstr "Editer événement"
-
-#: View/Elements/side_menu.ctp:50
-msgid "Delete Event"
-msgstr "Supprimer événement"
-
-#: View/Elements/side_menu.ctp:50;267;298;351;371
-#: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Servers/index.ctp:99
-msgid "Are you sure you want to delete # %s?"
-msgstr "Etes-vous certain de vouloir détacher %s?"
-
-#: View/Elements/side_menu.ctp:61
-msgid "Add Object"
-msgstr "Ajouter un objet"
-
-#: View/Elements/side_menu.ctp:66
-msgid "Add Attachment"
-msgstr "Ajouter une pièce jointe"
-
-#: View/Elements/side_menu.ctp:73
-msgid "Populate from..."
-msgstr "Remplir depuis ..."
-
-#: View/Elements/side_menu.ctp:86
-#: View/Events/ajax/enrich_event.ctp:2
-msgid "Enrich Event"
-msgstr "Enrichir l'événement"
-
-#: View/Elements/side_menu.ctp:91
-msgid "Merge attributes from..."
-msgstr "Fusionner les attributs depuis..."
-
-#: View/Elements/side_menu.ctp:98
-msgid "Propose Attribute"
-msgstr "Proposer un attribut"
-
-#: View/Elements/side_menu.ctp:103
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr "Proposer pièce jointe"
-
-#: View/Elements/side_menu.ctp:115
-#: View/Elements/Events/eventIndexTable.ctp:218
-msgid "Publish Event"
-msgstr "Publier événement"
-
-#: View/Elements/side_menu.ctp:123
-msgid "Publish (no email)"
-msgstr "Publier (sans courriel)"
-
-#: View/Elements/side_menu.ctp:132
-msgid "Delegate Publishing"
-msgstr "Déléguer la publication"
-
-#: View/Elements/side_menu.ctp:143
-#: View/EventDelegations/ajax/accept_delegation.ctp:2
-msgid "Accept Delegation Request"
-msgstr "Accepter la demande de délégation"
-
-#: View/Elements/side_menu.ctp:151
-msgid "Discard Delegation Request"
-msgstr "Retirer une délégation de publication"
-
-#: View/Elements/side_menu.ctp:157
-msgid "Publish event to ZMQ"
-msgstr "Publier l’événement sur ZMQ"
-
-#: View/Elements/side_menu.ctp:162
-msgid "Contact Reporter"
-msgstr "Contacter l'auteur"
-
-#: View/Elements/side_menu.ctp:169
-msgid "Download as..."
-msgstr "Télécharger en tant que ..."
-
-#: View/Elements/side_menu.ctp:201
-msgid "Import from…"
-msgstr "Importer depuis..."
-
-#: View/Elements/side_menu.ctp:224
-msgid "Download results as JSON"
-msgstr "Télécharger les résultats en json"
-
-#: View/Elements/side_menu.ctp:228
-msgid "Download results as XML"
-msgstr "Télécharger les résultats en xml"
-
-#: View/Elements/side_menu.ctp:232
-msgid "Download results as CSV"
-msgstr "Télécharger les résultats en csv"
-
-#: View/Elements/side_menu.ctp:242
-#: View/Pages/doc/general.ctp:39
-msgid "Events with proposals"
-msgstr "Evénements avec propositions"
-
-#: View/Elements/side_menu.ctp:259
-msgid "List Regexp"
-msgstr "Lister les expressions régulières"
-
-#: View/Elements/side_menu.ctp:261
-msgid "New Regexp"
-msgstr "Nouvelle expression régulière"
-
-#: View/Elements/side_menu.ctp:262
-msgid "Perform on existing"
-msgstr "Appliquer sur existant"
-
-#: View/Elements/side_menu.ctp:266
-msgid "Edit Regexp"
-msgstr "Editer une expression régulière"
-
-#: View/Elements/side_menu.ctp:267
-msgid "Delete Regexp"
-msgstr "Supprimer Regexp"
-
-#: View/Elements/side_menu.ctp:273
-msgid "View Warninglist"
-msgstr "Voir liste d’avertissement"
-
-#: View/Elements/side_menu.ctp:276
-msgid "Update Warninglists"
-msgstr "Mettre à jour les listes d’avertissements"
-
-#: View/Elements/side_menu.ctp:282
-msgid "View Noticelist"
-msgstr "Voir la liste d'avis"
-
-#: View/Elements/side_menu.ctp:285
-msgid "Update Noticelists"
-msgstr "Mettre à jour les listes d'avis"
-
-#: View/Elements/side_menu.ctp:291
-msgid "List Whitelist"
-msgstr "Lister les listes blanches"
-
-#: View/Elements/side_menu.ctp:293
-msgid "New Whitelist"
-msgstr "Nouvelle liste blanche"
-
-#: View/Elements/side_menu.ctp:297
-msgid "Edit Whitelist"
-msgstr "Modifier liste blanche"
-
-#: View/Elements/side_menu.ctp:298
-msgid "Delete Whitelist"
-msgstr "Supprimer liste blanche"
-
-#: View/Elements/side_menu.ctp:305
-#: View/Users/edit.ctp:4
-msgid "Edit My Profile"
-msgstr "Modifier mon profil"
-
-#: View/Elements/side_menu.ctp:306
-#: View/Pages/doc/administration.ctp:126
-#: View/Users/admin_edit.ctp:70
-#: View/Users/change_pw.ctp:4
-msgid "Change Password"
-msgstr "Modifier le mot de passe"
-
-#: View/Elements/side_menu.ctp:321;389
-msgid "View Organisation"
-msgstr "Voir les organisations"
-
-#: View/Elements/side_menu.ctp:328
-#: View/SharingGroups/edit.ctp:3
-msgid "Edit Sharing Group"
-msgstr "Modifier groupe de partage"
-
-#: View/Elements/side_menu.ctp:329
-msgid "View Sharing Group"
-msgstr "Voir groupe de partage"
-
-#: View/Elements/side_menu.ctp:342
-msgid "Explore Remote Event"
-msgstr "Voir événement futur"
-
-#: View/Elements/side_menu.ctp:343
-msgid "Fetch This Event"
-msgstr "Chercher cet événement"
-
-#: View/Elements/side_menu.ctp:343
-#: View/Feeds/preview_index.ctp:65
-#: View/Servers/preview_index.ctp:147
-msgid "Are you sure you want to fetch and save this event on your instance?"
-msgstr "Etes-vous certain de vouloir chercher cet événement et de le sauvegarder?"
-
-#: View/Elements/side_menu.ctp:344;347
-msgid "Explore Remote Server"
-msgstr "Voir événement futur"
-
-#: View/Elements/side_menu.ctp:350
-#: View/Servers/edit.ctp:4
-msgid "Edit Server"
-msgstr "Modifier serveur"
-
-#: View/Elements/side_menu.ctp:356
-msgid "New Server"
-msgstr "Nouveau serveur"
-
-#: View/Elements/side_menu.ctp:363
-msgid "View User"
-msgstr "Voir utilisateur"
-
-#: View/Elements/side_menu.ctp:364
-msgid "Reset Password"
-msgstr "Réinitialiser le mot de passe"
-
-#: View/Elements/side_menu.ctp:365
-msgid "Edit User"
-msgstr "Modifier utilisateur"
-
-#: View/Elements/side_menu.ctp:366
-msgid "Delete User"
-msgstr "Supprimer utilisateur"
-
-#: View/Elements/side_menu.ctp:366
-#: View/Elements/Users/userIndexTable.ctp:91
-msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
-msgstr "Etes-vous certain de vouloir supprimer # %s? Il est fortement recommandé de désactiver plutôt que de supprimer définitivement un utilisateur."
-
-#: View/Elements/side_menu.ctp:370
-#: View/Roles/admin_edit.ctp:4
-msgid "Edit Role"
-msgstr "Modifier rôle"
-
-#: View/Elements/side_menu.ctp:371
-msgid "Delete Role"
-msgstr "Supprimer rôle"
-
-#: View/Elements/side_menu.ctp:385
-#: View/Organisations/admin_edit.ctp:4
-msgid "Edit Organisation"
-msgstr "Modifier une organisation"
-
-#: View/Elements/side_menu.ctp:386
-#: View/Organisations/ajax/merge.ctp:5
-msgid "Merge Organisation"
-msgstr "Assembler les organisations"
-
-#: View/Elements/side_menu.ctp:398
-#: View/Servers/server_settings.ctp:5
-msgid "Server Settings & Maintenance"
-msgstr "Paramètres du serveur et maintenance"
-
-#: View/Elements/side_menu.ctp:406
-msgid "Blacklists Event"
-msgstr "Evénement sur liste noire"
-
-#: View/Elements/side_menu.ctp:410
-msgid "Blacklists Organisation"
-msgstr "Organisation sur liste noire"
-
-#: View/Elements/side_menu.ctp:426;433
-msgid "View Thread"
-msgstr "Voir Fil"
-
-#: View/Elements/side_menu.ctp:427
-#: View/Posts/add.ctp:4
-msgid "Add Post"
-msgstr "Ajouter message"
-
-#: View/Elements/side_menu.ctp:434
-#: View/Posts/edit.ctp:4
-msgid "Edit Post"
-msgstr "Modifier message"
-
-#: View/Elements/side_menu.ctp:439
-msgid "List Threads"
-msgstr "Lister les Fils"
-
-#: View/Elements/side_menu.ctp:440
-msgid "New Thread"
-msgstr "Nouveau Fil"
-
-#: View/Elements/side_menu.ctp:445
-msgid "List Favourite Tags"
-msgstr "Lister les etiquettes favoris"
-
-#: View/Elements/side_menu.ctp:455
-msgid "Edit Tag"
-msgstr "Modifier étiquette"
-
-#: View/Elements/side_menu.ctp:461;473
-msgid "View Taxonomy"
-msgstr "Voir taxonomie"
-
-#: View/Elements/side_menu.ctp:474
-msgid "Delete Taxonomy"
-msgstr "Supprimer taxonomie"
-
-#: View/Elements/side_menu.ctp:492
-msgid "View Template"
-msgstr "Voir modèle"
-
-#: View/Elements/side_menu.ctp:494
-#: View/Templates/edit.ctp:6
-msgid "Edit Template"
-msgstr "Modifier modèle"
-
-#: View/Elements/side_menu.ctp:502
-msgid "Add Feed"
-msgstr "Ajouter Flux"
-
-#: View/Elements/side_menu.ctp:503
-msgid "Import Feeds from JSON"
-msgstr "Importer les Flux de JSON"
-
-#: View/Elements/side_menu.ctp:504
-#: View/Feeds/compare_feeds.ctp:7
-msgid "Feed overlap analysis matrix"
-msgstr "Matrix d’analyse du recouvrement des sources"
-
-#: View/Elements/side_menu.ctp:505
-msgid "Export Feed settings"
-msgstr "Exporter paramètres de Flux"
-
-#: View/Elements/side_menu.ctp:507
-msgid "Edit Feed"
-msgstr "Modifier Flux"
-
-#: View/Elements/side_menu.ctp:509
-msgid "PreviewIndex"
-msgstr "Aperçu index"
-
-#: View/Elements/side_menu.ctp:511
-msgid "PreviewEvent"
-msgstr "Aperçu événement"
-
-#: View/Elements/side_menu.ctp:516
-msgid "View News"
-msgstr "Voir Nouvelles"
-
-#: View/Elements/side_menu.ctp:520
-#: View/News/add.ctp:6
-msgid "Add News Item"
-msgstr "Ajouter infos"
-
-#: View/Elements/side_menu.ctp:522
-#: View/News/edit.ctp:6
-msgid "Edit News Item"
-msgstr "Modifier infos"
-
-#: View/Elements/side_menu.ctp:533
-msgid "Update Galaxies"
-msgstr "Mettre à jour les Galaxies"
-
-#: View/Elements/side_menu.ctp:533
-msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr "Etes-vous certain de réimporter toutes les galaxies des sous-modules?"
-
-#: View/Elements/side_menu.ctp:534
-msgid "Force Update Galaxies"
-msgstr "Forcer la mise à jour des galaxies"
-
-#: View/Elements/side_menu.ctp:534
-msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr "Êtes-vous certain de vouloir supprimer et réimporter toutes les galaxies du sous-module ?"
-
-#: View/Elements/side_menu.ctp:538;546
-msgid "View Galaxy"
-msgstr "Voir galaxie"
-
-#: View/Elements/side_menu.ctp:539
-msgid "View Cluster"
-msgstr "Voir Groupe"
-
-#: View/Elements/side_menu.ctp:556
-msgid "Update Objects"
-msgstr "Mettre à jour objets"
-
-#: View/Elements/side_menu.ctp:561
-msgid "View Object Template"
-msgstr "Voir modèles d’objets"
-
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:84
+#: View/Layouts/default.ctp:87
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr "Chargement"
@@ -3975,8 +4000,11 @@ msgid "Display"
 msgstr "Affichage"
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Jobs/index.ctp:62
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
 #: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr "Filtres"
 
@@ -3989,12 +4017,12 @@ msgstr "Historique"
 msgid "Toggle fullscreen"
 msgstr "Plein écran"
 
-#: View/Elements/view_mitre_attack_matrix.ctp:27
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
 msgstr "Tout afficher"
 
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all events on current page"
 msgstr "Sélectionner tous les événements sur cette page"
 
@@ -4034,35 +4062,58 @@ msgstr "Compteur de messages"
 msgid "#Posts"
 msgstr "#Posts"
 
-#: View/Elements/Events/eventIndexTable.ctp:167
-msgid " correlation(s)"
-msgstr " corrélation(s)"
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/dashboard/dashboard_events.ctp:4;5
+#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
+#: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/preview_index.ctp:174
+#: View/Taxonomies/index.ctp:47
+#: View/Warninglists/index.ctp:60
+msgid "View"
+msgstr "Aperçu"
 
-#: View/Elements/Events/eventIndexTable.ctp:177;182
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
+msgstr "Voir le cluster"
+
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr " corrélation(s). Afficher l'événement filtré avec la corrélation seulement."
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
 msgid " proposal(s)"
 msgstr " proposition(s)"
 
-#: View/Elements/Events/eventIndexTable.ctp:187
+#: View/Elements/Events/eventIndexTable.ctp:190
 msgid "NEW"
 msgstr "NOUVEAU"
 
-#: View/Elements/Events/eventIndexTable.ctp:207
-#: View/Jobs/index.ctp:15;63
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-msgid "All"
-msgstr "Tout"
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
+msgstr "Publier événement"
 
-#: View/Elements/Events/eventIndexTable.ctp:218
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:12
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
 msgid "Are you sure this event is complete and everyone should be informed?"
 msgstr "Etes-vous certain que cet événement est complet et que tout le monde devrait en être informé?"
 
-#: View/Elements/Events/eventIndexTable.ctp:219
+#: View/Elements/Events/eventIndexTable.ctp:222
 msgid "Not published"
 msgstr "Non publié"
 
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr "Etes-vous certain de vouloir détacher %s?"
+
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid "Show "
 msgstr "Voir "
@@ -4072,51 +4123,66 @@ msgid " more..."
 msgstr " plus..."
 
 #: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:295
+#: View/Events/view.ctp:346
 msgid "Collapse…"
 msgstr "Plier…"
 
-#: View/Elements/Events/View/row_attribute.ctp:262
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr "- restreindre aux organisation détenues seulement."
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr "Observations avancées"
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr "avertissement"
+
+#: View/Elements/Events/View/row_attribute.ctp:343
 msgid "Restore attribute"
 msgstr "Restaurer attribut"
 
-#: View/Elements/Events/View/row_attribute.ctp:263;303
+#: View/Elements/Events/View/row_attribute.ctp:344;384
 msgid "Permanently delete attribute"
 msgstr "Supprimer définitivement l’attribut"
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Query enrichment"
 msgstr "Demander enrichissement"
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Propose enrichment"
 msgstr "Proposer enrichissement"
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Query Cortex"
 msgstr "Demander Cortex"
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Propose enrichment through Cortex"
 msgstr "Proposer enrichissement via Cortex"
 
-#: View/Elements/Events/View/row_attribute.ctp:279
+#: View/Elements/Events/View/row_attribute.ctp:360
 msgid "Propose Edit"
 msgstr "Proposer modification"
 
-#: View/Elements/Events/View/row_attribute.ctp:280
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Propose Deletion"
 msgstr "Proposer suppression"
 
-#: View/Elements/Events/View/row_attribute.ctp:290;295
+#: View/Elements/Events/View/row_attribute.ctp:371;376
 msgid "Add enrichment"
 msgstr "Ajouter enrichissement"
 
-#: View/Elements/Events/View/row_attribute.ctp:295
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Add enrichment via Cortex"
 msgstr "Ajouter enrichissement via Cortex"
 
-#: View/Elements/Events/View/row_attribute.ctp:307
+#: View/Elements/Events/View/row_attribute.ctp:388
 msgid "Soft-delete attribute"
 msgstr "Supprimer l'attribut"
 
@@ -4138,24 +4204,36 @@ msgid "Expand or Collapse"
 msgstr "Etendre ou stopper"
 
 #: View/Elements/Events/View/row_object.ctp:69
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
+msgstr "UUID"
+
+#: View/Elements/Events/View/row_object.ctp:70
 msgid "Meta-category: "
 msgstr "Méta-Catégorie: "
 
-#: View/Elements/Events/View/row_object.ctp:70
+#: View/Elements/Events/View/row_object.ctp:71
 #: View/Elements/Feeds/View/row_object.ctp:21
 msgid "Description: "
 msgstr "Description : "
 
-#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Events/View/row_object.ctp:72
 #: View/Elements/Feeds/View/row_object.ctp:22
 msgid "Template: "
 msgstr "Modèle: "
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Permanently delete object"
 msgstr "Supprimer définitivement l’objet"
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Soft delete object"
 msgstr "Supprimer l'objet"
 
@@ -4196,6 +4274,7 @@ msgstr "Ignorer la proposition"
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
 #: View/Sightings/ajax/advanced.ctp:10
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 msgid "Add sighting"
 msgstr "Ajouter aperçu"
 
@@ -4204,7 +4283,6 @@ msgid "Mark as false-positive"
 msgstr "Marquer comme faux-positif"
 
 #: View/Elements/Events/View/sighting_field.ctp:14
-#: View/Events/view.ctp:203
 msgid "Advanced sightings"
 msgstr "Aperçu avancé"
 
@@ -4232,7 +4310,7 @@ msgstr " valeur"
 
 #: View/Elements/Feeds/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object.ctp:20
-#: View/ObjectTemplates/view.ctp:19
+#: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:23
 msgid "Meta-category"
 msgstr "Méta-Catégorie"
@@ -4247,7 +4325,7 @@ msgid "all"
 msgstr "tout"
 
 #: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/view.ctp:126
+#: View/Events/view.ctp:131
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
 #: View/Servers/preview_event.ctp:36
 #: View/Sightings/ajax/list_sightings.ctp:5
@@ -4273,12 +4351,13 @@ msgstr "Statut"
 #: View/Elements/Servers/View/row_attribute.ctp:93
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/healthElements/files.ctp:61
-#: View/Elements/healthElements/workers.ctp:61;62;63
-#: View/Events/automation.ctp:403;410;417;438;445
+#: View/Elements/healthElements/workers.ctp:66;67;68
+#: View/Events/automation.ctp:234;241;248;269;276
 #: View/Events/export.ctp:68;88
-#: View/Taxonomies/view.ctp:96;107;152
-#: View/Users/admin_view.ctp:83;92;122
-#: View/Users/view.ctp:62
+#: View/Events/legacy_automation.ctp:403;410;417;438;445
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
 msgid "N/A"
 msgstr "Pas d’application"
 
@@ -4287,23 +4366,24 @@ msgstr "Pas d’application"
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
 #: View/Galaxies/view.ctp:14
-#: View/ObjectTemplates/view.ctp:11
+#: View/ObjectTemplates/view.ctp:4
 #: View/Objects/revise_object.ctp:19
 #: View/Organisations/ajax/merge.ctp:57;64
 #: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/view.ctp:9
-#: View/SharingGroups/add.ctp:11;31;51
-#: View/SharingGroups/edit.ctp:11;31;59
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
 #: View/SharingGroups/view.ctp:42;67
 #: View/Templates/view.ctp:9
 #: View/Users/statistics_orgs.ctp:31
-#: View/Warninglists/view.ctp:9
+#: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "Nom"
 
 #: View/Elements/Servers/View/row_object.ctp:21
 #: View/Elements/healthElements/files.ctp:8
-#: View/Elements/healthElements/settings_tab.ctp:16
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:10
 #: View/Elements/templateElements/populateTemplateDescription.ctp:12
 #: View/Elements/templateElements/populateTemplateFile.ctp:10
@@ -4311,19 +4391,19 @@ msgstr "Nom"
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:27
 #: View/Galaxies/view.ctp:20
-#: View/ObjectTemplates/view.ctp:21
+#: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:16;94
-#: View/Organisations/view.ctp:32;89;90
+#: View/Organisations/view.ctp:15;58;59
 #: View/Pages/doc/administration.ctp:48;241
-#: View/Pages/doc/categories_and_types.ctp:50;67
+#: View/Pages/doc/categories_and_types.ctp:44;61
 #: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
 #: View/Servers/preview_event.ctp:65
-#: View/SharingGroups/add.ctp:15
-#: View/SharingGroups/edit.ctp:15
-#: View/SharingGroups/index.ctp:28
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
 #: View/Taxonomies/view.ctp:14
 #: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:14
+#: View/Warninglists/view.ctp:11
 msgid "Description"
 msgstr "Description "
 
@@ -4342,11 +4422,17 @@ msgstr "Références"
 msgid "Referenced by"
 msgstr "Référencé par"
 
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr "Êtes-vous sûr de vouloir supprimer \"%s\"?"
+
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:2
+#: View/Roles/view.ctp:24
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_view.ctp:19
-#: View/Users/view.ctp:19
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
 msgstr "Rôle"
 
@@ -4357,7 +4443,7 @@ msgstr "Dernière connexion"
 #: View/Elements/Users/userIndexTable.ctp:17
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:54
+#: View/ShadowAttributes/index.ctp:64
 msgid "Created"
 msgstr "Créé"
 
@@ -4369,6 +4455,11 @@ msgstr "Initier rafraichissement mot de passe"
 msgid "Create new credentials and inform user"
 msgstr "Créer nouvelles données d’utilisateur et l’en informer"
 
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr "Etes-vous certain de vouloir supprimer # %s? Il est fortement recommandé de désactiver plutôt que de supprimer définitivement un utilisateur."
+
 #: View/Elements/dashboard/dashboard_events.ctp:2
 msgid "Changes since last visit"
 msgstr "Changements depuis la dernière visite"
@@ -4397,6 +4488,417 @@ msgstr "Evénements avec propositions: "
 msgid "Delegation requests: "
 msgstr "Demande de délégation: "
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr "Remplir depuis un modèle"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr "Résultat de l'import Freetext"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr "Voir l'événement"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr "Voir graphique de corrélation"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr "Voir l'historique de l'événement"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr "Editer événement"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr "Supprimer événement"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr "Ajouter un objet"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr "Ajouter une pièce jointe"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr "Remplir depuis ..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr "Enrichir l'événement"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr "Fusionner les attributs depuis..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr "Proposer un attribut"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr "Proposer pièce jointe"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr "Publier (sans courriel)"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr "Dépublier"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr "Déléguer la publication"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr "Accepter la demande de délégation"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr "Retirer une délégation de publication"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr "Publier l’événement sur ZMQ"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr "Êtes-vous sûr de vouloir republier l'événement actuel sur le canal ZMQ ?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr "Contacter l'auteur"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr "Télécharger en tant que ..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr "Ajouter une collection de tags"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr "Exporter les collections de tags"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr "Importer des collections de tags"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr "Importer depuis..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr "Lister les expressions régulières"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr "Nouvelle expression régulière"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr "Appliquer sur existant"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr "Êtes-vous sûr de vouloir relire toutes les règles de régénération sur chaque attribut de la base de données ? Cette tâche prendra longtemps et modifiera les données sans discrimination en fonction des règles configurées."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr "Editer une expression régulière"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr "Supprimer Regexp"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr "Voir liste d’avertissement"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr "Mettre à jour les listes d’avertissements"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr "Êtes-vous sûr de vouloir mettre à jour toutes les listes d'alerte ?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr "Voir la liste d'avis"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr "Liste des listes de notifications"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr "Mettre à jour les listes d'avis"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr "Voulez-vous continuer et mettre à jour tous les listes de notifications ?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr "Lister les listes blanches"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr "Nouvelle liste blanche"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr "Modifier liste blanche"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr "Supprimer liste blanche"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr "Modifier mon profil"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr "Modifier le mot de passe"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr "Réinitialiser le mot de passe"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr "Voir les organisations"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr "Modifier groupe de partage"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr "Voir groupe de partage"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr "Voir événement futur"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr "Voir événement futur"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr "Chercher cet événement"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr "Etes-vous certain de vouloir chercher cet événement et de le sauvegarder?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr "Modifier serveur"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr "Nouveaux serveurs"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr "Voir utilisateur"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr "Modifier utilisateur"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr "Supprimer utilisateur"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr "Modifier rôle"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr "Supprimer rôle"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr "Ajouter une organisation"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr "Modifier une organisation"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr "Assembler les organisations"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr "Ajouter un rôle"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr "Evénement sur liste noire"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr "Organisation sur liste noire"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr "Voir Fil"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr "Ajouter message"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr "Modifier message"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr "Lister les Fils"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr "Nouveau Fil"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr "Lister les etiquettes favoris"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr "Modifier étiquette"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr "Voir taxonomie"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr "Supprimer taxonomie"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr "Mettre à jour Taxonomies"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr "Voir modèle"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr "Modifier modèle"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr "Ajouter Flux"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr "Importer les Flux de JSON"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr "Matrix d’analyse du recouvrement des sources"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr "Exporter paramètres de Flux"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr "Modifier Flux"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr "Aperçu index"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr "Aperçu événement"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr "Voir Nouvelles"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr "Ajouter infos"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr "Modifier infos"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr "Mettre à jour les Galaxies"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr "Etes-vous certain de réimporter toutes les galaxies des sous-modules?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr "Forcer la mise à jour des galaxies"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr "Êtes-vous certain de vouloir supprimer et réimporter toutes les galaxies du sous-module ?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr "Voir galaxie"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr "Voir Groupe"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr "Mettre à jour objets"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr "Voir modèles d’objets"
+
 #: View/Elements/healthElements/diagnostics.ctp:5
 msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
 msgstr "Paramètres d’encodage de données incorrects: Votre connexion de données n’est actuellement PAS en UTF-8. Veuillez décommenter la ligne ‘d’encodage’ => ‘utf8’ "
@@ -4421,11 +4923,10 @@ msgstr "Version"
 msgid "Outdated version"
 msgstr "Version plus à jour"
 
-#: View/Elements/healthElements/diagnostics.ctp:26;156;170;195
-#: View/Elements/healthElements/workers.ctp:18;71
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
+#: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
-#: View/Users/admin_view.ctp:81
 msgid "OK"
 msgstr "OK"
 
@@ -4445,131 +4946,135 @@ msgstr "Statut…"
 msgid "Current branch…"
 msgstr "Branche actuelle…"
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Pull the latest MISP version from github"
 msgstr "Retirer la dernière version de MISP depuis github"
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Update MISP"
 msgstr "Mettre à jour MISP"
 
-#: View/Elements/healthElements/diagnostics.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "Writeable Directories and files"
 msgstr "Répertoires éditables et fichiers"
 
-#: View/Elements/healthElements/diagnostics.ctp:67
+#: View/Elements/healthElements/diagnostics.ctp:65
 msgid "The following directories and files have to be writeable for MISP to function properly. Make sure that the apache user has write privileges for the directories below."
 msgstr "Les répertoires suivants et fichiers doivent être éditables pour que MISP fonctionne correctement. Assurez-vous que l’utilisateur apache ait le droit d’édition pour les répertoires suivants."
 
-#: View/Elements/healthElements/diagnostics.ctp:68
+#: View/Elements/healthElements/diagnostics.ctp:66
 msgid "Directories"
 msgstr "Répertoires"
 
-#: View/Elements/healthElements/diagnostics.ctp:75
+#: View/Elements/healthElements/diagnostics.ctp:73
 msgid "Directory "
 msgstr "Répertoire "
 
-#: View/Elements/healthElements/diagnostics.ctp:83
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Writeable Files"
 msgstr "Fichiers éditables"
 
-#: View/Elements/healthElements/diagnostics.ctp:90;104
+#: View/Elements/healthElements/diagnostics.ctp:88;102
 msgid "File "
 msgstr "Fichier "
 
-#: View/Elements/healthElements/diagnostics.ctp:97
+#: View/Elements/healthElements/diagnostics.ctp:95
 msgid "Readable Files"
 msgstr "Fichiers lisibles"
 
-#: View/Elements/healthElements/diagnostics.ctp:112
+#: View/Elements/healthElements/diagnostics.ctp:110
 msgid "PHP Settings"
 msgstr "Paramètres PHP"
 
-#: View/Elements/healthElements/diagnostics.ctp:115;127
+#: View/Elements/healthElements/diagnostics.ctp:113;125
 msgid "Up to date"
 msgstr "A jour"
 
-#: View/Elements/healthElements/diagnostics.ctp:121
-#: View/Elements/healthElements/workers.ctp:78;80
-#: View/Organisations/view.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:119
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: View/Elements/healthElements/diagnostics.ctp:123
+#: View/Elements/healthElements/diagnostics.ctp:121
 msgid "Issues determining version"
 msgstr "Ne peut identifier la version"
 
-#: View/Elements/healthElements/diagnostics.ctp:130;139
+#: View/Elements/healthElements/diagnostics.ctp:128;137
 msgid "Update highly recommended"
 msgstr "Mise à jour fortement recommandée"
 
-#: View/Elements/healthElements/diagnostics.ctp:133;142
+#: View/Elements/healthElements/diagnostics.ctp:131;140
 msgid "Version unsupported, update ASAP"
 msgstr "Version non supportée, mettez à jour le plus rapidement possible"
 
-#: View/Elements/healthElements/diagnostics.ctp:146
+#: View/Elements/healthElements/diagnostics.ctp:144
 msgid "PHP ini path"
 msgstr "Chemin PHP ini"
 
-#: View/Elements/healthElements/diagnostics.ctp:147
+#: View/Elements/healthElements/diagnostics.ctp:145
 msgid "PHP Version"
 msgstr "Version PHP"
 
-#: View/Elements/healthElements/diagnostics.ctp:147;148
+#: View/Elements/healthElements/diagnostics.ctp:145;146
 msgid "recommended"
 msgstr "recommandé"
 
-#: View/Elements/healthElements/diagnostics.ctp:148
+#: View/Elements/healthElements/diagnostics.ctp:146
 msgid "PHP CLI Version"
 msgstr "Version PHP CLI"
 
-#: View/Elements/healthElements/diagnostics.ctp:149
+#: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr "Veuillez noter que nous allons abandonner le support pour Python 2.7 et PHP 7.1 à partir de 2020-01-01 et sont dorénavant considérés comme obsolètes (mais supportés jusqu'à la fin de 2019). Ces deux versions vont alors atteindre leurs fin de vie et deviendront un risque. De plus, en abandonnant le support pour ces versions obsolètes des langues, nous serons en mesure de supprimer progressivement le support du code héritage qui existe uniquement pour les soutenir. Assurez-vous de planifier en conséquence. Plus d'infos: "
+
+#: View/Elements/healthElements/diagnostics.ctp:148
 msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
 msgstr "Les paramètres suivants peuvent avoir un impact négatifs sur certaines fonctionnalités de MISP avec les paramètres minimums et recommandés mis actuellement. Vous pouvez les ajuster das votre php.ni."
 
-#: View/Elements/healthElements/diagnostics.ctp:156
+#: View/Elements/healthElements/diagnostics.ctp:155
 #: View/Events/filter_event_index.ctp:32;190
 #: View/Pages/doc/using_the_system.ctp:66;171
 msgid "Low"
 msgstr "Bas"
 
-#: View/Elements/healthElements/diagnostics.ctp:160
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP Extensions"
 msgstr "Extensions PHP"
 
-#: View/Elements/healthElements/diagnostics.ctp:170
+#: View/Elements/healthElements/diagnostics.ctp:169
 msgid "Not loaded"
 msgstr "Non chargé"
 
-#: View/Elements/healthElements/diagnostics.ctp:175
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr "Problèmes pour lire les paramètres PHP. Cela peut être dû à l’illisibilité du test script."
 
-#: View/Elements/healthElements/diagnostics.ctp:183
+#: View/Elements/healthElements/diagnostics.ctp:182
 msgid "Advanced attachment handler"
 msgstr "Gestionnaire de pièces jointes avancées"
 
-#: View/Elements/healthElements/diagnostics.ctp:184
+#: View/Elements/healthElements/diagnostics.ctp:183
 msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
 msgstr "L'outil avancée de gestion de pièces jointes est utiilisé par la fonctionnalité d'ajout de pièces jointes pour extraire des données supplémentaires concernant les fichiers téléversés."
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PyMISP"
 msgstr "PyMISP"
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "Not installed or version outdated."
 msgstr "Version non installée ou plus à jour."
 
-#: View/Elements/healthElements/diagnostics.ctp:201
+#: View/Elements/healthElements/diagnostics.ctp:200
 msgid "STIX and Cybox libraries"
 msgstr "Bibliothèques STIX et CyBox"
 
-#: View/Elements/healthElements/diagnostics.ctp:202
+#: View/Elements/healthElements/diagnostics.ctp:201
 msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
 msgstr "Les bibliothèques Mitre STIX et CyBox python doivent être installées pour que l’exportation de STIX fonctionne sur MISP. Assurez-vous de les installer (comme décrits dans les instructions d’installation de MISP) si vous recevez une erreur."
 
-#: View/Elements/healthElements/diagnostics.ctp:203
+#: View/Elements/healthElements/diagnostics.ctp:202
 msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
 msgstr "En cas de problème, assurez-vous que STIX et Cybox soient tous les deux installés comme décrit dans le fichier INSTALL.txt. Les versions requises sont"
 
@@ -4806,72 +5311,35 @@ msgid "Permissions"
 msgstr "Permissions"
 
 #: View/Elements/healthElements/files.ctp:73
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
 #: View/Roles/admin_index.ctp:67
-#: View/SharingGroups/index.ctp:68
+#: View/SharingGroups/index.ctp:87
 msgid "Are you sure you want to delete %s?"
 msgstr "Etes-vous certain de vouloir supprimer %s?"
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
 msgstr "Critique, votre installation MISP demande une attention immédiate."
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
 msgstr "Des problèmes sont présents, nous vous recommandons de les solutionner."
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:5
 msgid "Good, but there are some optional settings that are incorrect / not set."
 msgstr "Bien, mais certains paramètres optionnels sont incorrects / ne sont pas activés."
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:6
 msgid "In perfect health."
 msgstr "En parfaite santé."
 
 #: View/Elements/healthElements/overview.ctp:15
-msgid "Overall health"
-msgstr "Santé générale"
+msgid "Test"
+msgstr "Essai"
 
-#: View/Elements/healthElements/overview.ctp:17
-msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr "La santé générale de votre installation dépend des problèmes les plus graves non résolus."
-
-#: View/Elements/healthElements/overview.ctp:26
-msgid " settings incorrectly or not set"
-msgstr " paramètres établis correctement ou non"
-
-#: View/Elements/healthElements/overview.ctp:27
-msgid " incorrect settings."
-msgstr " paramètres incorrects."
-
-#: View/Elements/healthElements/overview.ctp:33
-msgid "Critical issues revealed by the diagnostics"
-msgstr "Problèmes critiques révélés par les diagnostiques"
-
-#: View/Elements/healthElements/overview.ctp:34
-msgid " issues detected."
-msgstr " problèmes détectés."
-
-#: View/Elements/healthElements/overview.ctp:35
-msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
-msgstr "Les problèmes révélés ici peuvent être dus à des permissions incorrectes de répertoire ou de dépendances incorrectement installées."
-
-#: View/Elements/healthElements/settings_tab.ctp:9
-msgid "Toggle subgroup"
-msgstr "Activer/Désactiver les sous-groupes"
-
-#: View/Elements/healthElements/settings_tab.ctp:13
-#: View/Pages/doc/administration.ctp:45
-msgid "Priority"
-msgstr "Priorité"
-
-#: View/Elements/healthElements/settings_tab.ctp:14
-#: View/Pages/doc/administration.ctp:46
-msgid "Setting"
-msgstr "Réglages"
-
-#: View/Elements/healthElements/settings_tab.ctp:15
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
 #: View/Events/filter_event_index.ctp:134
 #: View/Events/resolved_attributes.ctp:45
 #: View/Events/show_i_o_c_results.ctp:13
@@ -4886,128 +5354,166 @@ msgstr "Réglages"
 msgid "Value"
 msgstr "Valeur"
 
-#: View/Elements/healthElements/settings_tab.ctp:17
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr "Santé générale"
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr "La santé générale de votre installation dépend des problèmes les plus graves non résolus."
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr " paramètres établis correctement ou non"
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr "%s paramètres incorrectes."
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr "Problèmes critiques révélés par les diagnostiques"
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr "%s problèmes détectés."
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr "Les problèmes révélés ici peuvent être dus à des permissions incorrectes de répertoire ou de dépendances incorrectement installées."
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr "Priorité"
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr "Réglages"
+
+#: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
 msgstr "Message d’erreur"
 
-#: View/Elements/healthElements/tabs.ctp:3;15;27;36
-#: View/Events/index.ctp:30;58
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
-#: View/Users/admin_index.ctp:28
-msgid "Modify filters"
-msgstr "Modifier filtres"
-
-#: View/Elements/healthElements/tabs.ctp:3
+#: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
 msgstr "Aperçu"
 
-#: View/Elements/healthElements/tabs.ctp:28
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
+msgstr "Cet onglet signale certaines erreurs critiques potentielles."
+
+#: View/Elements/healthElements/tabs.ctp:34
 #: View/Pages/doc/administration.ctp:38
 msgid "Diagnostics"
 msgstr "Diagnostics"
 
-#: View/Elements/healthElements/tabs.ctp:37
-#: View/Pages/doc/administration.ctp:39
-msgid "Workers"
-msgstr "Travailleurs"
-
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
 msgstr "Gérer les fichiers"
 
-#: View/Elements/healthElements/tabs.ctp:48
+#: View/Elements/healthElements/tabs.ctp:50;65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
 msgstr "Télécharger le rapport"
 
-#: View/Elements/healthElements/workers.ctp:5
-msgid "Warning"
-msgstr "Attention"
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
+msgstr "Travailleurs"
 
 #: View/Elements/healthElements/workers.ctp:5
 msgid "MISP cannot access your /proc directory to check the status of the worker processes, which means that dead workers will not be detected by the diagnostic tool. If you would like to regain this functionality, make sure that the open_basedir directive is not set, or that /proc is included in it."
 msgstr "MISP ne peut accéder à votre répertoire /proc pour contrôler le statut des processus d’arrière-plan, ce qui signifie que les processus inactifs ne seront pas détectés par l’outil de diagnostique. Si vous voulez restaurer cette fonctionnalité, assurez-vous que la directive open_basedir n’est pas active, ou que /proc n’est pas incluse."
 
 #: View/Elements/healthElements/workers.ctp:10
+msgid "Note:"
+msgstr "Note :"
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "You have set the \"manage_workers\" variable to \"false\", therefore worker controls have been disabled."
+msgstr "Vous avez défini la variable \"manage_workers\" à \"false\", donc les contrôles des travailleurs ont été désactivés."
+
+#: View/Elements/healthElements/workers.ctp:15
 msgid "Issues prevent jobs from being processed. Please resolve them below."
 msgstr "Des problèmes empêchent le bon fonctionnement du travail. Veuillez les résoudre."
 
-#: View/Elements/healthElements/workers.ctp:15
+#: View/Elements/healthElements/workers.ctp:20
 msgid "Worker started with the correct user, but the current status is unknown."
 msgstr "Le travail a débuté avec le bon utilisateur, mais le statut actuel est inconnu."
 
-#: View/Elements/healthElements/workers.ctp:24
+#: View/Elements/healthElements/workers.ctp:29
 msgid "There are issues with the worker(s), but at least one healthy worker is monitoring the queue."
 msgstr "Il y a des problèmes avec le(s) travail/travaux, mais au moins un travail sain contrôle la queue."
 
-#: View/Elements/healthElements/workers.ctp:30
+#: View/Elements/healthElements/workers.ctp:35
 msgid "Worker type: "
 msgstr "Type de travail: "
 
-#: View/Elements/healthElements/workers.ctp:32
+#: View/Elements/healthElements/workers.ctp:37
 msgid "Jobs in the queue: "
 msgstr "Tâches en attente: "
 
-#: View/Elements/healthElements/workers.ctp:40
+#: View/Elements/healthElements/workers.ctp:45
 msgid "Queue status: "
 msgstr "Statut d’attente: "
 
-#: View/Elements/healthElements/workers.ctp:51
+#: View/Elements/healthElements/workers.ctp:56
 msgid "Worker PID"
 msgstr "L’identifiant de processus PID"
 
-#: View/Elements/healthElements/workers.ctp:52
+#: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
-#: View/Users/admin_view.ctp:7
-#: View/Users/view.ctp:2
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
 msgid "User"
 msgstr "Utilisateur"
 
-#: View/Elements/healthElements/workers.ctp:53
+#: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr "Processus d’arrière-plan"
 
-#: View/Elements/healthElements/workers.ctp:54
+#: View/Elements/healthElements/workers.ctp:59
 msgid "Information"
 msgstr "Information"
 
-#: View/Elements/healthElements/workers.ctp:64
+#: View/Elements/healthElements/workers.ctp:69
 msgid "Worker not running!"
 msgstr "Travail inactif!"
 
-#: View/Elements/healthElements/workers.ctp:72
+#: View/Elements/healthElements/workers.ctp:77
 msgid "The worker appears to be healthy."
 msgstr "Le travail semble sain."
 
-#: View/Elements/healthElements/workers.ctp:75
+#: View/Elements/healthElements/workers.ctp:80
 msgid "The worker was started with a user other than the apache user. MISP cannot check whether the worker is alive or not."
 msgstr "Le travail a débuté avec un utilisateur autre que l’utilisateur apache. MISP ne peut vérifier si ce travail est vivant ou non."
 
-#: View/Elements/healthElements/workers.ctp:81
+#: View/Elements/healthElements/workers.ctp:86
 msgid "Cannot check whether the worker is alive or dead."
 msgstr "Ne peut vérifier si le travail est vivant ou non."
 
-#: View/Elements/healthElements/workers.ctp:85
+#: View/Elements/healthElements/workers.ctp:90
 msgid "Dead"
 msgstr "Mort"
 
-#: View/Elements/healthElements/workers.ctp:86
+#: View/Elements/healthElements/workers.ctp:91
 msgid "The Worker appears to be dead."
 msgstr "Le travail semble mort."
 
-#: View/Elements/healthElements/workers.ctp:100
+#: View/Elements/healthElements/workers.ctp:106
 msgid "Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it."
 msgstr "Stop (si toujours en cours) et supprimer ce travail. Ceci va immédiatement terminer toute tâche exécutée par ce travail."
 
-#: View/Elements/healthElements/workers.ctp:111
+#: View/Elements/healthElements/workers.ctp:119
 msgid "Start a worker"
 msgstr "Démarrer un travail"
 
-#: View/Elements/healthElements/workers.ctp:119
+#: View/Elements/healthElements/workers.ctp:130
 msgid "Restart all workers"
 msgstr "Redémarrer tous les travaux"
 
@@ -5138,16 +5644,16 @@ msgstr "Champ"
 #: View/Objects/revise_object.ctp:45
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
-#: View/Pages/doc/categories_and_types.ctp:66
+#: View/Pages/doc/categories_and_types.ctp:60
 #: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
-#: View/ShadowAttributes/index.ctp:36;51
-#: View/SharingGroups/add.ctp:30
-#: View/SharingGroups/edit.ctp:30
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
 #: View/Sightings/ajax/list_sightings.ctp:7
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:35
-#: View/Warninglists/view.ctp:24
+#: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr "Type"
 
@@ -5186,7 +5692,7 @@ msgid "Template Name"
 msgstr "Nom de Modèle"
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:60
+#: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr "Créé par"
@@ -5206,7 +5712,7 @@ msgid "s"
 msgstr "s"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
-#: View/ObjectReferences/ajax/add.ctp:60
+#: View/ObjectReferences/ajax/add.ctp:86
 #: View/Objects/revise_object.ctp:43
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
@@ -5220,9 +5726,9 @@ msgstr "Attribut"
 #: View/Feeds/freetext_index.ctp:31
 #: View/Objects/add.ctp:95
 #: View/Objects/revise_object.ctp:44
-#: View/Pages/doc/categories_and_types.ctp:17;23;37;43;49
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
 #: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
-#: View/ShadowAttributes/index.ctp:48
+#: View/ShadowAttributes/index.ctp:58
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_add_file.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
@@ -5232,7 +5738,7 @@ msgid "Category"
 msgstr "Catégorie"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
-#: View/Pages/doc/categories_and_types.ctp:63
+#: View/Pages/doc/categories_and_types.ctp:57
 #: View/Pages/doc/using_the_system.ctp:109
 #: View/Pages/doc/md/categories_and_types.ctp:33
 msgid "Types"
@@ -5461,45 +5967,33 @@ msgstr "Supprimer le graphe d'événement"
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr "Êtes vous sur de vouloir supprimer l'eventGraph #%s ? L'eventGraph sera supprimé de manière permanente et ne pourra être récupéré."
 
-#: View/Events/add.ctp:3
-msgid "The event created %s, but not synchronised to other MISP instances until it is published."
-msgstr "L'événement %s est créer mais n'est pas synchronisé avec d'autres instances MISP tant qu'il n'est pas publié."
-
-#: View/Events/add.ctp:3
-msgid "will be restricted to your organisation"
-msgstr "sera restreint à votre organisation"
-
-#: View/Events/add.ctp:3
-msgid "will be visible to the organisations having an account on this platform"
-msgstr "sera visible pour les organisations ayant un compte sur cette instance"
-
-#: View/Events/add.ctp:48
+#: View/Events/add.ctp:44
 #: View/Events/edit.ctp:35
 msgid "Threat Level "
 msgstr "Niveau de menace "
 
-#: View/Events/add.ctp:52
+#: View/Events/add.ctp:48
 #: View/Events/edit.ctp:38
 msgid "Analysis "
 msgstr "Analyse "
 
-#: View/Events/add.ctp:56
+#: View/Events/add.ctp:52
 #: View/Events/edit.ctp:43
-#: View/ShadowAttributes/index.ctp:42
+#: View/ShadowAttributes/index.ctp:52
 msgid "Event Info"
 msgstr "Information de l'événement"
 
-#: View/Events/add.ctp:60
+#: View/Events/add.ctp:56
 #: View/Events/edit.ctp:47
 msgid "Quick Event Description or Tracking Info"
 msgstr "Rapide description de l'événement ou information de suivi"
 
-#: View/Events/add.ctp:63
+#: View/Events/add.ctp:59
 #: View/Events/edit.ctp:50
 msgid "Extends event"
 msgstr "Étendre l'événement"
 
-#: View/Events/add.ctp:66
+#: View/Events/add.ctp:62
 #: View/Events/edit.ctp:53
 msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr "UUID ou ID de l'événement. Laisser vide si non applicable."
@@ -5510,7 +6004,8 @@ msgstr "Importer un fichier OpenIOC"
 
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
-#: View/Events/upload_stix.ctp:22
+#: View/Events/upload_analysis_file.ctp:22
+#: View/Events/upload_stix.ctp:29
 msgid "Upload"
 msgstr "Téléverser"
 
@@ -5548,7 +6043,7 @@ msgid "Details"
 msgstr "Détails"
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:89
+#: View/Jobs/index.ctp:124
 msgid "Failed"
 msgstr "Échec"
 
@@ -5561,372 +6056,269 @@ msgid "Event with this UUID already exists."
 msgstr "Un événement avec cet UUID existe déjà."
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr "Évènement "
 
 #: View/Events/automation.ctp:3
-msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
-"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
-"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
-msgstr "La fonctionnalité d'automation est faite pour générer automatiquement des signature pour des systèmes de détection d'intrusion. Pour activer la génération de signature pour un attribut ou un champ signature spécifique, cet attribut doit être défini en \"yes\".\n"
-"    Il est à noter que l'ensemble des types d'attributs n'est pas forcément utilisable pour la génération de signatures. Actuellement, la génération de signature NIDS est possible pour les types IP, noms de domaine, nom de machine, user agent etc., et la liste de hash pour les type MD5 et SHA1 d'artéfacts. Le support de plus de types d'attributs est planifié.\n"
-"    Pour rendre cette fonctionnalité disponible à des outils d'automation, une clé d'authentification est requise. Cela permet de faciliter l'accès de vos outils aux données sans passer par l'authentification par formulaire."
+msgid "Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.\n"
+"    To to make this functionality available for automated tools an authentication key is used."
+msgstr "La fonctionnalité d'automatisation est conçue pour alimenter automatiquement d'autres outils et systèmes avec les données de votre référentiel MISP.\n"
+"    Pour rendre cette fonctionnalité disponible pour les outils automatisés, une clé d'authentification est utilisée."
 
 #: View/Events/automation.ctp:6
-msgid "Make sure you keep that key secret as it gives access to the entire database !"
-msgstr "Soyez sûr de garder cette clé secrète car elle donne un accès complet à la base de donnée !"
+msgid "Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP."
+msgstr "Assurez-vous de garder votre clé API secrète car elle donne accès à toutes les données auxquelles vous avez normalement accès dans MISP."
 
-#: View/Events/automation.ctp:7
+#: View/Events/automation.ctp:9
+#: View/Events/legacy_automation.ctp:7
 msgid "Your current key is: <code>%s</code>.\n"
 "    You can %s this key."
 msgstr "Votre clé actuelle est : <code>%s</code>.\n"
 "    vous pouvez %s cette clé."
 
-#: View/Events/automation.ctp:8
+#: View/Events/automation.ctp:10
+#: View/Events/legacy_automation.ctp:8
 msgid "reset"
 msgstr "réinitialiser"
 
-#: View/Events/automation.ctp:10
-msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
-msgstr "Depuis la version 2.2, l'usage de la clé d'authentification dans l'URL est déprecié. A la place, passez la clé d'authentification dans l'en-tête \"Authorization\" de la requête. Cette option historique est toujours supportée mais non recommandée."
-
-#: View/Events/automation.ctp:11
-msgid "Please use the use the following header"
-msgstr "Merci d'utiliser l'en-tête suivant"
-
-#: View/Events/automation.ctp:12
-msgid "Authorization"
-msgstr "Autorisation"
-
-#: View/Events/automation.ctp:13
-msgid "XML Export"
-msgstr "Export XML"
-
 #: View/Events/automation.ctp:14
-msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
-msgstr "Un export automatique de tout les attributs et événements <small>(excepté les pièces jointes)</small> est disponible dans un format XML personnalisable."
+#: View/Logs/admin_index.ctp:20;21
+msgid "Search"
+msgstr "Rechercher"
 
-#: View/Events/automation.ctp:15;47;76
-msgid "You can configure your tools to automatically download the following file"
-msgstr "Vous pouvez configurer vos outils pour télécharger automatiquement le fichier suivant"
+#: View/Events/automation.ctp:16
+#: View/Events/legacy_automation.ctp:264
+msgid "It is possible to search the database for attributes based on a list of criteria."
+msgstr "Il est possible de rechercher dans la base de données en se basant sur une liste de cirtères."
 
 #: View/Events/automation.ctp:17
-msgid "If you only want to fetch a specific event append the eventid number"
-msgstr "Si vous souhaitez seulement récupérer un événement spécifique, ajoutez le numéro d'événement"
+#: View/Events/legacy_automation.ctp:265
+msgid "To return an event or a list of events in a desired format, use the following syntax"
+msgstr "Pour retourner un événement ou une liste d'événement dans le format désiré, utilisez la syntaxe suivante"
 
-#: View/Events/automation.ctp:19;144
-msgid "You can post an XML or JSON object containing additional parameters in the following formats"
-msgstr "Vous pouvez envoyer un objet XML ou JSON contenant des paramètres au format suivant"
+#: View/Events/automation.ctp:18
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
+msgstr "Si une liste de paramètres est fournie ci-dessous, elle n'est pas nécessairement exhaustive, des formats d'exportation spécifiques pourraient avoir des paramètres supplémentaires."
 
-#: View/Events/automation.ctp:26
-msgid "The xml download also accepts two additional the following optional parameters in the URL"
-msgstr "Le téléchargement de fichier accepte aussi deux autres paramètres optionnels à la suite dans l'URL"
+#: View/Events/automation.ctp:21
+msgid "Set the return format of the search (Currently supported: json, xml, openioc, suricata, snort - more formats are being moved to restSearch with the goal being that all searches happen through this API). Can be passed as the first parameter after restSearch or via the JSON payload."
+msgstr "Définissez le format de retour de la recherche (actuellement supporté : json, xml, openioc, suricata, snort - d'autres formats sont en coures de déplacement vers la restSearch, avec le but étant que toutes les recherches se produisent via cette API). Peut être passé comme premier paramètre après restSearch ou via le bloc JSON."
 
-#: View/Events/automation.ctp:29;52;85
-msgid "Restrict the download to a single event"
-msgstr "Restreindre le téléchargement à un seul événement"
+#: View/Events/automation.ctp:22
+msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
+msgstr "Limiter le nombre de résultats retournés, selon la portée (par exemple 10 attributs ou 10 événements complets)."
 
-#: View/Events/automation.ctp:30
-msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
-msgstr "Une valeur booléenne déterminant si les pièces jointes doivent être encodées et un second paramètre qui contrôle les tags éligibles."
+#: View/Events/automation.ctp:23
+msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
+msgstr "Si une limite est définie, définit la page à retourner. la page 3, limite 100 retournera les enregistrements 201->300)."
 
-#: View/Events/automation.ctp:31;54;87;112;134
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
-msgstr "Pour inclure un tags dans les résultats, il suffit seulement d'écrire son nom dans ce paramètre. Pour exclure un tag, préfixez le avec un '!'.\n"
-"   Vous pouvez aussi chaîner plusieurs tag ensemble avec l'opérateur '&amp;&amp;'. Merci de faire attention à ne pas utiliser de \"deux-points\" (:) pour la recherche de tags.\n"
-"   Utilisez le \"point-virgule\" à la place (la recherche recherchera automatiquement les \"deux-points\" à la place). Par exemple, pour inclure tag1 et tag2 mais exclure tag3, vous pouvez utiliser"
+#: View/Events/automation.ctp:24
+#: View/Events/legacy_automation.ctp:268;297
+msgid "Search for the given value in the attributes' value field."
+msgstr "Recherche pour les valeurs indiquées dans les valeurs des champs d'attributs."
 
-#: View/Events/automation.ctp:37;64;91;117;140;203;254;279
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
-msgstr "Événements avec la date définie à une date ultérieure à celle spécifiée dans le champ \"to\" (format : 2015-02-15). Ce filtre utilise la date de l’événement."
-
-#: View/Events/automation.ctp:38;65;92;118;141;204;255;280
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
-msgstr "Événements avec la date définie à une date antérieure à celle spécifiée dans le champ \"to\" (format : 2015-02-15). Ce filtre utilise la date de l’événement."
-
-#: View/Events/automation.ctp:39;119;142;205;256;281;306
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr "Les événements publiés dans les derniers x temps, ou x peut être défini en jours, heures, minutes (par exemple 5d ou 12h ou 30m). Ce filtre va utiliser l'horodatage de publication de l'événément."
-
-#: View/Events/automation.ctp:41;70;97;122;259;290
-msgid "The keywords false or null should be used for optional empty parameters in the URL."
-msgstr "Les mots-clés \"false\" ou \"null\" devraient être utilisé pour les paramètres vides optionnels dans l'URL."
-
-#: View/Events/automation.ctp:43
-msgid "Also check out the %s to read about the REST API."
-msgstr "Merci de vérifier le %s à lire à propos de l'API REST."
-
-#: View/Events/automation.ctp:45
-msgid "CSV Export"
-msgstr "Export CSV"
-
-#: View/Events/automation.ctp:46
-msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
-msgstr "Un export automatique des attributs est disponible en CSV. Seuls les attributs flagués \"to_ids\" seront exportés."
-
-#: View/Events/automation.ctp:49
-msgid "You can specify additional flags for CSV exports as follows"
-msgstr "Vous pouvez spécifier des indicateurs supplémentaires pour l’exportation CSV comme suit"
-
-#: View/Events/automation.ctp:53
-msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
-msgstr "Placer cet indicateur sur \"true\" incluera des attributs qui ne sont pas marqué en \"to_ids\"."
-
-#: View/Events/automation.ctp:58
-msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
-msgstr "Par exemple, pour seulement télécharger un csv généré avec tout les événénements ayant des attributs de type \"domain\" et la catégorie \"Network Activity\" excepté pour un ou plusieurs en restreignant à ceux ayant le \"tag1\" et \"tag2\" mais pas \"tag3\", pour les attributs qui sont destinés à l'IDS, utilisez la syntaxe suivante"
-
-#: View/Events/automation.ctp:61;270;299
-msgid "The attribute category, any valid MISP attribute category is accepted."
-msgstr "La catégorie d'attribut, toute catégorie d'attribut MISP valide est acceptée."
-
-#: View/Events/automation.ctp:62;199;269;298
+#: View/Events/automation.ctp:25
+#: View/Events/legacy_automation.ctp:62;199;269;298
 msgid "The attribute type, any valid MISP attribute type is accepted."
 msgstr "Le type d’attribut, tout type d’attribut MISP valide est accepté."
 
-#: View/Events/automation.ctp:63
-msgid "Include the event data with each attribute."
-msgstr "Inclure les données de l'événement avec chaque attribut."
+#: View/Events/automation.ctp:26
+#: View/Events/legacy_automation.ctp:61;270;299
+msgid "The attribute category, any valid MISP attribute category is accepted."
+msgstr "La catégorie d'attribut, toute catégorie d'attribut MISP valide est acceptée."
 
-#: View/Events/automation.ctp:66
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
-msgstr "Les événements publiés dans les dernières x période temporelle, ou x peut être défini en jours, heures, minutes (par exemple 5d ou 12h ou 30m). Ce filtre va utiliser l'horodatage de publication de l'événément."
+#: View/Events/automation.ctp:27
+#: View/Events/legacy_automation.ctp:271;300
+msgid "Search by the creator organisation by supplying the organisation identifier."
+msgstr "Recherche par l’organisation créatrice en fournissant l’identifiant de l’organisation."
 
-#: View/Events/automation.ctp:67
-msgid "The CSV created when this setting is set to true will not contain the header row.\n"
-"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
-msgstr "Les CSV créés lorsque ce paramètre est défini sur \"true\" ne contiendront plus la ligne d'en-têtes. \n"
-"<b>enforceWarninglist</b>: Tout les attributs correspondant à une entrée de liste d'avertissement seront exclus."
-
-#: View/Events/automation.ctp:71
-msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
-msgstr "Pour exporter les attributs de l'ensemble des événements qui sont de type \"domain\", utilisez la syntaxe suivante"
-
-#: View/Events/automation.ctp:74
-msgid "NIDS rules export"
-msgstr "Export de règles NIDS"
-
-#: View/Events/automation.ctp:75
-msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr "L'export automatique de l'ensemble des attributs relatifs au réseau est disponible depuis le format de règles Snort. Seuls les événéments publiés et les attributs marqués en tant que <em>Signature IDS</em> sont exportés."
-
-#: View/Events/automation.ctp:81
-msgid "The full API syntax is as follows"
-msgstr "La syntaxe complète de l'API est la suivante"
-
-#: View/Events/automation.ctp:84
-msgid "The export format, can be \"suricata\" or \"snort\""
-msgstr "Le format d'export, peut être \"suricata\" ou \"snort\""
-
-#: View/Events/automation.ctp:86
-msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
-msgstr "Quelques commentaires en dehors de l'explication du cadre des données. La raison pour désactiver cela serait si vous souhaitez concaténer une liste d'export pour une sélection d'événements variés dans l'ordre pour éviter la duplication non nécessaire des commentaires."
-
-#: View/Events/automation.ctp:93
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr "Les événements publiés dans les derniers x temps, ou x peut être défini en jours, heures, minutes (par exemple 6d ou 12h ou 30m). Ce filtre va utiliser l'horodatage de publication de l'événément."
-
-#: View/Events/automation.ctp:94
-msgid "Restrict the export to only use the given types."
-msgstr "Limiter l’exportation pour seulement certains types."
-
-#: View/Events/automation.ctp:95;120;174;206;257
-msgid "All attributes that have a hit on a warninglist will be excluded."
-msgstr "Tout les attributs qui sont dans une liste d'avertissement seront exclus."
-
-#: View/Events/automation.ctp:96
-msgid "All tags will be included even if not exportable."
-msgstr "Tout les tags seront inclus sauf si ils ne sont pas exportables."
-
-#: View/Events/automation.ctp:98
-msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
-msgstr "Un exemple d'un export Suricata de tout les événéments excluant ceux taggués \"tag1\", sans l'ensemble des informations de commentaire au début du fichier devrait ressembler à ça:"
-
-#: View/Events/automation.ctp:100
-msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
-msgstr "L'administrateur peut maintenir une liste blanche contenant des noms d'hôtes, noms de domaines et adresses IP a exclure des exports NIDS."
-
-#: View/Events/automation.ctp:102
-msgid "Hash database export"
-msgstr "Export de la base de données des hash"
-
-#: View/Events/automation.ctp:103
-msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr "L'export automatique des sommes de contrôle MD5/SHA1 contenu dans des attributs relatifs à des fichiers. Cette liste peut être utilisé pour alimenter un logiciel d'analyse post-mortem pour la recherche de fichiers suspects. Seul les événements et attributs <em>publiés</em> marqués en tant que <em>Signature IDS</em> sont exportés."
-
-#: View/Events/automation.ctp:104;188
-msgid "You can configure your tools to automatically download the following files"
-msgstr "Vous pouvez configurer vos outils pour télécharger automatiquement les fichiers suivant"
-
-#: View/Events/automation.ctp:109
-msgid "The API's full format is as follows"
-msgstr "Le format complet de l'API est comme suit"
-
-#: View/Events/automation.ctp:111
-msgid "The export format, can be \"md5\" or \"sha1\""
-msgstr "Le format d'export, pouvant être \"md5\" ou \"sha1\""
-
-#: View/Events/automation.ctp:123
-msgid "For example, to only show sha1 values from events tagged tag1, use"
-msgstr "Par exemple, pour seulement afficher les valeurs de sha1 d’événements marqués tag1, utilisez"
-
-#: View/Events/automation.ctp:126
-msgid "STIX export"
-msgstr "Export STIX"
-
-#: View/Events/automation.ctp:127
-msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
-msgstr "Vous pouvez exporter les événements MISP au format STIX du MITRE (pour en savoir plus cliquez ici <a href=\"https://stix.mitre.org/\">here</a>). L'export XML STIX est actuellement très lent et peut expirer en cas de gros événements ou d'agrégation d'événements. Le format JSON ne souffre pas de ce problème. L'usage"
-
-#: View/Events/automation.ctp:129
-msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
-msgstr "Les paramètres de recherches peuvent être passé à la fonction par les paramètres de l'URL ou en POSTant un object JSON ou XML (dépendant du type retourné). Les paramètres suivants peuvent être passés vers l'outil d'export STIX: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. ensemble <code>id</code> et <code>tags</code> peuvent utiliser le <code>&amp;&amp;</code> (and) et <code>!</code> (non) opérateurs pour construire la requête. Pour utiliser le paramétrage par URL, la syntaxe est la suivante"
-
-#: View/Events/automation.ctp:132;171
-msgid "The event's ID"
-msgstr "L'ID de l'événement"
-
-#: View/Events/automation.ctp:133
-msgid "Encode attachments where applicable"
-msgstr "Encoder les pièces jointes lorsque c'est possible"
-
-#: View/Events/automation.ctp:151
-msgid "Various ways to narrow down the search results of the STIX export"
-msgstr "Différentes façons d’affiner les résultats de recherche de l’exportation STIX"
-
-#: View/Events/automation.ctp:152
-msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
-msgstr "Par exemple, pour récupérer tout les événements marqués \"APT1\" mais en excluant tout ceux marqués \"OSINT\" et excluant les événements #51 et #62 sans aucune pièces jointes"
-
-#: View/Events/automation.ctp:154
-msgid "To export the same events using a POST request use"
-msgstr "Pour exporter les mêmes événements en utilisant une requête POST"
-
-#: View/Events/automation.ctp:156
-msgid "Together with this JSON object in the POST message"
-msgstr "Ensemble avec l'objet JSON a l'intérieur du message POST"
-
-#: View/Events/automation.ctp:158
-msgid "XML is automagically assumed when using the stix export"
-msgstr "Le format XML est automagiquement assumé quand l'export STIX est utilisé"
-
-#: View/Events/automation.ctp:160
-msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
-msgstr "La même recherche peut être effectuée en POSTant l'objet XML suivant (à noter que les esperluettes doivent être échappés, ou alternativement, les identifiants et tags peuvent être utilisés)"
-
-#: View/Events/automation.ctp:163
-msgid "RPZ export"
-msgstr "Export RPZ"
-
-#: View/Events/automation.ctp:164
-msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
-msgstr "> Vous pouvez exporter des fichiers de zone RPZ pour un pare-feu au niveau DNS en utilisation la fonctionnalité d'export RPZ de MISP. Ce fichier va inclure tout les attributs de type domaine, nom d'hôte, ip-src/ip-dest auquel vous avez accès et indiqués à destination d'IPS."
-
-#: View/Events/automation.ctp:165
-msgid "It is possible to further restrict the exported values using the following filters"
-msgstr "Il est possible de restreindre d'avantage les valeurs exportées en utilisant les filtres suivants"
-
-#: View/Events/automation.ctp:167
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
-"        "
-msgstr "Pour inclure un tag dans les résultats, écrivez juste son nom dans ce paramètre. Pour exclure un tag, préfixez le avec un '!'.\n"
-"            Vous pouvez aussi chainer plusieurs commande de tags ensemble avec l'opérateur '&amp;&amp;'. Attention, les \"deux-points\" (:) ne peuvent être utilisé lors de la recherche de tags si ils sont passés via l'Url.        "
-
-#: View/Events/automation.ctp:170
-msgid "Use semicolons instead (the search will automatically search for colons instead)"
-msgstr "Utilisez plutôt les points-virgules (la recherche va automatiquement chercher les deux-points au lieu de cela)"
-
-#: View/Events/automation.ctp:172
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
-msgstr "Événements avec une date définie à une date spérieure à celle spécifiée dans le champ \"from\" (format : 2015-02-15)"
-
-#: View/Events/automation.ctp:173
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
-msgstr "Événements avec une date définie à une date antérieure à celle spécifiée dans le champ (format : 2015-02-03)"
-
-#: View/Events/automation.ctp:176
-msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
-msgstr "MISP va injecter la valeur de l'en-tête dans le fichier de zone tel que défini par l'action effectuée sur chacune des valeurs qui peuvent être imposées. Par défaut, ces valeurs sont des valeurs par défaut définies par l'application, ou celles qui sont imposés par votre administrateur d'instance. Les valeurs sont les suivantes"
-
-#: View/Events/automation.ctp:180
-msgid "To override the above values, either use the url parameters as described below"
-msgstr "Pour substituer les valeurs ci-dessus, utilisez les paramètres d’url comme indiqué ci-dessous"
-
-#: View/Events/automation.ctp:182
-msgid "or POST an XML or JSON object with the above listed options"
-msgstr "ou POSTER un objet JSON ou XML avec les options suivantes"
-
-#: View/Events/automation.ctp:186
-msgid "Text export"
-msgstr "Export texte"
-
-#: View/Events/automation.ctp:187
-msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
-msgstr "> Un export de tout les attributs d'un type spécifique vers un fichier en plain text. Par défaut, seul les événements publiés et tagués comme exportables vers un IDS seront exportés."
-
-#: View/Events/automation.ctp:194
-msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
-msgstr "Pour restreindre les résultats par tags, utilisez la syntaxe suivant. Merci de faire attention, les deux-points (:) ne peuvent être utilisés pour la recherche de tag. Utilisez point-virgule à la place (la recherche va automatiquement rechercher les deux-points à la place). Pour récupérer les valeurs de type ip-src des événements ayant le tag1 mais pas le tag2, utilisez"
-
-#: View/Events/automation.ctp:197
-msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
-msgstr "Depuis la version 2.3.38, il est possible de restreindre les exports de texte sur la base de deux indicateurs supplémentaires. Le premier autorise l'utilisateur à restreindre sur la base de l'ID d'événement, tandis que le seconde est un booléen permettant aux attributs non indiqués en tant qu'IDS d'être exportés. Additionnellement, choisir \"all\" dans le champ type va retourner tout les attributs éligibles."
-
-#: View/Events/automation.ctp:200
+#: View/Events/automation.ctp:28
+#: View/Events/legacy_automation.ctp:200
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'."
 msgstr "Pour inclure un tag dans les résultats, écrivez son nom dans ce paramètre. Pour exclure un tag, préfixez le avec le caractère '!'."
 
-#: View/Events/automation.ctp:201
-msgid "Only export the attributes of the given event ID"
-msgstr "Exporter seulement les attributs pour l'ID renseigné"
+#: View/Events/automation.ctp:29
+#: View/Events/legacy_automation.ctp:278
+msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
+msgstr "Activer ce paramètre (en passant un \"1\" en tant qu'argument) va faire que la recherche ignorera tout autres arguments, excepté la clé d'authentification et la valeur. MISP retournera alors un objet XML/JSON (selon l'en-tête envoyé) de tout les événéments dont un sous-chaîne correspond à la valeur de l'information d'événement, de l'organisation créatrice ou tout autres valeurs d'attributs (value1/value2), ou dans le commentaire d'attribut."
 
-#: View/Events/automation.ctp:202
-msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
-msgstr "Inclure les attributs n'étant pas marqués en \"to_ids\", même si ils devraient normalement être exclus. Se substitue également à la fonctionnalité de liste blanche."
+#: View/Events/automation.ctp:30;151
+#: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
+msgstr "Événements avec la date définie à une date ultérieure à celle spécifiée dans le champ \"to\" (format : 2015-02-15). Ce filtre utilise la date de l’événement."
 
-#: View/Events/automation.ctp:207
-msgid "Include not published Events."
-msgstr "Inclure les événements non publiés."
+#: View/Events/automation.ctp:31;152
+#: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
+msgstr "Événements avec la date définie à une date antérieure à celle spécifiée dans le champ \"to\" (format : 2015-02-15). Ce filtre utilise la date de l’événement."
 
-#: View/Events/automation.ctp:208;275
-msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
-msgstr "Vous pouvez chaîner plusieurs tags ensemble avec l'opérateur '&amp;&amp;'. Attention, les \"deux-points\" (:) ne peuvent être utilisé lors de la recherche de tags.\n"
-"   Utilisez le \"point-virgule\" à la place (la recherche va autormatiquement rechercher les \"deux-points\" à la place). Par exemple, pour inclure le tag1 et le tag2 en excluant le tag3, vous devriez utiliser"
+#: View/Events/automation.ctp:32
+#: View/Events/legacy_automation.ctp:282;307
+msgid "The events that should be included / excluded from the search"
+msgstr "L'événement devrait être inclu / exclu de la recherche"
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:33
+#: View/Events/legacy_automation.ctp:283;308
+msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
+msgstr "Si défini, les pièces jointes/malwares zippés seront encodés en base64 dans le champ donnée a l'intérieur de chaque attribut"
+
+#: View/Events/automation.ctp:34
+#: View/Events/legacy_automation.ctp:284
+msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
+msgstr "Seules les méta-données (événements, tags, relations) sont retournées, les attributs et les propositions sont omises."
+
+#: View/Events/automation.ctp:35
+#: View/Events/legacy_automation.ctp:285;309
+msgid "Restrict the results by uuid."
+msgstr "Restreindre les résultats par uuid."
+
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr "Restreindre les résultats par l'horodatage de la dernière publication de l'événement. L'entrée peut être une description temporelle ou courte (7d ou 24h par exemple). Vous pouvez également passer une liste avec deux valeurs pour définir une plage de temps (par exemple [\"14d\", \"7d\"])."
+
+#: View/Events/automation.ctp:37
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr "(Synonyme obsolète pour publish_timestamp) Limiter les résultats de l’horodatage de la dernière édition de l’événement. L’entrée peut être une timestamp ou une description d’heure abrégée (7D ou 24h par exemple). Vous pouvez également passer une liste avec deux valeurs pour définir une plage de temps (par exemple [« 14d », « 7D »])."
+
+#: View/Events/automation.ctp:38
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr "Restreindre les résultats par l'horodatage (dernière modification). Tout événement avec un timestamp plus récent que le timestamp donné sera retourné. Dans le cas où vous traitez de /attribute comme scope, l'horodatage de l'attribut sera utilisé pour la recherche. L'entrée peut être une description temporelle ou courte durée (7d ou 24h par exemple). Vous pouvez également passer une liste avec deux valeurs pour définir une plage de temps (par exemple [\"14d\", \"7d\"])."
+
+#: View/Events/automation.ctp:39
+#: View/Events/legacy_automation.ctp:288;311
+msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
+msgstr "Définir si les événéments publiés ou non doivent être retournés. Ne définissez pas ce paramètre si vous souhaitez les deux."
+
+#: View/Events/automation.ctp:40
+#: View/Events/legacy_automation.ctp:289;313
+msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
+msgstr "Supprimer tout attribut dont le résultat est présent dans une entrée de liste d'avertissement."
+
+#: View/Events/automation.ctp:41
+#: View/Events/legacy_automation.ctp:314
+msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
+msgstr "Par défaut (0), tout les attributs qui correspondent aux autres paramètres de filtrage sont retournés, sans prise en compte de leur paramètrage \"to_ids\". Pour restreindre les valeurs retournés aux seule paramètres \"to_ids\", mettez ce paramètre à 1. Vous pouvez seuelement utiliser le paramètre exclude pour ne retourner que les attributs ayant le paramètre \"to_ids\" désactivé."
+
+#: View/Events/automation.ctp:42
+#: View/Events/legacy_automation.ctp:315
+msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
+msgstr "Si le paramètre est défini à 1, cela va retourner les attributs mis à la corbeille ainsi que les attributs actifs. En utilisant \"only\" en tant que paramètre, cela va seulement retourner les données mises à la corbeille."
+
+#: View/Events/automation.ctp:43
+#: View/Events/legacy_automation.ctp:316
+msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
+msgstr "Au lieu d'inclure seulement l'ID d'événement, inclure l'UUID d'événement dans chacun des attributs."
+
+#: View/Events/automation.ctp:44
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr "Renvoyer uniquement les attributs des événements qui ont reçu une modification après l'horodatage donné. L'entrée peut être une description temporelle ou courte (7d ou 24h par exemple). Vous pouvez également passer une liste avec deux valeurs pour définir une plage de temps (par exemple [\"14d\", \"7d\"])."
+
+#: View/Events/automation.ctp:45
+msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
+msgstr "Si ce flag est défini, le partage des objets de groupe ne sera pas inclus, seulement l'ID du groupe de partage est défini."
+
+#: View/Events/automation.ctp:46
+msgid "Filter on the event's info field."
+msgstr "Filtrer sur le champ info de l'événement."
+
+#: View/Events/automation.ctp:47
+msgid "Search for a full or a substring (delimited by % for substrings) in the event info, event tags, attribute tags, attribute values or attribute comment fields."
+msgstr "Recherchez une sous-chaîne complète ou une sous-chaîne (délimitée par % pour les sous-chaînes) dans l'événement info, les marqueurs d'événement, les balises d'attributs, les valeurs d'attributs ou les champs de recherche d'attributs."
+
+#: View/Events/automation.ctp:48
+msgid "CSV only, select the fields that you wish to include in the CSV export. By setting event level fields additionally, includeContext is not required to get event metadata."
+msgstr "CSV uniquement, sélectionnez les champs que vous souhaitez inclure dans l'export CSV. En définissant les champs de niveau d'événement, includeContext n'est pas requis pour obtenir les métadonnées de l'événement."
+
+#: View/Events/automation.ctp:49
+msgid "CSV only, add additional event level data to the export. The additional fields can be added via requested_attributes too with more granularity."
+msgstr "CSV seulement, ajoutez des données de niveau d'événement supplémentaires à l'export. Les champs supplémentaires peuvent être ajoutés via requested_attributes aussi avec plus de granularité."
+
+#: View/Events/automation.ctp:79
+msgid "CSV specific parameters for the restSearch APIs"
+msgstr "Paramètres spécifiques CSV pour les API de restSearch"
+
+#: View/Events/automation.ctp:81
+msgid "Limit the list of fields to be returned in the CSV."
+msgstr "Limiter la liste des champs à retourner dans le CSV."
+
+#: View/Events/automation.ctp:82
+msgid "Include the event level meta-data with each attribute."
+msgstr "Inclure les métadonnées au niveau de l'événement avec chaque attribut."
+
+#: View/Events/automation.ctp:83
+msgid "The CSV created when this setting is set to true will not contain the header row."
+msgstr "Le CSV créé lorsque ce paramètre est défini à true ne contiendra pas la ligne d'en-tête."
+
+#: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr "Paramètres URL"
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr "Il est également possible de passer tous les paramètres ci-dessus par l’intermédiaire de paramètres d’URL, mais cela est FORTEMENT déconseillée. Si vous n’avez toutefois aucune autre option, il suffit de passer les paramètres de la façon suivante :"
+
+#: View/Events/automation.ctp:94
+msgid "RPZ specific parameters for the restSearch APIs"
+msgstr "Paramètres spécifiques RPZ pour les API restSearch"
+
+#: View/Events/automation.ctp:95
+#: View/Events/legacy_automation.ctp:164
+msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
+msgstr "> Vous pouvez exporter des fichiers de zone RPZ pour un pare-feu au niveau DNS en utilisation la fonctionnalité d'export RPZ de MISP. Ce fichier va inclure tout les attributs de type domaine, nom d'hôte, ip-src/ip-dest auquel vous avez accès et indiqués à destination d'IPS."
+
+#: View/Events/automation.ctp:98
+#: View/Events/legacy_automation.ctp:176
+msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
+msgstr "MISP va injecter la valeur de l'en-tête dans le fichier de zone tel que défini par l'action effectuée sur chacune des valeurs qui peuvent être imposées. Par défaut, ces valeurs sont des valeurs par défaut définies par l'application, ou celles qui sont imposés par votre administrateur d'instance. Les valeurs sont les suivantes"
+
+#: View/Events/automation.ctp:102
+#: View/Events/legacy_automation.ctp:180
+msgid "To override the above values, either use the url parameters as described below"
+msgstr "Pour substituer les valeurs ci-dessus, utilisez les paramètres d’url comme indiqué ci-dessous"
+
+#: View/Events/automation.ctp:104
+#: View/Events/legacy_automation.ctp:182
+msgid "or POST an XML or JSON object with the above listed options"
+msgstr "ou POSTER un objet JSON ou XML avec les options suivantes"
+
+#: View/Events/automation.ctp:108
+#: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr "Export pour IDS BRO"
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:109
+#: View/Events/legacy_automation.ctp:212
 msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
 msgstr "Un export de tout les attributs pour un type spécifique bro vers un fichier en \"plain text\" formatté. Par défaut, seul les attributs publiés et indiqués pour l'export IDS seront exportés."
 
-#: View/Events/automation.ctp:213
+#: View/Events/automation.ctp:110
+#: View/Events/legacy_automation.ctp:213
 msgid "You can configure your tools to automatically download a file one of the Bro types."
 msgstr "Vous pouvez configurer vos outils afin de télécharger périodiquement un fichier de type Bro."
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:116
+#: View/Events/legacy_automation.ctp:219
 msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
 msgstr "Pour restreindre les résultats par tags, utilisez la syntaxe suivant. Merci de faire attention, les deux-points (:) ne peuvent être utilisés pour la recherche de tag. Utilisez point-virgule à la place (la recherche va automatiquement rechercher les deux-points à la place). Pour récupérer les valeurs d'Ip des événements ayant le tag1 mais pas le tag2, utilisez"
 
-#: View/Events/automation.ctp:222
+#: View/Events/automation.ctp:119
+#: View/Events/legacy_automation.ctp:222
 msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
 msgstr "Il est possible de restreindre les exports bro en se basant sur une série de filtres. POSTer un objet JSON ou XML vers l'API bro pour filtrer les résultats."
 
-#: View/Events/automation.ctp:240
+#: View/Events/automation.ctp:137
+#: View/Events/legacy_automation.ctp:240
 msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
 msgstr "Alternativement, il est également possible de passer les filtres via les paramètres dans l’URL, mais il est vivement conseillé d’utiliser les requêtes POST avec des objets JSON. Le format est décrit ci-dessous"
 
-#: View/Events/automation.ctp:242
+#: View/Events/automation.ctp:139
+#: View/Events/legacy_automation.ctp:242
 msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
 msgstr "Le type Bro, tout type Bro valide est accepté. Le mappage entre les types Bro et MISP est comme suit"
 
-#: View/Events/automation.ctp:249;301
+#: View/Events/automation.ctp:146
+#: View/Events/legacy_automation.ctp:249;301
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
 "    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
 "    Use semicolons instead (the search will automatically search for colons instead)."
@@ -5934,147 +6326,48 @@ msgstr "Pour inclure un tag dans les résultats, écrivez juste son nom dans ce
 "   Vous pouvez aussi chaîner plusieurs tags ensemble avec l'opérateur '&amp;&amp;'. Soyez attentif au fait que les \"deux-points\" ne peuvent être utilisés pour la recherche de tags.\n"
 "Utilisez à la place le \"point-virgule\" (la recherche recherchera les deux-points à la place)."
 
-#: View/Events/automation.ctp:252
+#: View/Events/automation.ctp:149
+#: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr "Restreindre les résultats à l'ID d'événement indiqué."
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:150
+#: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr "Autoriser les attributs n'étant pas marqués en \"to_ids\"à être exportés."
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr "Les événements publiés dans les derniers x temps, ou x peut être défini en jours, heures, minutes (par exemple 5d ou 12h ou 30m). Ce filtre va utiliser l'horodatage de publication de l'événément."
+
+#: View/Events/automation.ctp:154
+#: View/Events/legacy_automation.ctp:95;120;174;206;257
+msgid "All attributes that have a hit on a warninglist will be excluded."
+msgstr "Tout les attributs qui sont dans une liste d'avertissement seront exclus."
+
+#: View/Events/automation.ctp:156
+#: View/Events/legacy_automation.ctp:41;70;97;122;259;290
+msgid "The keywords false or null should be used for optional empty parameters in the URL."
+msgstr "Les mots-clés \"false\" ou \"null\" devraient être utilisé pour les paramètres vides optionnels dans l'URL."
+
+#: View/Events/automation.ctp:157
+#: View/Events/legacy_automation.ctp:260
 msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
 msgstr "Par exemple; pour récupérer tout les attributs de l'événement #5, en incluant tout ceux n'étant pas marqués pour un export IDS, utilisez la ligne suivante"
 
-#: View/Events/automation.ctp:263
-msgid "Searches with JSON/XML/OpenIOC results"
-msgstr "Rechercher avec les résultats JSON/XML/OpenIOC"
-
-#: View/Events/automation.ctp:264
-msgid "It is possible to search the database for attributes based on a list of criteria."
-msgstr "Il est possible de rechercher dans la base de données en se basant sur une liste de cirtères."
-
-#: View/Events/automation.ctp:265
-msgid "To return an event or a list of events in a desired format, use the following syntax"
-msgstr "Pour retourner un événement ou une liste d'événement dans le format désiré, utilisez la syntaxe suivante"
-
-#: View/Events/automation.ctp:267
-msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
-msgstr "Définir le format pour les résultats de la recerche (Actuellement supportés: json, xml, openioc -plus de formats à venir)."
-
-#: View/Events/automation.ctp:268;297
-msgid "Search for the given value in the attributes' value field."
-msgstr "Recherche pour les valeurs indiquées dans les valeurs des champs d'attributs."
-
-#: View/Events/automation.ctp:271;300
-msgid "Search by the creator organisation by supplying the organisation identifier."
-msgstr "Recherche par l’organisation créatrice en fournissant l’identifiant de l’organisation."
-
-#: View/Events/automation.ctp:272
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
-msgstr "Pour inclure un tag dans les résultats, écrivez juste son nom dans ce paramètre. Pour exclure un tag, préfixez le avec '!'.\n"
-"Pour filtrer sur plusieurs valeurs pour le même paramètre, utilisez un tableau, tel que l'exemple suivant"
-
-#: View/Events/automation.ctp:278
-msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
-msgstr "Activer ce paramètre (en passant un \"1\" en tant qu'argument) va faire que la recherche ignorera tout autres arguments, excepté la clé d'authentification et la valeur. MISP retournera alors un objet XML/JSON (selon l'en-tête envoyé) de tout les événéments dont un sous-chaîne correspond à la valeur de l'information d'événement, de l'organisation créatrice ou tout autres valeurs d'attributs (value1/value2), ou dans le commentaire d'attribut."
-
-#: View/Events/automation.ctp:282;307
-msgid "The events that should be included / excluded from the search"
-msgstr "L'événement devrait être inclu / exclu de la recherche"
-
-#: View/Events/automation.ctp:283;308
-msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
-msgstr "Si défini, les pièces jointes/malwares zippés seront encodés en base64 dans le champ donnée a l'intérieur de chaque attribut"
-
-#: View/Events/automation.ctp:284
-msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
-msgstr "Seules les méta-données (événements, tags, relations) sont retournées, les attributs et les propositions sont omises."
-
-#: View/Events/automation.ctp:285;309
-msgid "Restrict the results by uuid."
-msgstr "Restreindre les résultats par uuid."
-
-#: View/Events/automation.ctp:286;310
-msgid "Restrict the results by the last publish timestamp (newer than)."
-msgstr "Restreindre les résultats pour le dernier timestamp publié (le plus jeune)."
-
-#: View/Events/automation.ctp:287
-msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
-msgstr "Restreindre les résultats par l'horodatage (dernière édition). Tout événement avec un horodatage plus récent que celui indiqué va être retourné. Dans le cas ou vous recontrer un /attributes dans le périmètre, l'horodatage de l'attribut sera utilisé pour la table."
-
-#: View/Events/automation.ctp:288;311
-msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
-msgstr "Définir si les événéments publiés ou non doivent être retournés. Ne définissez pas ce paramètre si vous souhaitez les deux."
-
-#: View/Events/automation.ctp:289;313
-msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
-msgstr "Supprimer tout attribut dont le résultat est présent dans une entrée de liste d'avertissement."
-
-#: View/Events/automation.ctp:291
-msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
-msgstr "Par exemple, pour trouver tout événement ayant le terme \"red october\" mentionné, utilisez la syntaxe suivante (l'exemple indiqué nécessite une requête POST à la place d'un GET, ce qui est fortement recommandé. Les requêtes GET sont problématiques et fortement déconseillées)."
-
-#: View/Events/automation.ctp:294;320;349
-msgid "POST message payload (json)"
-msgstr "POSTer les données utiles (json)"
-
-#: View/Events/automation.ctp:296
-msgid "To just return a list of attributes, use the following syntax"
-msgstr "Pour ne retourner qu'une liste d'attributs, utiliser la syntaxe suivante"
-
-#: View/Events/automation.ctp:304
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
-msgstr "Événements avec une date définie à une date supérieure à celle spécifiée dans le champ \"from\" (format : 2015-02-15)"
-
-#: View/Events/automation.ctp:305
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
-msgstr "Événements avec une date définie à une date antérieure à celle spécifiée dans le champ \"to\" (format : 2015-02-15)"
-
-#: View/Events/automation.ctp:312
-msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
-msgstr "Restreindre les résultats par horodatage (de l'attribut). Tout les attributs avec un horodatage plus récent que l'horodatage indiqué seront retournés."
-
-#: View/Events/automation.ctp:314
-msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
-msgstr "Par défaut (0), tout les attributs qui correspondent aux autres paramètres de filtrage sont retournés, sans prise en compte de leur paramètrage \"to_ids\". Pour restreindre les valeurs retournés aux seule paramètres \"to_ids\", mettez ce paramètre à 1. Vous pouvez seuelement utiliser le paramètre exclude pour ne retourner que les attributs ayant le paramètre \"to_ids\" désactivé."
-
-#: View/Events/automation.ctp:315
-msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
-msgstr "Si le paramètre est défini à 1, cela va retourner les attributs mis à la corbeille ainsi que les attributs actifs. En utilisant \"only\" en tant que paramètre, cela va seulement retourner les données mises à la corbeille."
-
-#: View/Events/automation.ctp:316
-msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
-msgstr "Au lieu d'inclure seulement l'ID d'événement, inclure l'UUID d'événement dans chacun des attributs."
-
-#: View/Events/automation.ctp:317
-msgid "Only return attributes from events that have received a modification after the given timestamp."
-msgstr "Ne retourner que les attributs provenant d'événements ayant reçu une modification après l'horodatage indiqué."
-
-#: View/Events/automation.ctp:322
-msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
-msgstr "Les mot-clés \"false\" ou \"null\" doivent être utilisés pour les paramètre optionnels vides dans l'URL.. Gardez à l'esprit qu'il n'est nécessaire de le faire que dans le cas d'usage déprécié de passage des paramètres dans l'URL."
-
-#: View/Events/automation.ctp:324
-msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
-"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
-msgstr "valeur, type, catégorie et organisation sont optionnels. Il est possible de rechercher plusieurs termes dans chaque catégorie en les joignant avec l'opérateur '&amp;&amp;' . Il est aussi possible de les rendre négatif avec l'opérateur '!'. Attention l'opérateur deux-points ':' ne peut pas être utilisé pour la recherche de tags. Utilisez l'opérateur point-virgule ';' à la place (cela recherchera automatique ':' à la place).\n"
-"   Par exemple, pour chercher tout les attributs créés par votre organisation qui contiennent 192.168 ou 127.0 mais pas 0.1 et qui ont pour type src-ip, tout en excluant les événements qui sont tagués avec tag1, utilisez la syntaxe suivante"
-
-#: View/Events/automation.ctp:327
-msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
-msgstr "Vous pouvez aussi utiliser la rechercher d'IP en utilisant des CIDR. Assurez vous d'utiliser le pipe '|' à la place du slash '|'. Les \"deux-points\" ne peuvent être utilisé pour la recherche de tag. Utilisez le \"point-virgule\" à la place (la recherche va automatiquement remplacer par des \"deux-points\" à la place). Voir ci-dessous pour l'exemple"
-
-#: View/Events/automation.ctp:329
+#: View/Events/automation.ctp:160
+#: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr "Exporter les attributs de l'événement avec un type spécifique en XML"
 
-#: View/Events/automation.ctp:330
+#: View/Events/automation.ctp:161
+#: View/Events/legacy_automation.ctp:330
 msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
 msgstr "Si vous souhaitez exporter tous les attributs d’un type prédéfini et appartiennant à un événement, utilisez la syntaxe suivante"
 
-#: View/Events/automation.ctp:332
+#: View/Events/automation.ctp:163
+#: View/Events/legacy_automation.ctp:332
 msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
 "    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
 "    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
@@ -6082,275 +6375,365 @@ msgstr "sigOnly est un indicateur optionnel qui va bloquer l'exportation de l'en
 "   Il est possible de rechercher plusieurs types avec l'opérateur '&amp;&amp;' et d'exclure les valeurs avec l'opérateur '!'.\n"
 "   Par exemple, pour récupérer toutes les signatures IDS ayant des attributs de type md5 et sha256 mais pas filename|md5 et filename|sha256 de l'événement 25, utilisez la syntaxe suivante"
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:168
+#: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr "Télécharger une pièce jointe ou un extrait de malware"
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:169
+#: View/Events/legacy_automation.ctp:338
 msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
 msgstr "Si vous connaissez l'ID d'attribut d'un fichier de malware ou d'une pièce jointes, vous pouvez la télécharger en utilisant la syntaxe suivante"
 
-#: View/Events/automation.ctp:340
+#: View/Events/automation.ctp:171
+#: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr "Télécharger un fichier malveillant par hash"
 
-#: View/Events/automation.ctp:341
+#: View/Events/automation.ctp:172
+#: View/Events/legacy_automation.ctp:341
 msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
 msgstr "Vous pouvez également télécharger tout les fichiers dont le hash MD5 est connu. Passez simplement le hash dans l'objet JSON/XML ou dans l'URL (l'URL passant en priorité sur les objets passés) pour recevoir un objet JSON/XML en retour avec un fichier zippé encodé en base 64 contenant en plus des informations contextuelles."
 
-#: View/Events/automation.ctp:342
+#: View/Events/automation.ctp:173
+#: View/Events/legacy_automation.ctp:342
 msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
 msgstr "Vous pouvez également utiliser cette API pour récupérer tout les fichiers qui contiennent le hash renseigné. Pour cette fonctionnalité, passez juste l'indicateur \"allSamples\". Notez que si vous récupérez tout les fichiers d'événements correspondants, vous pouvez utiliser tout les types de hashs (%s) pour la table.</p>"
 
-#: View/Events/automation.ctp:343
+#: View/Events/automation.ctp:174
+#: View/Events/legacy_automation.ctp:343
 msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
 msgstr "Vous pouvez également récupérer tout les pièces jointes pour un événement ayant un ID d'événement donné en le passant via le paramètre eventID. Assurez vous que l'event ID ou un hash est transmis, sinon un message d'erreur sera retourné. Aussi, si aucun hash n'est renseigné, l'indicateur \"allSamples\" sera défini automatiquement."
 
-#: View/Events/automation.ctp:345
+#: View/Events/automation.ctp:176
+#: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr "POSTer les données utiles (XML)"
 
-#: View/Events/automation.ctp:353
+#: View/Events/automation.ctp:180
+#: View/Events/legacy_automation.ctp:294;320;349
+msgid "POST message payload (json)"
+msgstr "POSTer les données utiles (json)"
+
+#: View/Events/automation.ctp:184
+#: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr "Une rapide description de l'ensemble des paramètres de l'objet transmis"
 
-#: View/Events/automation.ctp:354
+#: View/Events/automation.ctp:185
+#: View/Events/legacy_automation.ctp:354
 msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
 msgstr "Un hash au format MD5. Si le flag \"allSamples\" est défini, cela peut être un de ceux qui suivent: %s"
 
-#: View/Events/automation.ctp:355
+#: View/Events/automation.ctp:186
+#: View/Events/legacy_automation.ctp:355
 msgid "If set, it will return all samples from events that have a match for the hash provided above."
 msgstr "Si activé, cela retournera l'ensemble des fichiers provenant des événements dont le hash correspond à celui fourni."
 
-#: View/Events/automation.ctp:356
+#: View/Events/automation.ctp:187
+#: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr "Si défini, seules les données de l'ID d'événement indiqué seront extraites."
 
-#: View/Events/automation.ctp:357
+#: View/Events/automation.ctp:188
+#: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr "Téléverser des fichiers malveillant en utilisant l'API \"Téléversion de fichier malveillants\""
 
-#: View/Events/automation.ctp:359
+#: View/Events/automation.ctp:190
+#: View/Events/legacy_automation.ctp:359
 msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
 msgstr "L'API va vous permettre de remplir l'événement dont vous avez modifié les droits avec un fichier malveillant (et les hashs qui lui sont relatifs). Alternativement, si vous ne renseignez pas d'Event ID, elle va créer un nouvel événement pour vous."
 
-#: View/Events/automation.ctp:360
+#: View/Events/automation.ctp:191
+#: View/Events/legacy_automation.ctp:360
 msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
 msgstr "Le fichier doit être encodé en base64 et POSTé comme expliqué ci-dessous. Tout les fichiers malveillant doivent être zippés et protégés par un mot de passe (le mot de passe devant être \"infecté\"). Les hashs du fichier original vont êtres indiqués en tant qu'attributs additionnels."
 
-#: View/Events/automation.ctp:361
+#: View/Events/automation.ctp:192
+#: View/Events/legacy_automation.ctp:361
 msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
 msgstr "L'ID d'événement est optionnel. MISP va accepter un objet JSON ou XML posté à la suite de l'URL."
 
-#: View/Events/automation.ctp:362
+#: View/Events/automation.ctp:193
+#: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr "La structure générale de l'objet est telle que décrite ici"
 
-#: View/Events/automation.ctp:371
+#: View/Events/automation.ctp:202
+#: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr "Les paramètres optionnels suivants sont attendus"
 
-#: View/Events/automation.ctp:372
+#: View/Events/automation.ctp:203
+#: View/Events/legacy_automation.ctp:372
 msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
 msgstr "L'ID d'événement est optionnel. Il peut être transmis directement via l'URL ou un objet tranmis mais l'URL à la priorité si les deux sont renseignés. Si aucun ID d'événement n'est renseigné, MISP va créer un nouvel événement pour chaque fichier malveillant POSTé. Vous pouvez définir le paramétrage par défaut de l'événement, dans ce cas, un ensemble de paramètres par défaut seront utilisés."
 
-#: View/Events/automation.ctp:373
+#: View/Events/automation.ctp:204
+#: View/Events/legacy_automation.ctp:373
 msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
 msgstr "Le paramètre de distribution utilisé pour les attributs et pour les événements nouvellement créés, si pertinent. [0-3]"
 
-#: View/Events/automation.ctp:374
+#: View/Events/automation.ctp:205
+#: View/Events/legacy_automation.ctp:374
 msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
 msgstr "Vous pouvez marquer tout les attributs créés durant l'opération pour qu'ils soit marqués en tant que \"to_ids\" ou non."
 
-#: View/Events/automation.ctp:375
+#: View/Events/automation.ctp:206
+#: View/Events/legacy_automation.ctp:375
 msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 msgstr "La catégorie qui va être associée aux fichiers transmis. Les options valides sont: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 
-#: View/Events/automation.ctp:376
+#: View/Events/automation.ctp:207
+#: View/Events/legacy_automation.ctp:376
 msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
 msgstr "Utilisé pour remplir le champ information d'événements si aucun ID d'événement n'est indiqué. Alernativement, si non défini, MISP va simplement générer un message montrant qu'il s'agit d'une base d'échantillons de fichiers malveillants générés du jour."
 
-#: View/Events/automation.ctp:377
+#: View/Events/automation.ctp:208
+#: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr "Le niveau d'analyse pour le nouvel événement créer, si possible. [0-2]"
 
-#: View/Events/automation.ctp:378
+#: View/Events/automation.ctp:209
+#: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr "L'ID du niveau de menace de l'événement nouvellement créer, si possible [0-3]"
 
-#: View/Events/automation.ctp:379
+#: View/Events/automation.ctp:210
+#: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr "Ceci remplira le champ commentaire de n’importe quel attribut créé à l’aide de l'API."
 
-#: View/Events/automation.ctp:380
+#: View/Events/automation.ctp:211
+#: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr "Ajouter ou supprimer des tags des événements"
 
-#: View/Events/automation.ctp:381
+#: View/Events/automation.ctp:212
+#: View/Events/legacy_automation.ctp:381
 msgid "You can add or remove an existing tag from an event in the following way"
 msgstr "Vous pouvez ajouter ou supprimer un tag existant depuis un événement de la manièe suivante"
 
-#: View/Events/automation.ctp:384
+#: View/Events/automation.ctp:215
+#: View/Events/legacy_automation.ctp:384
 msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
 msgstr "POSTez un objet json dans le format suivant (pour l'API appropriée, cela dépend de ce si vous souhaitez ajouter ou supprimer un tag depuis un événement)"
 
-#: View/Events/automation.ctp:386
+#: View/Events/automation.ctp:217
+#: View/Events/legacy_automation.ctp:386
 msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
 msgstr "Quand « tag » est l’ID de la balise. Vous pouvez également utiliser le nom de la balise de la manière suivante"
 
-#: View/Events/automation.ctp:388
+#: View/Events/automation.ctp:219
+#: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr "Propositions et l’API"
 
-#: View/Events/automation.ctp:389
+#: View/Events/automation.ctp:220
+#: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr "Vous pouvez interagir avec les propositions directement via l’API depuis la version 2.3.148"
 
-#: View/Events/automation.ctp:393
+#: View/Events/automation.ctp:224
+#: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr "HTTP"
 
-#: View/Events/automation.ctp:394
+#: View/Events/automation.ctp:225
+#: View/Events/legacy_automation.ctp:394
 #: View/Pages/doc/using_the_system.ctp:445
-#: View/SharingGroups/add.ctp:52
-#: View/SharingGroups/edit.ctp:60
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
 msgid "URL"
 msgstr "URL"
 
-#: View/Events/automation.ctp:395
+#: View/Events/automation.ctp:226
+#: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr "Explication"
 
-#: View/Events/automation.ctp:396
+#: View/Events/automation.ctp:227
+#: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr "Charge attendue"
 
-#: View/Events/automation.ctp:397
-#: View/Servers/rest.ctp:53
+#: View/Events/automation.ctp:228
+#: View/Events/legacy_automation.ctp:397
+#: View/Servers/rest.ctp:115
 msgid "Response"
 msgstr "Réponse"
 
-#: View/Events/automation.ctp:402
+#: View/Events/automation.ctp:233
+#: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr "Voir une proposition"
 
-#: View/Events/automation.ctp:404;424;425;431;432
+#: View/Events/automation.ctp:235;255;256;262;263
+#: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr "Objet ShadowAttribute"
 
-#: View/Events/automation.ctp:409
+#: View/Events/automation.ctp:240
+#: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr "Voir toutes les propositions des événements de mon organisation"
 
-#: View/Events/automation.ctp:411;418
+#: View/Events/automation.ctp:242;249
+#: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr "Objets ShadowAttribute"
 
-#: View/Events/automation.ctp:416
+#: View/Events/automation.ctp:247
+#: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr "Voir toutes les propositions d'un événement"
 
-#: View/Events/automation.ctp:423
+#: View/Events/automation.ctp:254
+#: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr "Proposer un nouvel attribut pour un événement"
 
-#: View/Events/automation.ctp:430
+#: View/Events/automation.ctp:261
+#: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr "Proposer la modification d'un attribut"
 
-#: View/Events/automation.ctp:437
+#: View/Events/automation.ctp:268
+#: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr "Accepter la proposition"
 
-#: View/Events/automation.ctp:439;446
+#: View/Events/automation.ctp:270;277
+#: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
 #: View/Pages/doc/using_the_system.ctp:254
 msgid "Message"
 msgstr "Message"
 
-#: View/Events/automation.ctp:444
+#: View/Events/automation.ctp:275
+#: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr "Ignorer une proposition"
 
-#: View/Events/automation.ctp:449
+#: View/Events/automation.ctp:280
+#: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr "Lorsque vous postez un attribut caché, utilisez les formats suivants"
 
-#: View/Events/automation.ctp:454
+#: View/Events/automation.ctp:285
+#: View/Events/legacy_automation.ctp:454
 msgid "None of the above fields are mandatory, but at least one of them has to be provided."
 msgstr "Aucun des champs ci-dessus sont obligatoires, mais au moins un d'entre eux doit être fourni."
 
-#: View/Events/automation.ctp:456
+#: View/Events/automation.ctp:287
+#: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr "Filtrer les méta-données de l'événement"
 
-#: View/Events/automation.ctp:457
+#: View/Events/automation.ctp:288
+#: View/Events/legacy_automation.ctp:457
 msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
 msgstr "Tel que décrit dans la partie REST, il est possible de retourner une liste d'événement en incluant leurs méta-données en envoyant une requête GET à l'url d'API /events. Cependant, cet API en particulier est un peu plus souple. Vous pouvez passer les paramètres de recherche sur de multiple champs et récupérer une liste d'événements correspondants (avec leur méta-données). Utilisez l'URL suivante"
 
-#: View/Events/automation.ctp:461
+#: View/Events/automation.ctp:292
+#: View/Events/legacy_automation.ctp:461
 msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
 "    An example for a valid lookup"
 msgstr "POSTez un objet JSON avec les champs de tables voulus et les valeurs à recevoir dans un JSON en retour.<br/>\n"
 "    Une exemple pour une table valide"
 
-#: View/Events/automation.ctp:472
+#: View/Events/automation.ctp:303
+#: View/Events/legacy_automation.ctp:472
 msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
 msgstr "Ce qui précède retourne tout événement publié, non restreint à votre organisation qui à le terme \"Locky\" en description d'événement. Vos pouvez utiliser un point d'exclamation pour exclure la valeur lorsque c'est approprié."
 
-#: View/Events/automation.ctp:473
+#: View/Events/automation.ctp:304
+#: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr "La liste des paramètres valides"
 
-#: View/Events/automation.ctp:474
+#: View/Events/automation.ctp:305
+#: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr "Filtrer sur les événéments publiés ou non publiés [0,1] - négatif"
 
-#: View/Events/automation.ctp:475
+#: View/Events/automation.ctp:306
+#: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr "Filtrer sur les chaînes de caractères trouvés dans les information de l'événement - négatif"
 
-#: View/Events/automation.ctp:476
+#: View/Events/automation.ctp:307
+#: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr "Filtres sur les tags associés - négatif"
 
-#: View/Events/automation.ctp:477
+#: View/Events/automation.ctp:308
+#: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr "Filtres sur des IDs d'événements spécifiques - négatif"
 
-#: View/Events/automation.ctp:478
+#: View/Events/automation.ctp:309
+#: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr "Filtre sur le niveau de menace d'un événement [1,2,3,4] - négatif"
 
-#: View/Events/automation.ctp:479
+#: View/Events/automation.ctp:310
+#: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr "Filtre sur le niveau de distribution [0,1,2,3] - négatif"
 
-#: View/Events/automation.ctp:480
+#: View/Events/automation.ctp:311
+#: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr "Filtres sur la phase d’analyse donnée de l’événement [0,1,2] - négatif"
 
-#: View/Events/automation.ctp:481
+#: View/Events/automation.ctp:312
+#: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr "Filtrer sur la valeur d'un attribut - négatif"
 
-#: View/Events/automation.ctp:482
+#: View/Events/automation.ctp:313
+#: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr "Filtrer sur l'organisation d'origine - négatif"
 
-#: View/Events/automation.ctp:483
+#: View/Events/automation.ctp:314
+#: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr "Filtres sur le mail de l'utilisateur ayant créer (administrateur uniquement) - négativable"
 
-#: View/Events/automation.ctp:484
+#: View/Events/automation.ctp:315
+#: View/Events/legacy_automation.ctp:484
 msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr "Filtres sur la date, tout ce qui est plus récent que la date indiquée au format YYYY-MM-DD - négatif"
 
-#: View/Events/automation.ctp:485
+#: View/Events/automation.ctp:316
+#: View/Events/legacy_automation.ctp:485
 msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr "Filtres sur la date, tout ce qui est plus ancien que la date indiquée au format YYYY-MM-DD - négatif"
 
+#: View/Events/automation.ctp:319
+msgid "Freetext Import API"
+msgstr "API d'importation de texte libre"
+
+#: View/Events/automation.ctp:321
+msgid "The freetext import tool is also exposed to the API."
+msgstr "L'outil d'importation freetext est également exposé à l'API."
+
+#: View/Events/automation.ctp:322
+msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
+msgstr "Posez simplement le contenu à analyser et créez directement des attributs à partir d'eux ou retournez simplement les résultats d'analyse."
+
+#: View/Events/automation.ctp:323
+msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
+msgstr "Utilisez les paramètres boolean (0/1) adhere_to_warninglists et return_meta_attributes paramètres d'url pour filtrer les valeurs trébuchant à travers une liste d'avertissements et pour décider si les attributs analysés seront sauvegardés ou simplement retourner en tant que méta attributs."
+
+#: View/Events/automation.ctp:324
+msgid "The contents of the POST body should be the text to be parsed."
+msgstr "Le contenu du corps POST doit être le texte à analyser."
+
 #: View/Events/contact.ctp:8
 msgid "Contact organization reporting event "
 msgstr "Contacter l'organisation ayant diffusé l'événement "
@@ -6548,7 +6931,7 @@ msgid "Ongoing"
 msgstr "En cours"
 
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:9;101
+#: View/Jobs/index.ctp:9;136
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr "Complète"
@@ -6572,7 +6955,7 @@ msgid "All communities"
 msgstr "Toutes les communautés"
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:53
+#: View/Feeds/index.ctp:103
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr "Cible"
@@ -6624,48 +7007,388 @@ msgstr "Fichier entrant"
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/Organisations/view.ctp:97;98
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:33
 msgid "Events"
 msgstr "Évènements"
 
-#: View/Events/index.ctp:30
-msgid "Filter events"
-msgstr "Filtrer les événements"
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
+msgstr "Modifier filtres"
 
-#: View/Events/index.ctp:31
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr "Supprimer les événements sélectionnés"
 
-#: View/Events/index.ctp:44
-msgid "Quickfilter"
-msgstr "Filtre rapide"
+#: View/Events/index.ctp:73
+msgid "My events only"
+msgstr "Mes événements seulement"
 
-#: View/Events/index.ctp:44
-#: View/Organisations/index.ctp:59
-#: View/Servers/preview_index.ctp:45
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr "Mes événements"
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr "Les événements de mon organisation seulement"
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr "Événements de l'organisation"
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
 msgid "Filter"
 msgstr "Filtre"
 
-#: View/Events/index.ctp:58
-msgid "My events only"
-msgstr "Mes événements seulement"
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
+msgstr "Entrez la valeur à rechercher"
 
-#: View/Events/index.ctp:58
-msgid "My Events"
-msgstr "Mes événements"
+#: View/Events/legacy_automation.ctp:3
+msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
+"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgstr "La fonctionnalité d'automation est faite pour générer automatiquement des signature pour des systèmes de détection d'intrusion. Pour activer la génération de signature pour un attribut ou un champ signature spécifique, cet attribut doit être défini en \"yes\".\n"
+"    Il est à noter que l'ensemble des types d'attributs n'est pas forcément utilisable pour la génération de signatures. Actuellement, la génération de signature NIDS est possible pour les types IP, noms de domaine, nom de machine, user agent etc., et la liste de hash pour les type MD5 et SHA1 d'artéfacts. Le support de plus de types d'attributs est planifié.\n"
+"    Pour rendre cette fonctionnalité disponible à des outils d'automation, une clé d'authentification est requise. Cela permet de faciliter l'accès de vos outils aux données sans passer par l'authentification par formulaire."
 
-#: View/Events/index.ctp:72
-msgid "My organisation's events only"
-msgstr "Les événements de mon organisation seulement"
+#: View/Events/legacy_automation.ctp:6
+msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgstr "Soyez sûr de garder cette clé secrète car elle donne un accès complet à la base de donnée !"
 
-#: View/Events/index.ctp:72
-msgid "Org Events"
-msgstr "Événements de l'organisation"
+#: View/Events/legacy_automation.ctp:10
+msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
+msgstr "Depuis la version 2.2, l'usage de la clé d'authentification dans l'URL est déprecié. A la place, passez la clé d'authentification dans l'en-tête \"Authorization\" de la requête. Cette option historique est toujours supportée mais non recommandée."
+
+#: View/Events/legacy_automation.ctp:11
+msgid "Please use the use the following header"
+msgstr "Merci d'utiliser l'en-tête suivant"
+
+#: View/Events/legacy_automation.ctp:12
+msgid "Authorization"
+msgstr "Autorisation"
+
+#: View/Events/legacy_automation.ctp:13
+msgid "XML Export"
+msgstr "Export XML"
+
+#: View/Events/legacy_automation.ctp:14
+msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+msgstr "Un export automatique de tout les attributs et événements <small>(excepté les pièces jointes)</small> est disponible dans un format XML personnalisable."
+
+#: View/Events/legacy_automation.ctp:15;47;76
+msgid "You can configure your tools to automatically download the following file"
+msgstr "Vous pouvez configurer vos outils pour télécharger automatiquement le fichier suivant"
+
+#: View/Events/legacy_automation.ctp:17
+msgid "If you only want to fetch a specific event append the eventid number"
+msgstr "Si vous souhaitez seulement récupérer un événement spécifique, ajoutez le numéro d'événement"
+
+#: View/Events/legacy_automation.ctp:19;144
+msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+msgstr "Vous pouvez envoyer un objet XML ou JSON contenant des paramètres au format suivant"
+
+#: View/Events/legacy_automation.ctp:26
+msgid "The xml download also accepts two additional the following optional parameters in the URL"
+msgstr "Le téléchargement de fichier accepte aussi deux autres paramètres optionnels à la suite dans l'URL"
+
+#: View/Events/legacy_automation.ctp:29;52;85
+msgid "Restrict the download to a single event"
+msgstr "Restreindre le téléchargement à un seul événement"
+
+#: View/Events/legacy_automation.ctp:30
+msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+msgstr "Une valeur booléenne déterminant si les pièces jointes doivent être encodées et un second paramètre qui contrôle les tags éligibles."
+
+#: View/Events/legacy_automation.ctp:31;54;87;112;134
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr "Pour inclure un tags dans les résultats, il suffit seulement d'écrire son nom dans ce paramètre. Pour exclure un tag, préfixez le avec un '!'.\n"
+"   Vous pouvez aussi chaîner plusieurs tag ensemble avec l'opérateur '&amp;&amp;'. Merci de faire attention à ne pas utiliser de \"deux-points\" (:) pour la recherche de tags.\n"
+"   Utilisez le \"point-virgule\" à la place (la recherche recherchera automatiquement les \"deux-points\" à la place). Par exemple, pour inclure tag1 et tag2 mais exclure tag3, vous pouvez utiliser"
+
+#: View/Events/legacy_automation.ctp:43
+msgid "Also check out the %s to read about the REST API."
+msgstr "Merci de vérifier le %s à lire à propos de l'API REST."
+
+#: View/Events/legacy_automation.ctp:45
+msgid "CSV Export"
+msgstr "Export CSV"
+
+#: View/Events/legacy_automation.ctp:46
+msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
+msgstr "Un export automatique des attributs est disponible en CSV. Seuls les attributs flagués \"to_ids\" seront exportés."
+
+#: View/Events/legacy_automation.ctp:49
+msgid "You can specify additional flags for CSV exports as follows"
+msgstr "Vous pouvez spécifier des indicateurs supplémentaires pour l’exportation CSV comme suit"
+
+#: View/Events/legacy_automation.ctp:53
+msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
+msgstr "Placer cet indicateur sur \"true\" incluera des attributs qui ne sont pas marqué en \"to_ids\"."
+
+#: View/Events/legacy_automation.ctp:58
+msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
+msgstr "Par exemple, pour seulement télécharger un csv généré avec tout les événénements ayant des attributs de type \"domain\" et la catégorie \"Network Activity\" excepté pour un ou plusieurs en restreignant à ceux ayant le \"tag1\" et \"tag2\" mais pas \"tag3\", pour les attributs qui sont destinés à l'IDS, utilisez la syntaxe suivante"
+
+#: View/Events/legacy_automation.ctp:63
+msgid "Include the event data with each attribute."
+msgstr "Inclure les données de l'événement avec chaque attribut."
+
+#: View/Events/legacy_automation.ctp:66
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+msgstr "Les événements publiés dans les dernières x période temporelle, ou x peut être défini en jours, heures, minutes (par exemple 5d ou 12h ou 30m). Ce filtre va utiliser l'horodatage de publication de l'événément."
+
+#: View/Events/legacy_automation.ctp:67
+msgid "The CSV created when this setting is set to true will not contain the header row.\n"
+"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
+msgstr "Les CSV créés lorsque ce paramètre est défini sur \"true\" ne contiendront plus la ligne d'en-têtes. \n"
+"<b>enforceWarninglist</b>: Tout les attributs correspondant à une entrée de liste d'avertissement seront exclus."
+
+#: View/Events/legacy_automation.ctp:71
+msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
+msgstr "Pour exporter les attributs de l'ensemble des événements qui sont de type \"domain\", utilisez la syntaxe suivante"
+
+#: View/Events/legacy_automation.ctp:74
+msgid "NIDS rules export"
+msgstr "Export de règles NIDS"
+
+#: View/Events/legacy_automation.ctp:75
+msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr "L'export automatique de l'ensemble des attributs relatifs au réseau est disponible depuis le format de règles Snort. Seuls les événéments publiés et les attributs marqués en tant que <em>Signature IDS</em> sont exportés."
+
+#: View/Events/legacy_automation.ctp:81
+msgid "The full API syntax is as follows"
+msgstr "La syntaxe complète de l'API est la suivante"
+
+#: View/Events/legacy_automation.ctp:84
+msgid "The export format, can be \"suricata\" or \"snort\""
+msgstr "Le format d'export, peut être \"suricata\" ou \"snort\""
+
+#: View/Events/legacy_automation.ctp:86
+msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
+msgstr "Quelques commentaires en dehors de l'explication du cadre des données. La raison pour désactiver cela serait si vous souhaitez concaténer une liste d'export pour une sélection d'événements variés dans l'ordre pour éviter la duplication non nécessaire des commentaires."
+
+#: View/Events/legacy_automation.ctp:93
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr "Les événements publiés dans les derniers x temps, ou x peut être défini en jours, heures, minutes (par exemple 6d ou 12h ou 30m). Ce filtre va utiliser l'horodatage de publication de l'événément."
+
+#: View/Events/legacy_automation.ctp:94
+msgid "Restrict the export to only use the given types."
+msgstr "Limiter l’exportation pour seulement certains types."
+
+#: View/Events/legacy_automation.ctp:96
+msgid "All tags will be included even if not exportable."
+msgstr "Tout les tags seront inclus sauf si ils ne sont pas exportables."
+
+#: View/Events/legacy_automation.ctp:98
+msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
+msgstr "Un exemple d'un export Suricata de tout les événéments excluant ceux taggués \"tag1\", sans l'ensemble des informations de commentaire au début du fichier devrait ressembler à ça:"
+
+#: View/Events/legacy_automation.ctp:100
+msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
+msgstr "L'administrateur peut maintenir une liste blanche contenant des noms d'hôtes, noms de domaines et adresses IP a exclure des exports NIDS."
+
+#: View/Events/legacy_automation.ctp:102
+msgid "Hash database export"
+msgstr "Export de la base de données des hash"
+
+#: View/Events/legacy_automation.ctp:103
+msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr "L'export automatique des sommes de contrôle MD5/SHA1 contenu dans des attributs relatifs à des fichiers. Cette liste peut être utilisé pour alimenter un logiciel d'analyse post-mortem pour la recherche de fichiers suspects. Seul les événements et attributs <em>publiés</em> marqués en tant que <em>Signature IDS</em> sont exportés."
+
+#: View/Events/legacy_automation.ctp:104;188
+msgid "You can configure your tools to automatically download the following files"
+msgstr "Vous pouvez configurer vos outils pour télécharger automatiquement les fichiers suivant"
+
+#: View/Events/legacy_automation.ctp:109
+msgid "The API's full format is as follows"
+msgstr "Le format complet de l'API est comme suit"
+
+#: View/Events/legacy_automation.ctp:111
+msgid "The export format, can be \"md5\" or \"sha1\""
+msgstr "Le format d'export, pouvant être \"md5\" ou \"sha1\""
+
+#: View/Events/legacy_automation.ctp:123
+msgid "For example, to only show sha1 values from events tagged tag1, use"
+msgstr "Par exemple, pour seulement afficher les valeurs de sha1 d’événements marqués tag1, utilisez"
+
+#: View/Events/legacy_automation.ctp:126
+msgid "STIX export"
+msgstr "Export STIX"
+
+#: View/Events/legacy_automation.ctp:127
+msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
+msgstr "Vous pouvez exporter les événements MISP au format STIX du MITRE (pour en savoir plus cliquez ici <a href=\"https://stix.mitre.org/\">here</a>). L'export XML STIX est actuellement très lent et peut expirer en cas de gros événements ou d'agrégation d'événements. Le format JSON ne souffre pas de ce problème. L'usage"
+
+#: View/Events/legacy_automation.ctp:129
+msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
+msgstr "Les paramètres de recherches peuvent être passé à la fonction par les paramètres de l'URL ou en POSTant un object JSON ou XML (dépendant du type retourné). Les paramètres suivants peuvent être passés vers l'outil d'export STIX: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. ensemble <code>id</code> et <code>tags</code> peuvent utiliser le <code>&amp;&amp;</code> (and) et <code>!</code> (non) opérateurs pour construire la requête. Pour utiliser le paramétrage par URL, la syntaxe est la suivante"
+
+#: View/Events/legacy_automation.ctp:132;171
+msgid "The event's ID"
+msgstr "L'ID de l'événement"
+
+#: View/Events/legacy_automation.ctp:133
+msgid "Encode attachments where applicable"
+msgstr "Encoder les pièces jointes lorsque c'est possible"
+
+#: View/Events/legacy_automation.ctp:151
+msgid "Various ways to narrow down the search results of the STIX export"
+msgstr "Différentes façons d’affiner les résultats de recherche de l’exportation STIX"
+
+#: View/Events/legacy_automation.ctp:152
+msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
+msgstr "Par exemple, pour récupérer tout les événements marqués \"APT1\" mais en excluant tout ceux marqués \"OSINT\" et excluant les événements #51 et #62 sans aucune pièces jointes"
+
+#: View/Events/legacy_automation.ctp:154
+msgid "To export the same events using a POST request use"
+msgstr "Pour exporter les mêmes événements en utilisant une requête POST"
+
+#: View/Events/legacy_automation.ctp:156
+msgid "Together with this JSON object in the POST message"
+msgstr "Ensemble avec l'objet JSON a l'intérieur du message POST"
+
+#: View/Events/legacy_automation.ctp:158
+msgid "XML is automagically assumed when using the stix export"
+msgstr "Le format XML est automagiquement assumé quand l'export STIX est utilisé"
+
+#: View/Events/legacy_automation.ctp:160
+msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
+msgstr "La même recherche peut être effectuée en POSTant l'objet XML suivant (à noter que les esperluettes doivent être échappés, ou alternativement, les identifiants et tags peuvent être utilisés)"
+
+#: View/Events/legacy_automation.ctp:163
+msgid "RPZ export"
+msgstr "Export RPZ"
+
+#: View/Events/legacy_automation.ctp:165
+msgid "It is possible to further restrict the exported values using the following filters"
+msgstr "Il est possible de restreindre d'avantage les valeurs exportées en utilisant les filtres suivants"
+
+#: View/Events/legacy_automation.ctp:167
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
+"        "
+msgstr "Pour inclure un tag dans les résultats, écrivez juste son nom dans ce paramètre. Pour exclure un tag, préfixez le avec un '!'.\n"
+"            Vous pouvez aussi chainer plusieurs commande de tags ensemble avec l'opérateur '&amp;&amp;'. Attention, les \"deux-points\" (:) ne peuvent être utilisé lors de la recherche de tags si ils sont passés via l'Url.        "
+
+#: View/Events/legacy_automation.ctp:170
+msgid "Use semicolons instead (the search will automatically search for colons instead)"
+msgstr "Utilisez plutôt les points-virgules (la recherche va automatiquement chercher les deux-points au lieu de cela)"
+
+#: View/Events/legacy_automation.ctp:172
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
+msgstr "Événements avec une date définie à une date spérieure à celle spécifiée dans le champ \"from\" (format : 2015-02-15)"
+
+#: View/Events/legacy_automation.ctp:173
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
+msgstr "Événements avec une date définie à une date antérieure à celle spécifiée dans le champ (format : 2015-02-03)"
+
+#: View/Events/legacy_automation.ctp:186
+msgid "Text export"
+msgstr "Export texte"
+
+#: View/Events/legacy_automation.ctp:187
+msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
+msgstr "> Un export de tout les attributs d'un type spécifique vers un fichier en plain text. Par défaut, seul les événements publiés et tagués comme exportables vers un IDS seront exportés."
+
+#: View/Events/legacy_automation.ctp:194
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
+msgstr "Pour restreindre les résultats par tags, utilisez la syntaxe suivant. Merci de faire attention, les deux-points (:) ne peuvent être utilisés pour la recherche de tag. Utilisez point-virgule à la place (la recherche va automatiquement rechercher les deux-points à la place). Pour récupérer les valeurs de type ip-src des événements ayant le tag1 mais pas le tag2, utilisez"
+
+#: View/Events/legacy_automation.ctp:197
+msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
+msgstr "Depuis la version 2.3.38, il est possible de restreindre les exports de texte sur la base de deux indicateurs supplémentaires. Le premier autorise l'utilisateur à restreindre sur la base de l'ID d'événement, tandis que le seconde est un booléen permettant aux attributs non indiqués en tant qu'IDS d'être exportés. Additionnellement, choisir \"all\" dans le champ type va retourner tout les attributs éligibles."
+
+#: View/Events/legacy_automation.ctp:201
+msgid "Only export the attributes of the given event ID"
+msgstr "Exporter seulement les attributs pour l'ID renseigné"
+
+#: View/Events/legacy_automation.ctp:202
+msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+msgstr "Inclure les attributs n'étant pas marqués en \"to_ids\", même si ils devraient normalement être exclus. Se substitue également à la fonctionnalité de liste blanche."
+
+#: View/Events/legacy_automation.ctp:207
+msgid "Include not published Events."
+msgstr "Inclure les événements non publiés."
+
+#: View/Events/legacy_automation.ctp:208;275
+msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr "Vous pouvez chaîner plusieurs tags ensemble avec l'opérateur '&amp;&amp;'. Attention, les \"deux-points\" (:) ne peuvent être utilisé lors de la recherche de tags.\n"
+"   Utilisez le \"point-virgule\" à la place (la recherche va autormatiquement rechercher les \"deux-points\" à la place). Par exemple, pour inclure le tag1 et le tag2 en excluant le tag3, vous devriez utiliser"
+
+#: View/Events/legacy_automation.ctp:263
+msgid "Searches with JSON/XML/OpenIOC results"
+msgstr "Rechercher avec les résultats JSON/XML/OpenIOC"
+
+#: View/Events/legacy_automation.ctp:267
+msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
+msgstr "Définir le format pour les résultats de la recerche (Actuellement supportés: json, xml, openioc -plus de formats à venir)."
+
+#: View/Events/legacy_automation.ctp:272
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
+msgstr "Pour inclure un tag dans les résultats, écrivez juste son nom dans ce paramètre. Pour exclure un tag, préfixez le avec '!'.\n"
+"Pour filtrer sur plusieurs valeurs pour le même paramètre, utilisez un tableau, tel que l'exemple suivant"
+
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr "Restreindre les résultats pour le dernier timestamp publié (le plus jeune)."
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr "Restreindre les résultats par l'horodatage (dernière édition). Tout événement avec un horodatage plus récent que celui indiqué va être retourné. Dans le cas ou vous recontrer un /attributes dans le périmètre, l'horodatage de l'attribut sera utilisé pour la table."
+
+#: View/Events/legacy_automation.ctp:291
+msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
+msgstr "Par exemple, pour trouver tout événement ayant le terme \"red october\" mentionné, utilisez la syntaxe suivante (l'exemple indiqué nécessite une requête POST à la place d'un GET, ce qui est fortement recommandé. Les requêtes GET sont problématiques et fortement déconseillées)."
+
+#: View/Events/legacy_automation.ctp:296
+msgid "To just return a list of attributes, use the following syntax"
+msgstr "Pour ne retourner qu'une liste d'attributs, utiliser la syntaxe suivante"
+
+#: View/Events/legacy_automation.ctp:304
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
+msgstr "Événements avec une date définie à une date supérieure à celle spécifiée dans le champ \"from\" (format : 2015-02-15)"
+
+#: View/Events/legacy_automation.ctp:305
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
+msgstr "Événements avec une date définie à une date antérieure à celle spécifiée dans le champ \"to\" (format : 2015-02-15)"
+
+#: View/Events/legacy_automation.ctp:312
+msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
+msgstr "Restreindre les résultats par horodatage (de l'attribut). Tout les attributs avec un horodatage plus récent que l'horodatage indiqué seront retournés."
+
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr "Ne retourner que les attributs provenant d'événements ayant reçu une modification après l'horodatage indiqué."
+
+#: View/Events/legacy_automation.ctp:322
+msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
+msgstr "Les mot-clés \"false\" ou \"null\" doivent être utilisés pour les paramètre optionnels vides dans l'URL.. Gardez à l'esprit qu'il n'est nécessaire de le faire que dans le cas d'usage déprécié de passage des paramètres dans l'URL."
+
+#: View/Events/legacy_automation.ctp:324
+msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
+"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
+msgstr "valeur, type, catégorie et organisation sont optionnels. Il est possible de rechercher plusieurs termes dans chaque catégorie en les joignant avec l'opérateur '&amp;&amp;' . Il est aussi possible de les rendre négatif avec l'opérateur '!'. Attention l'opérateur deux-points ':' ne peut pas être utilisé pour la recherche de tags. Utilisez l'opérateur point-virgule ';' à la place (cela recherchera automatique ':' à la place).\n"
+"   Par exemple, pour chercher tout les attributs créés par votre organisation qui contiennent 192.168 ou 127.0 mais pas 0.1 et qui ont pour type src-ip, tout en excluant les événements qui sont tagués avec tag1, utilisez la syntaxe suivante"
+
+#: View/Events/legacy_automation.ctp:327
+msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
+msgstr "Vous pouvez aussi utiliser la rechercher d'IP en utilisant des CIDR. Assurez vous d'utiliser le pipe '|' à la place du slash '|'. Les \"deux-points\" ne peuvent être utilisé pour la recherche de tag. Utilisez le \"point-virgule\" à la place (la recherche va automatiquement remplacer par des \"deux-points\" à la place). Voir ci-dessous pour l'exemple"
 
 #: View/Events/merge.ctp:4
 msgid "Merge events"
@@ -6690,19 +7413,19 @@ msgid "Proposals"
 msgstr "Propositions"
 
 #: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:93
+#: View/Events/view.ctp:106
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr "Contributeurs"
 
 #: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:113
-#: View/Jobs/index.ctp:65
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
 #: View/Logs/admin_search.ctp:6
 #: View/Pages/doc/administration.ctp:87;104;116;181;195
 #: View/Pages/doc/using_the_system.ctp:166
-#: View/Users/admin_view.ctp:24
-#: View/Users/view.ctp:9
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
 msgid "Email"
 msgstr "Adresse email"
 
@@ -6780,11 +7503,8 @@ msgid "Successfully added attributes"
 msgstr "Attributs ajoutés avec succès"
 
 #: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Events/view.ctp:56
 #: View/Feeds/preview_event.ctp:11
 #: View/Galaxies/view.ctp:18
-#: View/ObjectTemplates/view.ctp:15
-#: View/Organisations/view.ctp:54
 #: View/Organisations/ajax/merge.ctp:58
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
@@ -6807,6 +7527,14 @@ msgstr "Contenu"
 msgid "Visualisation"
 msgstr "Visualisation"
 
+#: View/Events/upload_analysis_file.ctp:6
+msgid "Import analysis file"
+msgstr "Importer un fichier d'analyse"
+
+#: View/Events/upload_analysis_file.ctp:61
+msgid "Create Objects"
+msgstr "Créer des objets"
+
 #: View/Events/upload_stix.ctp:6
 msgid "Import %s file"
 msgstr "Importer %s fichier(s)"
@@ -6815,193 +7543,186 @@ msgstr "Importer %s fichier(s)"
 msgid "%s file"
 msgstr "%s fichiers"
 
-#: View/Events/view.ctp:49
-msgid "Extended view"
-msgstr "Vue étendue"
+#: View/Events/upload_stix.ctp:24
+msgid "Include the original imported file as attachment"
+msgstr "Inclure le fichier importé original comme pièce jointe"
 
-#: View/Events/view.ctp:51
+#: View/Events/view.ctp:53
 #: View/Servers/preview_event.ctp:12
 #: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Event ID"
 msgstr "ID de l'événement"
 
-#: View/Events/view.ctp:63
+#: View/Events/view.ctp:57
 msgid "Source Organisation"
 msgstr "Organisation source"
 
-#: View/Events/view.ctp:68
+#: View/Events/view.ctp:66
 msgid "Member Organisation"
 msgstr "Organisation membre"
 
-#: View/Events/view.ctp:83
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr "Orga créateur"
+
+#: View/Events/view.ctp:86
 msgid "Owner org"
 msgstr "Organisation du propriétaire"
 
-#: View/Events/view.ctp:131
+#: View/Events/view.ctp:135
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
 #: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
 msgstr "Niveau de menace"
 
-#: View/Events/view.ctp:139
+#: View/Events/view.ctp:140
 #: View/Feeds/preview_event.ctp:37
 #: View/Pages/doc/using_the_system.ctp:70;177;210
 #: View/Servers/preview_event.ctp:48
 msgid "Analysis"
 msgstr "Analyse"
 
-#: View/Events/view.ctp:159
+#: View/Events/view.ctp:161
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr "Information"
 
-#: View/Events/view.ctp:165;167
+#: View/Events/view.ctp:165
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
 msgstr "Publié"
 
-#: View/Events/view.ctp:169
+#: View/Events/view.ctp:173
 msgid "#Attributes"
 msgstr "#Attributs"
 
-#: View/Events/view.ctp:171
+#: View/Events/view.ctp:177
+msgid "First recorded change"
+msgstr "Première modification enregistrée"
+
+#: View/Events/view.ctp:181
 msgid "Last change"
 msgstr "Dernière modification"
 
-#: View/Events/view.ctp:176
+#: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr "Carte de modification"
+
+#: View/Events/view.ctp:191
 msgid "Extends"
 msgstr "Étendre"
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:210
 msgid "Extended by"
 msgstr "Étendu par"
 
-#: View/Events/view.ctp:194
-msgid "Currently in "
-msgstr "Actuellement dans "
+#: View/Events/view.ctp:217
+msgid "extended"
+msgstr "étendu"
 
-#: View/Events/view.ctp:202
-msgid "- restricted to own organisation only."
-msgstr "- restreindre aux organisation détenues seulement."
+#: View/Events/view.ctp:217
+msgid "atomic"
+msgstr "atomique"
 
-#: View/Events/view.ctp:203
-msgid "Advanced Sightings"
-msgstr "Observations avancées"
-
-#: View/Events/view.ctp:219
-msgid "you"
-msgstr "vous"
-
-#: View/Events/view.ctp:220
-msgid " has"
-msgstr " a"
-
-#: View/Events/view.ctp:223
-msgid "You have"
-msgstr "Vous avez"
-
-#: View/Events/view.ctp:226
+#: View/Events/view.ctp:265
 msgid "Delegation request"
 msgstr "Demande de délégation"
 
-#: View/Events/view.ctp:227
-msgid "%s requested that %s take over this event."
-msgstr "%s a demandé la prise en charge de %s pour cet événement."
-
-#: View/Events/view.ctp:227
+#: View/Events/view.ctp:277
 msgid "View request details"
 msgstr "Voir les détails de la requête"
 
-#: View/Events/view.ctp:232
-msgid "Correlation"
-msgstr "Corrélation"
-
-#: View/Events/view.ctp:238;247
-#: View/Users/admin_view.ctp:125
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: View/Events/view.ctp:238
-msgid "enable"
-msgstr "activer"
-
-#: View/Events/view.ctp:242;249
-#: View/ObjectTemplates/index.ctp:32
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
 #: View/Taxonomies/view.ctp:24
-#: View/Warninglists/view.ctp:38
 msgid "Enabled"
 msgstr "Activé"
 
-#: View/Events/view.ctp:242
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr "activer"
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr "Activer"
 
-#: View/Events/view.ctp:277
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr "Vue étendue"
+
+#: View/Events/view.ctp:328
 msgid "Show (%s more)"
 msgstr "Voir (%s more)"
 
-#: View/Events/view.ctp:335
+#: View/Events/view.ctp:386;415
 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."
+#: View/Events/view.ctp:387;416
+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
+#: View/Events/view.ctp:424
 msgid "Warning: Potential false positives"
 msgstr "Attention: potentiels faux-positifs"
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Toggle pivot graph"
 msgstr "Activer/Désactiver les graphes de pivot"
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Pivots"
 msgstr "Pivots"
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Toggle galaxies"
 msgstr "Activer/désactiver les galaxies"
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Galaxy"
 msgstr "Galaxie"
 
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Toggle Event graph"
 msgstr "Activer/Désactiver les graphes d'événements"
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Toggle Correlation graph"
 msgstr "Activer/Désactiver le graphe de corrélation"
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Correlation graph"
 msgstr "Graphe de corrélation"
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "Toggle ATT&CK matrix"
 msgstr "Activer/Désactiver les matrices ATT&CK"
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "ATT&CK matrix"
 msgstr "Matrice ATT&CK"
 
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 msgid "Toggle attributes"
 msgstr "Activer/désactiver les attributs"
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Toggle discussions"
 msgstr "Activer/Désactiver les discussions"
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Discussion"
 msgstr "Discussion"
 
@@ -7037,16 +7758,24 @@ msgstr "Êtes vous sur de vouloir supprimer"
 msgid " Event #"
 msgstr "Evenement #"
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:7
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:6
 msgid "Publish Event%s"
 msgstr "Publier l'événement %s"
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:8
+msgid "Unpublish Event%s"
+msgstr "Dépublier l'événement %s"
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the event?"
+msgstr "Êtes-vous sûr de vouloir dépublier l'événement ?"
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:20
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr "Publier sans envoyer un courriel d'alerte ? Juste pour les changements mineurs!"
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
-#: View/Feeds/index.ctp:54
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Feeds/index.ctp:104
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -7056,10 +7785,6 @@ msgstr "Publier"
 msgid "Choose the format that you wish to download the event in"
 msgstr "Choisissez le format que vous souhaitez pour le téléchargement de l'événement."
 
-#: View/Events/ajax/exportChoice.ctp:17;18;27;28
-msgid "Export as %s"
-msgstr "Exporter en tant que %s"
-
 #: View/Events/ajax/importChoice.ctp:2
 msgid "Choose the format that you would like to use for the import"
 msgstr "Choisissez le format dans lequel vous souhaitez importer"
@@ -7230,7 +7955,7 @@ msgstr "Si coché, le flag \"to_ids\" sera toujours désactivé lors de la récu
 
 #: View/Feeds/add.ctp:156
 #: View/Feeds/edit.ctp:153
-#: View/Feeds/index.ctp:55
+#: View/Feeds/index.ctp:105
 msgid "Delta Merge"
 msgstr "Fusion des différences"
 
@@ -7271,16 +7996,16 @@ msgstr "Les événements provenant des organisations suivantes sont bloqués"
 
 #: View/Feeds/add.ctp:196
 #: View/Feeds/edit.ctp:191
-#: View/Servers/add.ctp:113
-#: View/Servers/edit.ctp:152;158
+#: View/Servers/add.ctp:102
+#: View/Servers/edit.ctp:147;153
 msgid "Modify"
 msgstr "Modifier"
 
-#: View/Feeds/compare_feeds.ctp:58
+#: View/Feeds/compare_feeds.ctp:66
 msgid "None or less than 1% of the data of %s is contained in %s (%s matching values)"
 msgstr "Moins d'1% ou aucune des données de %s est contenue dans %s (%s de valeurs correspondantes)"
 
-#: View/Feeds/compare_feeds.ctp:59
+#: View/Feeds/compare_feeds.ctp:67
 msgid "%s\\% of the data of %s is contained in %s (%s matching values)"
 msgstr "%s\\% des données de %s est contenu dans %s (%s valeurs correspondantes)"
 
@@ -7301,53 +8026,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr "L'url de base du serveur externe auquel vous souhaitez vous synchroniser. Exemple: https://misppriv.circl.lu"
 
 #: View/Feeds/edit.ctp:207
-#: View/Servers/add.ctp:143
-#: View/Servers/edit.ctp:186
+#: View/Servers/add.ctp:132
+#: View/Servers/edit.ctp:181
 msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
 msgstr "Un nom qui définira clairement ce qu'est cette instance. Par exemple: \"Instance de l'organisation A\""
 
 #: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:185
+#: View/Servers/add.ctp:133
+#: View/Servers/edit.ctp:180
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr "L'organisation a un serveur externe avec lequel vous souhaitez vous synchroniser. Exemple: BE"
 
 #: View/Feeds/edit.ctp:209
-#: View/Servers/add.ctp:145
-#: View/Servers/edit.ctp:187
+#: View/Servers/add.ctp:134
+#: View/Servers/edit.ctp:182
 msgid "You can find the authentication key on your profile on the external server."
 msgstr "Vous pouvez trouver la clé d'authentification dans votre profil sur l'instance externe."
 
 #: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:146
-#: View/Servers/edit.ctp:188
+#: View/Servers/add.ctp:135
+#: View/Servers/edit.ctp:183
 msgid "Allow the upload of events and their attributes."
 msgstr "Permettre le téléchargement d’événements et de leurs attributs."
 
 #: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:189
+#: View/Servers/add.ctp:136
+#: View/Servers/edit.ctp:184
 msgid "Allow the download of events and their attributes from the server."
 msgstr "Autoriser le téléchargement d'événements et de leurs attributs depuis l'instance."
 
 #: View/Feeds/edit.ctp:212
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:185
 msgid "Unpublish new event (working with Push event)."
 msgstr "Ne pas publier les nouveaux événements (fonctionne avec les événements poussés)."
 
 #: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:191
+#: View/Servers/edit.ctp:186
 msgid "Publish new event without email (working with Pull event)."
 msgstr "Publier un nouvel événement sans e-mail (fonctionne avec les événements récupérés)."
 
 #: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:192
+#: View/Servers/edit.ctp:187
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority."
 msgstr "Vous pouvez également téléverser un fichier de certificat si l'instance à laquelle vous tentez de vous connecter possède sa propre autorité de certification."
 
 #: View/Feeds/edit.ctp:215
-#: View/Servers/add.ctp:151
-#: View/Servers/edit.ctp:194
+#: View/Servers/add.ctp:140
+#: View/Servers/edit.ctp:189
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr "Cliquez-ici si vous voulez autoriser une connection avec une autre instance en utilisant un certificat auto-signé (non recommandé)."
 
@@ -7399,130 +8124,104 @@ msgstr "Mettre en cache les flux"
 msgid "Fetch and store all feed data"
 msgstr "Récupérer et stocker les données de l'ensemble des flux"
 
-#: View/Feeds/index.ctp:27
+#: View/Feeds/index.ctp:33
 msgid "Enable selected"
 msgstr "Activer les éléments sélectionnés"
 
-#: View/Feeds/index.ctp:27
-msgid "Enable Selected"
-msgstr "Activer les éléments sélectionnés"
-
-#: View/Feeds/index.ctp:28
+#: View/Feeds/index.ctp:39
 msgid "Disable selected"
 msgstr "Désactiver la sélection"
 
-#: View/Feeds/index.ctp:28
-msgid "Disable Selected"
-msgstr "Désactiver la sélection"
-
-#: View/Feeds/index.ctp:29
+#: View/Feeds/index.ctp:45
 msgid "Enable caching for selected"
 msgstr "Activer la mise en cache pour les éléments sélectionnés"
 
-#: View/Feeds/index.ctp:29
-msgid "Enable Caching for Selected"
-msgstr "Activer la mise en cache pour les éléments sélectionnés"
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:51
 msgid "Disable caching for selected"
 msgstr "Désactiver la mise en cache pour les éléments sélectionnés"
 
-#: View/Feeds/index.ctp:30
-msgid "Disable Caching for  Selected"
-msgstr "Désactiver la mise en cache pour les éléments sélectionnés"
-
-#: View/Feeds/index.ctp:30
-msgid "Default feeds filter"
-msgstr "Filtre de flux par défaut"
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:61
 msgid "Default feeds"
 msgstr "Flux par défaut"
 
-#: View/Feeds/index.ctp:31
-msgid "Custom feeds filter"
-msgstr "Filtre personnalisé pour les flux"
-
-#: View/Feeds/index.ctp:31
+#: View/Feeds/index.ctp:66
 msgid "Custom feeds"
 msgstr "Flux personnalisés"
 
-#: View/Feeds/index.ctp:31
-msgid "Custom Feeds"
-msgstr "Flux personnalisés"
-
-#: View/Feeds/index.ctp:32
+#: View/Feeds/index.ctp:71
 msgid "All feeds"
 msgstr "Tout les flux"
 
-#: View/Feeds/index.ctp:32
-msgid "All Feeds"
-msgstr "Tout les flux"
-
-#: View/Feeds/index.ctp:33
+#: View/Feeds/index.ctp:76
 msgid "Enabled feeds"
 msgstr "Flux activés"
 
-#: View/Feeds/index.ctp:33
-msgid "Enabled Feeds"
-msgstr "Flux activés"
+#: View/Feeds/index.ctp:95
+msgid "Enable pulling the feed into your MISP as events/attributes."
+msgstr "Activer l'extraction du flux dans votre MISP en tant qu'événements/attributs."
 
-#: View/Feeds/index.ctp:48
+#: View/Feeds/index.ctp:96
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr "Activer la mise en cache du flux dans Redis - ce qui permet d'afficher les corrélations au flux."
+
+#: View/Feeds/index.ctp:98
 msgid "Feed Format"
 msgstr "Format du flux"
 
-#: View/Feeds/index.ctp:50
-#: View/Jobs/index.ctp:76
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr "Entrant"
 
-#: View/Feeds/index.ctp:56
+#: View/Feeds/index.ctp:106
 msgid "Override IDS"
 msgstr "Ecraser la valeur \"to_ids\""
 
-#: View/Feeds/index.ctp:60
+#: View/Feeds/index.ctp:110
 msgid "Caching"
 msgstr "Mettre en cache"
 
-#: View/Feeds/index.ctp:108
-#: View/Servers/index.ctp:73;74
+#: View/Feeds/index.ctp:158
+#: View/Servers/index.ctp:74;75
 msgid "Rules"
 msgstr "Règles"
 
-#: View/Feeds/index.ctp:135
+#: View/Feeds/index.ctp:185
 msgid "Error: Invalid event!"
 msgstr "Erreur: Événement invalide!"
 
-#: View/Feeds/index.ctp:140
+#: View/Feeds/index.ctp:190
 msgid "Fixed event %s"
 msgstr "Evenement %s fixe"
 
-#: View/Feeds/index.ctp:143
+#: View/Feeds/index.ctp:193
 msgid "New fixed event"
 msgstr "Nouvel événement fixe"
 
-#: View/Feeds/index.ctp:195
+#: View/Feeds/index.ctp:245
+#: View/Servers/index.ctp:94
 msgid "Age: "
 msgstr "Age: "
 
-#: View/Feeds/index.ctp:197
+#: View/Feeds/index.ctp:247
+#: View/Servers/index.ctp:102
 msgid "Not cached"
 msgstr "Non mis en cache"
 
-#: View/Feeds/index.ctp:208
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr "Explorer l'événement à distance"
 
-#: View/Feeds/index.ctp:210
+#: View/Feeds/index.ctp:260
 msgid "Fetch all events"
 msgstr "Récupérer tout les événements"
 
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 msgid "Are you sure you want to permanently remove the feed (%s)?"
 msgstr "Êtes vous sur de vouloir supprimer définitivement ce flux (%s) ?"
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:267
 msgid "Download feed metadata as JSON"
 msgstr "Télécharger les méta-données du flux en json"
 
@@ -7544,47 +8243,31 @@ msgid "Namespace"
 msgstr "Espace de noms"
 
 #: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:17
+#: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:19
+#: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr "Version"
 
-#: View/Galaxies/ajax/cluster_choice.ctp:2
-msgid "Select Cluster"
-msgstr "Sélectionner le cluster"
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
+msgstr "Ordre de la chaine cybercriminelle"
 
-#: View/Galaxies/ajax/cluster_choice.ctp:11
-msgid "search clusters…"
-msgstr "chercher des clusters…"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "Galaxy Cluster Deletion"
+msgstr "Suppression du cluster Galaxy"
 
-#: View/Galaxies/ajax/cluster_choice.ctp:28
-msgid "Back to Galaxy Selection"
-msgstr "Revenir à la sélection des Galaxies"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies."
+msgstr "Etes-vous sûr de vouloir supprimer le Galaxy Cluster #<?php echo h($id);?>?<br /> Les tags associés ne seront pas supprimés. Vous pouvez recharger le Galaxy Cluster à tout moment en mettant à jour vos galaxies en mode forcé."
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:2
-msgid "Select Cluster Source"
-msgstr "Sélectionner le cluster source"
+#: View/GalaxyClusters/ajax/index.ctp:82
+msgid "Delete galaxy cluster"
+msgstr "Supprimer le cluster galaxy"
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All clusters"
-msgstr "Tout les clusters"
-
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All Galaxies"
-msgstr "Toutes les galaxies"
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:2
-msgid "Select Galaxy Namespace Source"
-msgstr "Sélectionnez l'espace de la galaxie source"
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All namespaces"
-msgstr "Tout les espaces de nom"
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All Namespaces"
-msgstr "Tout les espaces de nom"
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
+msgstr "Lancer le sélecteur de matrice de galaxie"
 
 #: View/Jobs/index.ctp:12
 msgid "Are you sure you want to purge all completed job entries? Job entries are considered as log entries and have no impact on actual job execution."
@@ -7598,37 +8281,37 @@ msgstr "Etes vous sûr de vouloir purger toutes les entrées de travaux ? Les en
 msgid "Completed."
 msgstr "Complété."
 
-#: View/Jobs/index.ctp:63
+#: View/Jobs/index.ctp:68;98
 msgid "Show all queues"
 msgstr "Voir toutes les files"
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:74;99
 msgid "Show default queue"
 msgstr "Voir la file par défaut"
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr "Voir la file des e-mail"
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr "Voir la file de mise en cache"
+
+#: View/Jobs/index.ctp:99
 #: View/Roles/admin_index.ctp:22
 #: View/Roles/index.ctp:22
 msgid "Default"
 msgstr "Par défaut"
 
-#: View/Jobs/index.ctp:65
-msgid "Show email queue"
-msgstr "Voir la file des e-mail"
-
-#: View/Jobs/index.ctp:66
-msgid "Show cache queue"
-msgstr "Voir la file de mise en cache"
-
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:101
 msgid "Cache"
 msgstr "Cache"
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:127
 msgid "No worker active"
 msgstr "Aucun travailleur actif"
 
-#: View/Jobs/index.ctp:124
+#: View/Jobs/index.ctp:159
 msgid "View stacktrace"
 msgstr "Voir la pile"
 
@@ -7648,10 +8331,6 @@ msgstr "Cliquez ici pour masquer la trace de la pile"
 msgid "No error data found. Generally job error data is purged from Redis after 24 hours, however, you can still view the errors in the log files in \"/app/tmp/logs\"."
 msgstr "Pas d'erreur de données trouvées. Généralement, les données de jobs en erreur sont purgées de Redis après 24 heures, cependant, vous pouvez toujours voir les erreur dans les fichiers de journalisation dans \"/app/tmp/logs\"."
 
-#: View/Jobs/ajax/error.ctp:34
-msgid "Close"
-msgstr "FermerFermer"
-
 #: View/Logs/admin_index.ctp:2
 #: View/Logs/event_index.ctp:6
 msgid "Logs"
@@ -7693,22 +8372,20 @@ msgstr "inclure les changements"
 msgid "from IP"
 msgstr "depuis l'IP"
 
-#: View/Logs/admin_index.ctp:20;21
-msgid "Search"
-msgstr "Rechercher"
-
-#: View/Logs/admin_index.ctp:59
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr "ID du modèle"
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:50
-#: View/ObjectTemplates/view.ctp:13
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/Templates/view.ctp:33
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
 msgstr "Organisation"
 
@@ -7794,12 +8471,12 @@ msgstr "Type de relation"
 msgid "Target UUID"
 msgstr "UUID Cible"
 
-#: View/ObjectReferences/ajax/add.ctp:53
+#: View/ObjectReferences/ajax/add.ctp:54
 #: View/Objects/orphaned_object_diagnostics.ctp:38
 msgid "Object"
 msgstr "Objet"
 
-#: View/ObjectReferences/ajax/add.ctp:68
+#: View/ObjectReferences/ajax/add.ctp:120
 msgid "Target Details"
 msgstr "Détails de la cible"
 
@@ -7820,7 +8497,7 @@ msgid " The Attribute will be permanently deleted and unrecoverable. Also, this
 msgstr " Cet attribut va être définitivement supprimé et sera irrécupérable. Ceci va empêcher propagation de la suppression dans d’autres instances."
 
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:24
-#: View/Pages/doc/categories_and_types.ctp:46
+#: View/Pages/doc/categories_and_types.ctp:40
 #: View/Pages/doc/md/categories_and_types.ctp:23
 msgid "Categories"
 msgstr "Catégories"
@@ -7841,43 +8518,35 @@ msgstr "Désactiver la corrélation"
 msgid "Object Template index"
 msgstr "Index des modèles d'objet"
 
-#: View/ObjectTemplates/index.ctp:54
-#: View/ObjectTemplates/view.ctp:23
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr "Requis"
 
-#: View/ObjectTemplates/index.ctp:107
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr "Etes vous sure de vouloir forcer la mise à jour du modèle # %s ?"
 
-#: View/ObjectTemplates/index.ctp:108
+#: View/ObjectTemplates/index.ctp:119
 msgid "Are you sure you want to delete template # %s?"
 msgstr "Etes vous sûr de vouloir supprimer le modèle # %s?"
 
-#: View/ObjectTemplates/view.ctp:7
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr "Id"
+
+#: View/ObjectTemplates/view.ctp:33
 msgid " Object Template"
 msgstr " Modèle d'objet"
 
-#: View/ObjectTemplates/view.ctp:9
-msgid "Object Template ID"
-msgstr "ID du modèle d'objet"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:2
-msgid "Select Object Category"
-msgstr "Sélectionner la catégorie de l'objet"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All meta-categories"
-msgstr "Toutes les catégories"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All Objects"
-msgstr "Tout les objets"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:50
-msgid "Back to categories"
-msgstr "Revenir aux catégories"
-
 #: View/Objects/add.ctp:6
 msgid " Object"
 msgstr " Objet"
@@ -7954,15 +8623,6 @@ msgstr "Faites attention à ce que l'objet reflète ce que vous souhaitez faire
 msgid "To IDS"
 msgstr "Pour IDS"
 
-#: View/Objects/revise_object.ctp:49
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/ajax/merge.ctp:65
-#: View/SharingGroups/add.ctp:32
-#: View/SharingGroups/edit.ctp:32
-msgid "UUID"
-msgstr "UUID"
-
 #: View/Objects/ajax/delete.ctp:6
 msgid "Object Deletion"
 msgstr "Suppression d'objet"
@@ -7984,6 +8644,7 @@ msgid "Simply paste a list of all the organisation UUIDs that you wish to block
 msgstr "Collez simplement une liste de tous les UUID d'organisations que vous souhaitez voir bloqués."
 
 #: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr "Nom de l'organisation"
 
@@ -8108,9 +8769,9 @@ msgstr "Une organisation avec le même UUID est déjà existante. Voulez-vous fu
 msgid "Click here"
 msgstr "Cliquer ici"
 
-#: View/Organisations/index.ctp:5
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:51
+#: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr "Toutes les organisations"
@@ -8119,7 +8780,7 @@ msgstr "Toutes les organisations"
 msgid ", both local and remote"
 msgstr ", local et à distance"
 
-#: View/Organisations/index.ctp:9
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr "Organisation distantes connues"
@@ -8128,7 +8789,7 @@ msgstr "Organisation distantes connues"
 msgid " on other instances"
 msgstr " sur les autres instances"
 
-#: View/Organisations/index.ctp:13
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr "Organisations locale"
@@ -8145,55 +8806,52 @@ msgstr "Pagination"
 msgid "View all"
 msgstr "Tout voir"
 
-#: View/Organisations/index.ctp:65
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:30
 msgid "Logo"
 msgstr "Logo"
 
-#: View/Organisations/index.ctp:76
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr "Ajouté par"
 
-#: View/Organisations/index.ctp:117
+#: View/Organisations/index.ctp:138
 #: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 ""
 
-#: View/Organisations/view.ctp:3
-msgid "Organisation "
-msgstr "Organisation "
-
-#: View/Organisations/view.ctp:7
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:4
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/Users/admin_view.ctp:9
-#: View/Users/view.ctp:4
-#: View/Warninglists/view.ctp:4
-msgid "Id"
-msgstr "Id"
-
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr "Local ou distant"
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:12
 #: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr "Local"
 
-#: View/Organisations/view.ctp:26
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr "Distant"
 
-#: View/Organisations/view.ctp:40
-msgid "E-mail domain restrictions"
-msgstr "Restriction de domaines mail"
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
+msgstr "Restrictions de domaine"
 
-#: View/Organisations/view.ctp:93;94
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr "Temps de création"
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr "Dernière modification"
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr "Organisation "
+
+#: View/Organisations/view.ctp:62;63
 msgid "Members"
 msgstr "Membres"
 
@@ -8206,7 +8864,6 @@ msgid "Available Organisations"
 msgstr "Organisations disponibles"
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
 msgid "Added Organisations"
 msgstr "Organisations ajoutés"
 
@@ -8271,6 +8928,14 @@ msgstr "Réinitialiser le compteur d'attributs"
 msgid "Events need to have no validation issues"
 msgstr "Les événements ne doivent pas avoir de problèmes de validation"
 
+#: View/Pages/administration.ctp:15
+msgid "Recorrelate attributes"
+msgstr "Faire la corrélation des attributs à nouveau"
+
+#: View/Pages/administration.ctp:16
+msgid "Recorrelate proposals"
+msgstr "Faire la corrélation des propositions à nouveau"
+
 #: View/Pages/administration.ctp:18
 msgid "Verify Certificates"
 msgstr "Vérifier les certificats"
@@ -8287,6 +8952,10 @@ msgstr "Étendre la taille de l'oganisation"
 msgid "Hotfix 2.3.57: Increase the max length of the organization field when adding a new server connection."
 msgstr "Correctif 2.3.57: Augmentation de la longueur maximum dans le champ Organisation lors de l'ajout d'une nouvelle connexion a un serveur."
 
+#: View/Pages/administration.ctp:20
+msgid "Convert log fields to text"
+msgstr "Convertir les champs de log en texte"
+
 #: View/Pages/administration.ctp:20
 msgid "Hotfix 2.3.78: Some of the log fields that were varchar(255) ended up truncating the data. This function will change them to \"text\""
 msgstr "Correctif 2.3.78: Certaines des valeurs de logs qui étaient en varchar(255) se terminent avec des valeurs tronquées. Cette fonction va les changer en \"text\""
@@ -8299,18 +8968,34 @@ msgstr "Corriger les UUID dupliqués"
 msgid "Hotfix 2.3.107: it was previously possible to get duplicate attribute UUIDs in the database, this script will remove all duplicates and ensure that duplicates will not be entered into the database in the future."
 msgstr "Correctif 2.3.107: Il était prédemment possible de récupérer des UUID d'attributs dupliqués dans la base de données. Ce script va supprimer toutes les valeurs dupliquées et s'assurer que les valeurs dupliquées ne pourront plus être entrées dans le futur."
 
+#: View/Pages/administration.ctp:22
+msgid "Remove duplicate events (with the same UUID)"
+msgstr "Supprimer les événements en double (avec le même UUID)"
+
 #: View/Pages/administration.ctp:22
 msgid "Hotfix 2.3.115: In some rare situations it could occur that a duplicate of an event was created on an instance, with the exact same uuid. This action will remove any such duplicates and make sure that this cannot happen again."
 msgstr "Correctif 2.3.115: Dans de rares cas, il peut arriver une duplication d'événements créer sur l'instance avec le même Uuid. Cette action va supprimer chacun des événements dupliqués et s'assurer que cela ne se reproduise plus."
 
+#: View/Pages/administration.ctp:23
+msgid "Prune orphaned attributes"
+msgstr "Taillez les attributs orphelins"
+
 #: View/Pages/administration.ctp:23
 msgid "In some rare occasions it can happen that you end up with some attributes in your database that do not belong to an event - for example during a race condition between an event insert and a delete. This tool will collect and delete any such orphaned attributes. If you ever run into an issue where you cannot add an attribute with a specific valid value, this is probably the reason."
 msgstr "Dans de rare cas, il peut arriver que vous vous retrouviez avec des attributs dans votre base de données alors qu'ils ne sont reliés à aucun événement - par exemple, durant un traitement d'insertion ou de suppression d'un événement. Cet outil va récupérer et supprimer tout attribut orphelins. Si vous avez déjà eu un problème ou vous ne pouviez ajouter d'attributs avec un type spécifique, il s'agit probablement de cette raison."
 
+#: View/Pages/administration.ctp:24
+msgid "Clean regex table of potentially malicious entries"
+msgstr "Nettoyer la table regex des entrées potentiellement malveillantes"
+
 #: View/Pages/administration.ctp:24
 msgid "Hotfix 2.3.160: Prior to this version it was possible for a user/admin with Regex permission to create a malicious regular expression that could be used to execute arbitrary code. Since this version it is no longer possible to input such expressions, but already existing malicious entries still have to be cleaned using this tool."
 msgstr "Correctif 2.3.160: Avant cette version, il était possible pour un utilisateur/administrateur possédant la permission Regex de créer une expression régulière malveillante pour exécuter du code arbitraire. Depuis cette version, il n'est plus possible d'insérer une telle expression, mais les entrées malveillantes déjà existantes doivent être nettoyés en utilisant cet outil."
 
+#: View/Pages/administration.ctp:25
+msgid "Remove URL type attribute sanitisation"
+msgstr "Supprimer l'URL du type de assainement d'attribut"
+
 #: View/Pages/administration.ctp:25
 msgid "Hotfix 2.3.173: Sanitised URLs can cause issues with the NIDS exports and as of this version attributes will be modified on entry to correct this. To correct existing entries, run this script."
 msgstr "Correctif 2.7.13: Les URLs assainies peuvent causer des problèmes avec l'export NIDS et depuis cette version, les entrées d'attributs vont être modifiés pour corriger cela. Pour corriger les entrées existantes, lancez ce script."
@@ -8364,7 +9049,6 @@ msgid "If the migration of your data from 2.4 is not complete this will lead to
 msgstr "Si la migration de vos données depuis la version 2.4 n'est pas terminée, cela va entraîner des pertes de données. Sauvegarder votre base de donnée est hautement recommandé. Êtes vous prêt à débuter la suppression des champs obsolètes?"
 
 #: View/Pages/doc/administration.ctp:3
-#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:3
 #: View/Pages/doc/general.ctp:3
 #: View/Pages/doc/quickstart.ctp:3;14
@@ -8374,7 +9058,6 @@ msgid "Quick Start"
 msgstr "Démarrage rapide"
 
 #: View/Pages/doc/administration.ctp:4
-#: View/Pages/doc/categories_and_types.ctp:4
 #: View/Pages/doc/concepts.ctp:4
 #: View/Pages/doc/general.ctp:4;14
 #: View/Pages/doc/quickstart.ctp:4
@@ -8384,7 +9067,6 @@ msgid "General Layout"
 msgstr "Mise en page générale"
 
 #: View/Pages/doc/administration.ctp:5
-#: View/Pages/doc/categories_and_types.ctp:5
 #: View/Pages/doc/concepts.ctp:5;14
 #: View/Pages/doc/general.ctp:5
 #: View/Pages/doc/quickstart.ctp:5
@@ -8394,7 +9076,6 @@ msgid "General Concepts"
 msgstr "Concepts généraux"
 
 #: View/Pages/doc/administration.ctp:6
-#: View/Pages/doc/categories_and_types.ctp:6
 #: View/Pages/doc/concepts.ctp:6
 #: View/Pages/doc/general.ctp:6
 #: View/Pages/doc/quickstart.ctp:6
@@ -8404,7 +9085,6 @@ msgid "User Management and Global actions"
 msgstr "Gestion des utilisateurs et des actions globales"
 
 #: View/Pages/doc/administration.ctp:7
-#: View/Pages/doc/categories_and_types.ctp:7
 #: View/Pages/doc/concepts.ctp:7
 #: View/Pages/doc/general.ctp:7
 #: View/Pages/doc/quickstart.ctp:7
@@ -8447,7 +9127,7 @@ msgid "FAQ"
 msgstr "FAQ"
 
 #: View/Pages/doc/administration.ctp:22
-#: View/Pages/doc/categories_and_types.ctp:9
+#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:9
 #: View/Pages/doc/general.ctp:9
 #: View/Pages/doc/quickstart.ctp:9
@@ -8505,6 +9185,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr "Paramètres de contrôle de la protection anti-bruteforce et le sel de la clé de l'application."
 
 #: View/Pages/doc/administration.ctp:37
+#: View/Servers/edit.ctp:82
 msgid "Misc settings"
 msgstr "Paramètres divers"
 
@@ -8724,8 +9405,8 @@ msgstr "Cet option va inscrire les nouveaux utiisateurs aux courriels générés
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_view.ctp:40
-#: View/Users/view.ctp:34
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
 msgid "Authkey"
 msgstr "Clé d'authentification"
 
@@ -8778,8 +9459,8 @@ msgid "The e-mail address (and login name) of the user."
 msgstr "L'adresse mail (et l'identifiant de connexion) de l'utilisateur."
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_view.ctp:29
-#: View/Users/view.ctp:24
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr "Alerter automatiquement"
 
@@ -8800,8 +9481,6 @@ msgid "Shows the currently assigned NIDS ID."
 msgstr "Voir l'ID NIDS actuellement attribué."
 
 #: View/Pages/doc/administration.ctp:109;125
-#: View/Users/admin_view.ctp:100
-#: View/Users/view.ctp:55
 msgid "Termsaccepted"
 msgstr "Termes acceptés"
 
@@ -8810,7 +9489,7 @@ msgid "This flag indicates whether the user has accepted the terms of use or not
 msgstr "Indique si l'utilisateur a accepté les conditions d'utilisation."
 
 #: View/Pages/doc/administration.ctp:110
-#: View/Users/admin_view.ctp:120
+#: View/Users/admin_view.ctp:84
 msgid "Newsread"
 msgstr "Actualités"
 
@@ -8872,7 +9551,7 @@ msgstr "Contactez vos utilisateurs ici."
 
 #: View/Pages/doc/administration.ctp:133;184;197
 #: View/Pages/doc/using_the_system.ctp:269
-#: View/Taxonomies/view.ctp:78
+#: View/Taxonomies/view.ctp:89
 msgid "Action"
 msgstr "Action"
 
@@ -9351,16 +10030,16 @@ msgstr "my_new_password"
 msgid "This will create a new password hash using the currently set salt."
 msgstr "Cela va créer un nouveau hachage de mot de passe en utilisant le sel actuellement défini."
 
-#: View/Pages/doc/categories_and_types.ctp:13
+#: View/Pages/doc/categories_and_types.ctp:7
 msgid "Attribute Categories and Types"
 msgstr "Catégories et types d'attributs"
 
-#: View/Pages/doc/categories_and_types.ctp:14
+#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/md/categories_and_types.ctp:1
 msgid "Attribute Categories vs. Types"
 msgstr "Catégories d'attributs et types"
 
-#: View/Pages/doc/categories_and_types.ctp:80
+#: View/Pages/doc/categories_and_types.ctp:74
 msgid "Click here to get the .md version for gitbook generation."
 msgstr "Cliquez ici pour obtenir la version .md pour la génération de gitbook."
 
@@ -9369,8 +10048,8 @@ msgid "Admins and Site Admins"
 msgstr "Administrateurs et administrateurs du site"
 
 #: View/Pages/doc/concepts.ctp:16
-msgid "There are two types of admins in MISP: Admins (also refered to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
-msgstr "Il existe deux types d'admins dans MISP: les Admins (aussi appelés Admins) et les Admins du Site. Alors que le premier ne peut faire qu'une administration limitée des utilisateurs de sa propre organisation, les administrateurs du site ont accès à tous les administrateurs. caractéristiques et les données du système.Ils sont chargés de s'assurer que le système fonctionne correctement et la maintenance de MISP. "
+msgid "There are two types of admins in MISP: Admins (also referred to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
+msgstr "Il y a deux types d'administrateurs dans MISP: Admins (aussi appelés administrateurs org) et Admins du site. Bien que le premier ne puisse faire qu'une administration limitée des utilisateurs de sa propre organisation, les administrateurs du site ont accès à toutes les fonctionnalités et données du système."
 
 #: View/Pages/doc/concepts.ctp:17
 msgid "Background Jobs"
@@ -9500,10 +10179,6 @@ msgstr "Bouton d'accueil"
 msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
 msgstr "Ce bouton vous ramènera à l'écran de démarrage de l'application, qui est la page d'index des événements (plus à ce sujet plus tard)."
 
-#: View/Pages/doc/general.ctp:20
-msgid "Event Actions"
-msgstr "Actions d'événement"
-
 #: View/Pages/doc/general.ctp:20
 msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
 msgstr "Toutes les données sur les Malware saisies dans MISP sont constituées d'un objet événement décrit par ses attributs connectés. Le menu Actions d'évènement donne accès à toutes les fonctionnalités de création, modification, suppression, publication, recherche et liste des événements et des attributs. "
@@ -9512,18 +10187,10 @@ msgstr "Toutes les données sur les Malware saisies dans MISP sont constituées
 msgid "Input filters alter what and how data can be entered into this instance. Apart from the basic validation of attribute entry by type, it is possible for the site administrators to define regular expression replacements and blacklists for certain values in addition to blocking certain values from being exportable. Users can view these replacement and blacklist rules here whilst administrator can alter them."
 msgstr "Les filtres d'entrée modifient en quoi et comment les données peuvent être saisies dans cette instance. En plus de la validation de base de l'entrée d'attribut par type, les administrateurs de site peuvent définir des remplacements d'expressions régulières et des listes noires pour certaines valeurs. d'être exportable.Les utilisateurs peuvent voir ces règles de remplacement et de liste noire ici tandis que l'administrateur peut les modifier. "
 
-#: View/Pages/doc/general.ctp:22;54
-msgid "Global Actions"
-msgstr "Actions globales"
-
 #: View/Pages/doc/general.ctp:22
 msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
 msgstr "Ce menu vous donne accès à des informations sur MISP et cette instance. Vous pouvez voir et éditer votre propre profil, consulter le manuel, lire à nouveau les nouvelles ou les conditions d'utilisation, voir une liste des organisations actives sur cette instance et un histogramme de leurs contributions par type d'attribut. "
 
-#: View/Pages/doc/general.ctp:23;66
-msgid "Sync Actions"
-msgstr "Actions de synchronisation"
-
 #: View/Pages/doc/general.ctp:23
 msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
 msgstr "Avec les droits d'accès de l'administrateur, affiche une liste des instances connectées et permet l'initialisation d'un push et d'un pull (plus sur les mécanismes de synchronisation plus tard)."
@@ -9649,6 +10316,11 @@ msgstr "Vous pouvez voir les permissions de rôle ici."
 msgid "A link to this user guide."
 msgstr "Un lien vers ce guide de l'utilisateur."
 
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr "Termes &amp; conditions"
+
 #: View/Pages/doc/general.ctp:61
 msgid "View the terms &amp; conditions again."
 msgstr "Voir à nouveau les conditions générales."
@@ -9914,7 +10586,7 @@ msgstr "Afficher un ensemble de statistiques telles que le nombre d'Evénements
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:47
+#: View/Users/statistics_data.ctp:53
 msgid "Activity Heatmap"
 msgstr "Activité Heatmap"
 
@@ -10849,12 +11521,6 @@ msgstr "Gardez à l'esprit que la modification d'un événement (directement ou
 msgid "As described earlier, users with tagging rights can arbitrarily tag events using tags chosen from a pool of available options. If you have tagging privileges and would like to create a new tag, navigate to Event Actions - Add Tag. You'll be presented with the following form"
 msgstr "Comme décrit précédemment, les utilisateurs disposant de droits de marquage peuvent arbitrairement baliser des événements à l'aide de balises choisies parmi un groupe d'options disponibles.Si vous avez des privilèges de marquage et que vous souhaitez créer un nouveau tag, accédez à Actions d'événement - Ajouter un tag. présenté avec le formulaire suivant "
 
-#: View/Pages/doc/using_the_system.ctp:303
-#: View/Templates/add.ctp:17
-#: View/Templates/edit.ctp:17
-msgid "Add tag"
-msgstr "Ajouter un tag"
-
 #: View/Pages/doc/using_the_system.ctp:303
 msgid "Enter a name for the tag and click on the color field to be able to pick a colour for it."
 msgstr "Entrez un nom pour le tag et cliquez sur le champ de couleur pour pouvoir choisir une couleur pour celui-ci."
@@ -11184,8 +11850,8 @@ msgid "Make sure that you enter the authentication key that you have been given
 msgstr "Assurez-vous d'entrer la clé d'authentification qui vous a été donnée par l'organisation d'hébergement de l'instance distante, au lieu de celle que vous avez obtenue de celle-ci."
 
 #: View/Pages/doc/using_the_system.ctp:397
-#: View/Servers/add.ctp:7
-#: View/Servers/edit.ctp:7
+#: View/Servers/add.ctp:8
+#: View/Servers/edit.ctp:8
 msgid "Base URL"
 msgstr "URL de base"
 
@@ -11286,7 +11952,7 @@ msgid "Clicking the delete button will delete the link to the instance."
 msgstr "Cliquez sur le bouton Supprimer pour supprimer le lien vers l'instance."
 
 #: View/Pages/doc/using_the_system.ctp:418
-#: View/Servers/index.ctp:92
+#: View/Servers/index.ctp:128
 msgid "Push all"
 msgstr "Poussez tout"
 
@@ -11295,7 +11961,7 @@ msgid " By clicking this button, all events that are eligible to be pushed on th
 msgstr "En cliquant sur ce bouton, tous les événements susceptibles d'être poussés sur l'instance sur laquelle vous vous trouvez vont commencer à être poussés vers l'instance distante Les événements et les attributs qui existent à l'extrémité distante seront mis à jour."
 
 #: View/Pages/doc/using_the_system.ctp:419
-#: View/Servers/index.ctp:89
+#: View/Servers/index.ctp:125
 msgid "Pull all"
 msgstr "\"Pull\" tout"
 
@@ -11450,7 +12116,7 @@ msgstr "ok"
 msgid "remove"
 msgstr "enlever"
 
-#: View/Roles/view.ctp:14
+#: View/Roles/view.ctp:5
 msgid "Permission level"
 msgstr "Niveau d'autorisation"
 
@@ -11458,136 +12124,155 @@ msgstr "Niveau d'autorisation"
 msgid "Add Server"
 msgstr "Ajouter un serveur"
 
-#: View/Servers/add.ctp:10
-#: View/Servers/edit.ctp:10
+#: View/Servers/add.ctp:6
+#: View/Servers/edit.ctp:6
+msgid "Instance identification"
+msgstr "Identification de l’instance"
+
+#: View/Servers/add.ctp:11
+#: View/Servers/edit.ctp:11
 msgid "Instance name"
 msgstr "Nom de l'instance"
 
-#: View/Servers/add.ctp:16
+#: View/Servers/add.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change."
 msgstr "Vous pouvez définir cette instance comme une instance interne en cochant la case ci-dessous, ce qui signifie que toute synchronisation entre cette instance et celle distante ne sera pas automatiquement dégradée comme dans un scénario de synchronisation normal. instances et que vous êtes d'accord avec ce changement autrement dangereux. "
 
-#: View/Servers/add.ctp:19
-#: View/Servers/edit.ctp:19
+#: View/Servers/add.ctp:20
+#: View/Servers/edit.ctp:20
 msgid "Internal instance"
 msgstr "Instance interne"
 
-#: View/Servers/add.ctp:29
+#: View/Servers/add.ctp:30
+#: View/Servers/edit.ctp:31
+msgid "Instance ownership and credentials"
+msgstr "Appartenance de l'instance et identifiants"
+
+#: View/Servers/add.ctp:31
+#: View/Servers/edit.ctp:32
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr "Informations sur l'organisation qui recevra les événements, généralement l'organisation hôte de l'instance distante."
 
-#: View/Servers/add.ctp:35
+#: View/Servers/add.ctp:37
 msgid "Remote Sync Organisation Type"
 msgstr "Type d'organisation de synchronisation distante"
 
-#: View/Servers/add.ctp:40
-#: View/Servers/edit.ctp:37
+#: View/Servers/add.ctp:42
+#: View/Servers/edit.ctp:43
 msgid "External Organisation"
 msgstr "Organisation externe"
 
-#: View/Servers/add.ctp:46
-#: View/Servers/edit.ctp:48
-msgid "Local Organisation"
-msgstr "Organisation locale"
+#: View/Servers/add.ctp:48
+msgid "Owner of remote instance"
+msgstr "Propriétaire de l'instance distante"
 
-#: View/Servers/add.ctp:52
-#: View/Servers/edit.ctp:59
+#: View/Servers/add.ctp:54
+#: View/Servers/edit.ctp:65
 msgid "Remote Organisation's Name"
 msgstr "Nom de l'organisation distante"
 
-#: View/Servers/add.ctp:56
-#: View/Servers/edit.ctp:63
+#: View/Servers/add.ctp:58
+#: View/Servers/edit.ctp:69
 msgid "Remote Organisation's Uuid"
 msgstr "UUID de l'organisation distante"
 
-#: View/Servers/add.ctp:97
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:78
+msgid "Enabled synchronisation methods"
+msgstr "Méthodes de synchronisation activées"
+
+#: View/Servers/add.ctp:86
 msgid "Server certificate file"
 msgstr "Fichier de certificat de serveur"
 
-#: View/Servers/add.ctp:103
+#: View/Servers/add.ctp:92
 msgid "Client certificate file"
 msgstr "Fichier de certificat client"
 
-#: View/Servers/add.ctp:108
-#: View/Servers/edit.ctp:147
+#: View/Servers/add.ctp:97
+#: View/Servers/edit.ctp:142
 msgid "Push rules:"
 msgstr "\"Push\" les règles:"
 
-#: View/Servers/add.ctp:109;115
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:98;104
+#: View/Servers/edit.ctp:143;149
 msgid "Events with the following tags allowed: "
 msgstr "Evénements avec les balises suivantes autorisées:"
 
-#: View/Servers/add.ctp:110;116
-#: View/Servers/edit.ctp:149;155
+#: View/Servers/add.ctp:99;105
+#: View/Servers/edit.ctp:144;150
 msgid "Events with the following tags blocked: "
 msgstr "Evénements avec les balises suivantes bloquées:"
 
-#: View/Servers/add.ctp:111;117
-#: View/Servers/edit.ctp:150;156
+#: View/Servers/add.ctp:100;106
+#: View/Servers/edit.ctp:145;151
 msgid "Events with the following organisations allowed: "
 msgstr "Evénements avec les organisations suivantes autorisées:"
 
-#: View/Servers/add.ctp:112;118
-#: View/Servers/edit.ctp:151;157
+#: View/Servers/add.ctp:101;107
+#: View/Servers/edit.ctp:146;152
 msgid "Events with the following organisations blocked: "
 msgstr "Evénements avec les organisations suivantes bloquées:"
 
-#: View/Servers/add.ctp:114
-#: View/Servers/edit.ctp:153
+#: View/Servers/add.ctp:103
+#: View/Servers/edit.ctp:148
 msgid "Pull rules:"
 msgstr "\"Pull\" des règles:"
 
-#: View/Servers/add.ctp:142
-#: View/Servers/edit.ctp:184
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:179
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr "L'url de base du serveur externe auquel vous souhaitez vous synchroniser. Exemple: https://foo.sig.mil.be"
 
-#: View/Servers/add.ctp:148
+#: View/Servers/add.ctp:137
 msgid "Unpublish new event (working with Pull event)."
 msgstr "Annuler la publication de l'événement (en utilisant l'événement Pull)."
 
-#: View/Servers/add.ctp:149
+#: View/Servers/add.ctp:138
 msgid "Publish new event without email (working with Push event)."
 msgstr "Publier un nouvel événement sans e-mail (en utilisant l'événement Push)."
 
-#: View/Servers/add.ctp:150
+#: View/Servers/add.ctp:139
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr "Vous pouvez également télécharger un fichier de certificat si l'instance à laquelle vous essayez de vous connecter a sa propre autorité de signature. (* .pem)"
 
-#: View/Servers/edit.ctp:16
+#: View/Servers/edit.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change. This also requires that the current instance's host organisation and the remote sync organisation are the same."
 msgstr "Vous pouvez définir cette instance comme une instance interne en cochant la case ci-dessous, ce qui signifie que toute synchronisation entre cette instance et celle distante ne sera pas automatiquement dégradée comme dans un scénario de synchronisation normal, et que vous êtes d'accord avec cette modification par ailleurs dangereuse.Cela nécessite également que l'organisation hôte de l'instance actuelle et l'organisation de synchronisation à distance soient les mêmes. "
 
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:37
 msgid "Organisation Type"
 msgstr "Type d'organisation"
 
-#: View/Servers/edit.ctp:69
+#: View/Servers/edit.ctp:54
+msgid "Local Organisation"
+msgstr "Organisation locale"
+
+#: View/Servers/edit.ctp:75
 msgid "Leave empty to use current key"
 msgstr "Laisser vide pour utiliser la clé actuelle"
 
-#: View/Servers/edit.ctp:104
+#: View/Servers/edit.ctp:99
 msgid "Server certificate file (*.pem): "
 msgstr "Fichier de certificat de serveur (* .pem):"
 
-#: View/Servers/edit.ctp:112;134
+#: View/Servers/edit.ctp:107;129
 msgid "Add certificate file"
 msgstr "Ajouter un fichier de certificat"
 
-#: View/Servers/edit.ctp:113;135
+#: View/Servers/edit.ctp:108;130
 msgid "Remove certificate file"
 msgstr "Supprimer le fichier de certificat"
 
-#: View/Servers/edit.ctp:126
+#: View/Servers/edit.ctp:121
 msgid "Client certificate file: "
 msgstr "Fichier de certificat client:"
 
-#: View/Servers/edit.ctp:193
+#: View/Servers/edit.ctp:188
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr "Vous pouvez également télécharger un fichier de certificat client si l'instance que vous essayez de vous connecter le requiert."
 
-#: View/Servers/edit.ctp:250;254
+#: View/Servers/edit.ctp:245;249
 msgid "Not set."
 msgstr "Non défini."
 
@@ -11600,8 +12285,8 @@ msgid "Example:"
 msgstr "Exemple:"
 
 #: View/Servers/filter_event_index.ctp:21
-msgid "Apply filters to the remote instance"
-msgstr "Appliquer des filtres à l'instance distante"
+msgid "Apply filters to the remote instance's index"
+msgstr "Appliquer les filtres à l'index de l'instance distante"
 
 #: View/Servers/index.ctp:2
 msgid "Servers"
@@ -11611,34 +12296,38 @@ msgstr "Serveurs"
 msgid "Connection test"
 msgstr "Test de connexion"
 
-#: View/Servers/index.ctp:30
+#: View/Servers/index.ctp:31
 msgid "Remote Organisation"
 msgstr "Organisation à distance"
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Test the connection to the remote instance"
 msgstr "Tester la connexion à l'instance distante"
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Run"
 msgstr "Exécuter"
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Internal instance that ignores distribution level degradation *WARNING: Only use this setting if you have several internal instances and the sync link is to an internal extension of the current MISP community*"
 msgstr "Instance interne qui ignore la dégradation du niveau de distribution * AVERTISSEMENT: N'utilisez ce paramètre que si vous avez plusieurs instances internes et que le lien de synchronisation est à une extension interne de la communauté MISP actuelle *"
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr "Lien de synchronisation normal vers une instance MISP externe La dégradation de la distribution suivra les règles normales."
 
-#: View/Servers/index.ctp:86
+#: View/Servers/index.ctp:122
 msgid "Explore"
 msgstr "Explorer"
 
-#: View/Servers/index.ctp:88
+#: View/Servers/index.ctp:124
 msgid "Pull updates to events that already exist locally"
 msgstr "\"Pull\" les mises à jour des événements qui existent déjà localement"
 
+#: View/Servers/index.ctp:131
+msgid "Cache instance"
+msgstr "Instance du cache"
+
 #: View/Servers/preview_event.ctp:7
 msgid "You are currently viewing an event on the remote instance %s "
 msgstr "Vous visualisez actuellement un événement sur l'instance distante %s"
@@ -11655,15 +12344,15 @@ msgstr "Filtrer l'instance distante sur l'étiquette: %s"
 msgid "You are currently viewing the event index of the remote instance %s"
 msgstr "Vous consultez actuellement l'index des événements de l'instance distante %s"
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr "pas"
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "published"
 msgstr "publié"
 
-#: View/Servers/preview_index.ctp:147
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr "Récupérer l'événement"
 
@@ -11707,19 +12396,23 @@ msgstr "\"Push\" réussis"
 msgid "No succeeded pushes"
 msgstr "Aucun \"push\" réussi"
 
-#: View/Servers/rest.ctp:7;17
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr "Méthode HTTP à utiliser"
+
+#: View/Servers/rest.ctp:33
 msgid "Relative path to query"
 msgstr "Chemin d’accès relatif à la requête"
 
-#: View/Servers/rest.ctp:54
+#: View/Servers/rest.ctp:116
 msgid "Response code"
 msgstr "Code de retour"
 
-#: View/Servers/rest.ctp:55
+#: View/Servers/rest.ctp:117
 msgid "Request duration"
 msgstr "Durée de la requête"
 
-#: View/Servers/rest.ctp:56
+#: View/Servers/rest.ctp:118
 msgid "Headers"
 msgstr "En-têtes"
 
@@ -11739,6 +12432,10 @@ msgstr "Sélectionner les instances à ajouter"
 msgid "Available Instances"
 msgstr "Instances disponibles"
 
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
+msgid "Added Instances"
+msgstr "Instances ajoutées"
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 msgid "Add servers to sharing group"
 msgstr "Ajouter des serveurs au groupe de partage"
@@ -11786,39 +12483,31 @@ msgstr "Proposer"
 msgid "IDS Signature?"
 msgstr "Signature IDS?"
 
-#: View/ShadowAttributes/index.ctp:21
-msgid "Only list proposals of my organisation"
-msgstr "Ne liste que les propositions de mon organisation"
-
-#: View/ShadowAttributes/index.ctp:21
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr "Les événements de mon organisation"
 
-#: View/ShadowAttributes/index.ctp:26
-msgid "List all proposals"
-msgstr "Liste toutes les propositions"
-
-#: View/ShadowAttributes/index.ctp:26
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
 msgstr "Tous les événements"
 
-#: View/ShadowAttributes/index.ctp:33
+#: View/ShadowAttributes/index.ctp:43
 msgid "Proposal by"
 msgstr "Proposition par"
 
-#: View/ShadowAttributes/index.ctp:39
+#: View/ShadowAttributes/index.ctp:49
 msgid "Event creator"
 msgstr "Créateur d'événements"
 
-#: View/ShadowAttributes/index.ctp:45
+#: View/ShadowAttributes/index.ctp:55
 msgid "Proposed value"
 msgstr "Valeur proposée"
 
-#: View/ShadowAttributes/index.ctp:71
+#: View/ShadowAttributes/index.ctp:81
 msgid "Attribute edit"
 msgstr "Modification de l'attribut"
 
-#: View/ShadowAttributes/index.ctp:73
+#: View/ShadowAttributes/index.ctp:83
 msgid "New Attribute"
 msgstr "Nouvel attribut"
 
@@ -11846,160 +12535,160 @@ msgstr "Supprimer la proposition"
 msgid "New Sharing Group"
 msgstr "Nouveau groupe de partage"
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
-msgid "General tab"
-msgstr "Onglet Général"
-
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
 msgid "General"
 msgstr "Général"
 
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr "Onglet Général"
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
 msgid "Organisations tab"
 msgstr "Onglet Organisations"
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
-msgid "MISP instances tab"
-msgstr "Onglet Instances MISP"
-
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
 msgid "MISP Instances"
 msgstr "Instances MISP"
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
-msgid "Sharing group summary"
-msgstr "Partage du résumé du groupe"
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
+msgstr "Onglet Instances MISP"
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
 msgstr "Récapitulatif et enregistrement"
 
-#: View/SharingGroups/add.ctp:12
-#: View/SharingGroups/edit.ctp:12
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr "Partage du résumé du groupe"
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
 msgid "Example: Multinational sharing group"
 msgstr "Exemple: groupe de partage multinational"
 
-#: View/SharingGroups/add.ctp:13
-#: View/SharingGroups/edit.ctp:13
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
 msgid "Releasable to"
 msgstr "Diffusable à"
 
-#: View/SharingGroups/add.ctp:14
-#: View/SharingGroups/edit.ctp:14
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
 msgid "Example: Community1, Organisation1, Organisation2"
 msgstr "Exemple: Communauté1, Organisation1, Organisation2"
 
-#: View/SharingGroups/add.ctp:16
-#: View/SharingGroups/edit.ctp:16
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
 msgid "A description of the sharing group."
 msgstr "Une description du groupe de partage."
 
-#: View/SharingGroups/add.ctp:18
-#: View/SharingGroups/edit.ctp:18
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
 msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
 msgstr "Les groupes de partage actifs peuvent être sélectionnés par les utilisateurs de l'instance locale lors de la création d'événements. Généralement, les groupes de partage reçus via la synchronisation seront désactivés jusqu'à ce qu'ils soient activés manuellement."
 
-#: View/SharingGroups/add.ctp:19
-#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
 msgid "Make the sharing group selectable (active)"
 msgstr "Rendre le groupe de partage sélectionnable (actif)"
 
-#: View/SharingGroups/add.ctp:21;38;59
-#: View/SharingGroups/edit.ctp:21;38;67
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
 msgid "Next page"
 msgstr "La page suivante"
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation(s) to the sharing group"
 msgstr "Ajouter une ou plusieurs organisations locales au groupe de partage"
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation"
 msgstr "Ajouter une organisation locale"
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisations to the sharing group"
 msgstr "Ajouter des organisations distantes au groupe de partage"
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisation"
 msgstr "Ajouter une organisation distante"
 
-#: View/SharingGroups/add.ctp:33
-#: View/SharingGroups/edit.ctp:33
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
 #: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr "Etendre"
 
-#: View/SharingGroups/add.ctp:37;58;74
-#: View/SharingGroups/edit.ctp:37;66;82
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
 msgid "Previous page"
 msgstr "Page précédente"
 
-#: View/SharingGroups/add.ctp:42
-#: View/SharingGroups/edit.ctp:50
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
 msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
 msgstr "Activer le mode itinérant pour ce groupe de partage Le mode itinérance permettra de passer le groupe de partage à toute instance où le destinataire distant est contenu dans la liste des organisations."
 
-#: View/SharingGroups/add.ctp:43
-#: View/SharingGroups/edit.ctp:51
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
 msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
 msgstr "<b>Activer le mode itinérant </b> pour ce groupe de partage (transmettre l'événement à une instance connectée où la connexion de synchronisation est liée à une organisation contenue dans la liste d'organisation SG)."
 
-#: View/SharingGroups/add.ctp:47
-#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
 msgid "Add instance"
 msgstr "Ajouter une instance"
 
-#: View/SharingGroups/add.ctp:53
-#: View/SharingGroups/edit.ctp:61
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
 #: View/SharingGroups/view.ctp:69
 msgid "All orgs"
 msgstr "Tous les orgs"
 
-#: View/SharingGroups/add.ctp:63
+#: View/SharingGroups/add.ctp:103
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
 msgstr "<span class =\"bold\"> Général: </span> Vous êtes sur le point de créer le groupe de partage <span id=\"summarytitle\" class=\"red bold \"> </span>, qui est destiné à être diffusé à <span id=\"summaryreleasable\" class=\"red bold\"> </span>. "
 
-#: View/SharingGroups/add.ctp:64
+#: View/SharingGroups/add.ctp:104
 msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr "Organisations locales: </span> Ce sera visible pour <span id=\"summarylocal\" class=\"red bold\"> </span>, à partir de laquelle <span id = \" summarylocalextend \"class=\"red bold\"> </span> peut étendre le groupe de partage. "
 
-#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/add.ctp:105
 msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr "Organisations externes: </span> Il sera également visible dans <span id=\"summaryexternal \"class=\"red bold\"> </span>, dont <span id=\"summaryexternalextend\" class=\"red bold\"></span> peut étendre le groupe de partage. "
 
-#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/add.ctp:106
 msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr "<span class =\"bold\"> Synchronisation: </span> En outre, les événements sont automatiquement poussés vers: <span id=\"summaryservers\" class=\"red bold\"></span> "
 
-#: View/SharingGroups/add.ctp:67
-#: View/SharingGroups/edit.ctp:75
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
 msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
 msgstr "Vous pouvez modifier ces informations en revenant à l'une des pages précédentes, ou si vous êtes d'accord avec les informations mentionnées ci-dessus, cliquez sur Envoyer pour créer le groupe Partage."
 
-#: View/SharingGroups/add.ctp:75
-#: View/SharingGroups/edit.ctp:83
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
 msgid "Submit and create sharing group"
 msgstr "Soumettre et créer un groupe de partage"
 
-#: View/SharingGroups/add.ctp:95
+#: View/SharingGroups/add.ctp:135
 msgid "Local instance"
 msgstr "Instance locale"
 
-#: View/SharingGroups/edit.ctp:71
+#: View/SharingGroups/edit.ctp:111
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
 "                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
 "                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
@@ -12007,7 +12696,7 @@ msgstr "<span class=\"bold\">General: </span>Vous êtes sur le point de créer l
 "                <p id=\"localText\"><span class=\"bold\">Organisation Locale: </span>Ceci sera visible par <span id=\"summarylocal\" class=\"red bold\"></span>, à partir duquel <span id=\"summarylocalextend\" class=\"red bold\"></span> peuvent étendre le groupe de partage. </p>\n"
 "                <p id=\"externalText\"><span class=\"bold\">Organisation Externes: </span>Ceci sera visible par <span id=\"summaryexternal\" class=\"red bold\"></span>, parmis lesquels <span id=\"summaryexternalextend\" class=\"red bold\"></span> peuvent étendre le groupe de partage."
 
-#: View/SharingGroups/edit.ctp:74
+#: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr "Synchronisation: </span> En outre, les événements sont automatiquement poussés vers: <span id=\"summaryservers\"class=\"red bold\"> </span>"
 
@@ -12015,23 +12704,15 @@ msgstr "Synchronisation: </span> En outre, les événements sont automatiquement
 msgid "Sharing Groups"
 msgstr "Groupes de partage"
 
-#: View/SharingGroups/index.ctp:20
-msgid "View only active sharing groups"
-msgstr "Afficher uniquement les groupes de partage actifs"
-
-#: View/SharingGroups/index.ctp:20
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
 msgstr "Groupes de partage actifs"
 
-#: View/SharingGroups/index.ctp:21
-msgid "View only passive sharing groups"
-msgstr "Afficher uniquement les groupes de partage passif"
-
-#: View/SharingGroups/index.ctp:21
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
 msgstr "Groupes de partage passif"
 
-#: View/SharingGroups/index.ctp:61
+#: View/SharingGroups/index.ctp:80
 msgid "Distribution List"
 msgstr "Liste de distribution"
 
@@ -12075,6 +12756,18 @@ msgstr "Identifiant de l'attribut"
 msgid "Delete sighting"
 msgstr "Supprimer l'observation"
 
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
+msgid "Add Sighting"
+msgstr "Ajouter Sighting"
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "Add%s sighting (%s)?"
+msgstr "Ajouter%s sighting (%s)?"
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
+msgstr "faux-positif"
+
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
 msgid "Remove Sighting"
 msgstr "Supprimer la vue"
@@ -12087,6 +12780,26 @@ msgstr "Supprimer l'observation (%s)?"
 msgid "Remove sighting"
 msgstr "Supprimer l'observation"
 
+#: View/TagCollections/add.ctp:8
+msgid "Edit Tag Collection"
+msgstr "Modifier la collection de tags"
+
+#: View/TagCollections/add.ctp:16
+msgid "Visible to all orgs"
+msgstr "Visible à tous les orgas"
+
+#: View/TagCollections/import.ctp:4
+msgid "Paste tag collection data"
+msgstr "Collez les données de la collection tag"
+
+#: View/TagCollections/import.ctp:5
+msgid "Paste a MISP tag collection JSON below to add tag collections."
+msgstr "Collez une collection de tags MISP JSON ci-dessous pour ajouter des collections de tags."
+
+#: View/TagCollections/import.ctp:10
+msgid "Tag collection JSON"
+msgstr "Tag collection JSON"
+
 #: View/Tags/add.ctp:12
 #: View/Tags/edit.ctp:12
 msgid "Restrict tagging to org"
@@ -12097,6 +12810,10 @@ msgstr "Restreindre le marquage à l'organisation"
 msgid "Restrict tagging to user"
 msgstr "Restreindre le marquage à l'utilisateur"
 
+#: View/Tags/edit.ctp:31
+msgid "Unselectable Tag"
+msgstr "Tag non sélectionnable"
+
 #: View/Tags/index.ctp:10
 msgid "Your Favourite Tags"
 msgstr "Vos tags favoris"
@@ -12129,57 +12846,6 @@ msgstr "Attributs étiquetés"
 msgid "Favourite"
 msgstr "Favori"
 
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr "Êtes-vous sûr de vouloir supprimer \"%s\"?"
-
-#: View/Tags/ajax/select_tag.ctp:2
-msgid "Select Tag"
-msgstr "Sélectionner le tag"
-
-#: View/Tags/ajax/select_tag.ctp:16
-#: View/Tags/ajax/taxonomy_choice.ctp:4
-msgid "search tags…"
-msgstr "recherche des tags ..."
-
-#: View/Tags/ajax/select_tag.ctp:25
-msgid "Attach tag"
-msgstr "Attacher le tag"
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Return to taxonomy selection"
-msgstr "Retour à la sélection de la taxonomie"
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Select Taxonomy"
-msgstr "Sélectionner la taxonomie"
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Back to Taxonomy Selection"
-msgstr "Retour à la sélection de la taxonomie"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:2
-msgid "Select Tag Source"
-msgstr "Sélectionner la source du tag"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:10
-msgid "Favourite Tags"
-msgstr "Tags préférés"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:14
-msgid "Custom Tags"
-msgstr "Balises personnalisées"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:17
-msgid "All Tags"
-msgstr "Toutes les balises"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:21
-#: View/Taxonomies/view.ctp:2
-msgid "Taxonomy Library"
-msgstr "Bibliothèque de taxonomie"
-
 #: View/Tasks/index.ctp:4
 msgid "Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks."
 msgstr "Ici vous pouvez planifier des tâches prédéfinies qui seront exécutées toutes les x heures. Vous pouvez modifier la date et l'heure de la prochaine exécution programmée et la fréquence à laquelle elle sera répétée (exprimée en heures). Si vous réglez à 0 alors la tâche ne sera pas répétée. Pour changer un des paramètres mentionnés ci-dessus, cliquez simplement sur le champ approprié et cliquez sur mise à jour lorsque vous avez fini d'éditer les tâches planifiées. "
@@ -12217,7 +12883,8 @@ msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr "Êtes-vous sûr de vouloir activer chaque tag associé à cette taxonomie?"
 
 #: View/Taxonomies/index.ctp:41
-#: View/Taxonomies/view.ctp:29;143
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr "Désactiver"
 
@@ -12227,7 +12894,8 @@ msgid "Are you sure you want to disable this taxonomy library?"
 msgstr "Êtes-vous sûr de vouloir désactiver cette bibliothèque de taxonomie?"
 
 #: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:31;147
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr "Activer"
 
@@ -12244,19 +12912,27 @@ msgstr "Supprimer la taxonomie"
 msgid "Create and/or update selected tags"
 msgstr "Créer et / ou mettre à jour les tags sélectionnés"
 
-#: View/Taxonomies/view.ctp:116
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr "Masquer les tags sélectionnés"
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr "Démasquer les tags sélectionnés"
+
+#: View/Taxonomies/view.ctp:128
 msgid "Hidden"
 msgstr "Caché"
 
-#: View/Taxonomies/view.ctp:125
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr "Voir le graphique"
 
-#: View/Taxonomies/view.ctp:142
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
 msgstr "Actualiser"
 
-#: View/Taxonomies/view.ctp:147
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr "Actualiser ou activer"
 
@@ -12284,6 +12960,30 @@ msgstr "Créer / mettre à jour toutes les entrées de taxonomie sélectionnées
 msgid "Create / update all taxonomy entries as tags"
 msgstr "Créer / mettre à jour toutes les entrées de taxonomie en tant que balises"
 
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr "Masquer les Tags"
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr "Êtes-vous certain de que vouloir masquer tous les tags sélectionnées ?"
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr "Masquer tous les tags sélectionnés"
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr "Démasquer les tags"
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr "Êtes-vous sûr que vous voulez démasquer tous les tags sélectionnés ?"
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr "Démasquer tous les tags sélectionnées"
+
 #: View/TemplateElements/ajax/ajaxIndex.ctp:2
 msgid "Template Elements"
 msgstr "Éléments du modèle"
@@ -12536,6 +13236,8 @@ msgid "Admin Edit User"
 msgstr "Admin Modifier l'utilisateur"
 
 #: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
 msgid "Terms accepted"
 msgstr "Termes acceptés"
 
@@ -12603,15 +13305,19 @@ msgstr "Un seul utilisateur"
 msgid "All users"
 msgstr "Tous les utilisateurs"
 
-#: View/Users/admin_email.ctp:36
+#: View/Users/admin_email.ctp:19
+msgid "All users of the same organisation"
+msgstr "Tous les utilisateurs de la même organisation"
+
+#: View/Users/admin_email.ctp:39
 msgid "Enter a custom message"
 msgstr "Entrez un message personnalisé"
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "New user registration"
 msgstr "Enregistrement d'un nouvel utilisateur"
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "Password reset"
 msgstr "Réinitialisation du mot de passe"
 
@@ -12635,10 +13341,6 @@ msgstr "Appliquer les filtres"
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: View/Users/admin_index.ctp:40
-msgid "Filter user index"
-msgstr "Filtrer l'index des utilisateurs"
-
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr "Contact %s"
@@ -12651,42 +13353,48 @@ msgstr "ATTENTION: cet utilisateur ne possède pas de jeu de clés de chiffremen
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr " %s clé trouvée pour l'utilisateur, l'e-mail sera envoyé crypté à l'aide de cette clé."
 
-#: View/Users/admin_view.ctp:35
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
 msgid "Contactalert"
 msgstr "Contactalert"
 
-#: View/Users/admin_view.ctp:46
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr "Demande l'accès à l'API"
+
+#: View/Users/admin_view.ctp:44
 msgid "Invited By"
 msgstr "Invité par"
 
-#: View/Users/admin_view.ctp:51
-msgid "Org admin"
-msgstr "Administrateur"
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
+msgstr "Org_admin"
 
-#: View/Users/admin_view.ctp:74
-#: View/Users/view.ctp:67
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr "NIDS Start SID"
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr "Changement de mot de passe"
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
 msgid "GnuPG fingerprint"
 msgstr "Empreinte GnuPG"
 
-#: View/Users/admin_view.ctp:80
-#: View/Users/view.ctp:73
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
 msgid "GnuPG status"
 msgstr "Statut de GnuPG"
 
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:83
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
 msgid "SMIME Public certificate"
 msgstr "Certificat public SMIME"
 
-#: View/Users/admin_view.ctp:95
-msgid "Nids Sid"
-msgstr "Nids Sid"
-
-#: View/Users/admin_view.ctp:110
-msgid "Password change"
-msgstr "Changement de mot de passe"
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr "GnuPG échoués?"
@@ -12719,37 +13427,37 @@ msgid "Proposals active"
 msgstr "Propositions actives"
 
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:34
+#: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
 msgstr "Fils de discussion"
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:39
+#: View/Users/statistics_data.ctp:45
 msgid "Discussion posts"
 msgstr "Messages de discussion"
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:48
+#: View/Users/statistics_data.ctp:54
 msgid "A heatmap showing user activity for each day during this month and the 4 months that preceded it. Use the buttons below to only show the heatmap of a specific organisation."
 msgstr "Une carte de chaleur montrant l 'activité de l' utilisateur pour chaque jour de ce mois et les 4 mois qui l 'ont précédé Utilisez les boutons ci - dessous pour afficher uniquement le heatmap d' une organisation spécifique."
 
 #: View/Users/statistics.ctp:60
-#: View/Users/statistics_data.ctp:65
+#: View/Users/statistics_data.ctp:71
 msgid "Go left"
 msgstr "Aller à gauche"
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:71
+#: View/Users/statistics_data.ctp:77
 msgid "Go right"
 msgstr "Allez à droite"
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:118
+#: View/Users/statistics_data.ctp:124
 msgid "The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings."
 msgstr "Le graphique ci-dessus ne fonctionnera pas correctement en mode Compatibilité. Assurez-vous qu'il est désactivé dans vos paramètres Internet Explorer."
 
 #: View/Users/statistics.ctp:117
-#: View/Users/statistics_data.ctp:122
+#: View/Users/statistics_data.ctp:128
 msgid "The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer."
 msgstr "Le graphique ci-dessus ne fonctionnera pas correctement sur Internet Explorer 9.0 et versions antérieures. Veuillez télécharger Chrome, Firefox ou effectuer une mise à niveau vers une version plus récente d'Internet Explorer."
 
@@ -12757,6 +13465,18 @@ msgstr "Le graphique ci-dessus ne fonctionnera pas correctement sur Internet Exp
 msgid "A heatmap showing the usage of ATT&CK Tactic."
 msgstr "Une heatmap montrant l’utilisation d'ATT&CK."
 
+#: View/Users/statistics_data.ctp:32
+msgid "Users with PGP keys"
+msgstr "Utilisateurs avec les clés PGP"
+
+#: View/Users/statistics_data.ctp:36
+msgid "Local Organisations"
+msgstr "Organisations locales"
+
+#: View/Users/statistics_data.ctp:38
+msgid "Average Users / Org"
+msgstr "Utilisateurs moyens / Org"
+
 #: View/Users/statistics_orgs.ctp:17
 msgid "Organisation list"
 msgstr "Liste des organisations"
@@ -12825,13 +13545,13 @@ msgstr "Validation des certificats"
 msgid "GnuPG key validation"
 msgstr "Validation de la clé GnuPG"
 
-#: View/Users/view.ctp:45
-msgid "Request API access"
-msgstr "Demande l'accès à l'API"
+#: View/Users/ajax/emailConfirmTemplate.ctp:2
+msgid "Confirm sending"
+msgstr "Confirmer l'envoi"
 
-#: View/Users/view.ctp:50
-msgid "NIDS Start SID"
-msgstr "NIDS Start SID"
+#: View/Users/ajax/emailConfirmTemplate.ctp:4
+msgid "You are about to send a mail to %s recipient(s)?"
+msgstr "Vous êtes sur le point d'envoyer un mail à %s destinataire(s) ?"
 
 #: View/Users/ajax/fetchpgpkey.ctp:2
 msgid "Choose the key that you would like to use"
@@ -12893,7 +13613,7 @@ msgstr "Supprimer la liste des avertissements"
 msgid "Delete warninglist"
 msgstr "Supprimer la liste d'avertissement"
 
-#: View/Warninglists/view.ctp:29
+#: View/Warninglists/view.ctp:14;16
 msgid "Accepted attribute types"
 msgstr "Types d'attributs acceptés"
 
@@ -12969,6 +13689,7 @@ msgstr "booléen"
 #: Model/Attribute.php:validation for field uuid
 #: Model/Event.php:validation for field uuid;validation for field extends_uuid
 #: Model/EventBlacklist.php:validation for field event_uuid
+#: Model/MispObject.php:validation for field uuid
 #: Model/OrgBlacklist.php:validation for field org_uuid
 #: Model/Organisation.php:validation for field uuid
 #: Model/ShadowAttribute.php:validation for field uuid
@@ -12977,6 +13698,7 @@ msgid "Please provide a valid UUID"
 msgstr "Merci de rentrer un UUID valide"
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/MispObject.php:validation for field uuid
 msgid "The UUID provided is not unique"
 msgstr "L'UUID fourni n'est pas unique"
 
@@ -12996,6 +13718,7 @@ msgstr "Options: Votre organisation seulement, Cette communauté seulement, Comm
 #: Model/ServerTag.php:validation for field server_id;validation for field tag_id
 #: Model/SharingGroup.php:validation for field name
 #: Model/Tag.php:validation for field name;validation for field colour
+#: Model/TagCollection.php:validation for field name
 #: Model/TemplateElementAttribute.php:validation for field name;validation for field description
 #: Model/ThreatLevel.php:validation for field name;validation for field description;validation for field form_description
 #: Model/User.php:validation for field org_id;validation for field authkey
@@ -13095,6 +13818,7 @@ msgid "This field is required."
 msgstr "Ce champ est requis."
 
 #: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
 #: Model/Whitelist.php:validation for field name
 msgid "A similar name already exists."
 msgstr "Un nom similaire est déjà existant."
diff --git a/app/Locale/hun/LC_MESSAGES/default.po b/app/Locale/hun/LC_MESSAGES/default.po
index e9ee0dba8..615beaaa8 100644
--- a/app/Locale/hun/LC_MESSAGES/default.po
+++ b/app/Locale/hun/LC_MESSAGES/default.po
@@ -6624,6 +6624,10 @@ msgstr ""
 msgid "Quickfilter"
 msgstr ""
 
+#: View/Events/index.ctp:95
+msgid "Enter value to search"
+msgstr ""
+
 #: View/Events/index.ctp:44
 #: View/Organisations/index.ctp:59
 #: View/Servers/preview_index.ctp:45
diff --git a/app/Locale/ita/LC_MESSAGES/default.po b/app/Locale/ita/LC_MESSAGES/default.po
index 9d9f3752d..1a8b013d5 100644
--- a/app/Locale/ita/LC_MESSAGES/default.po
+++ b/app/Locale/ita/LC_MESSAGES/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-01-22 21:24\n"
+"PO-Revision-Date: 2019-03-06 02:06\n"
 "Last-Translator: SteveClement <steve@localhost.lu>\n"
 "Language-Team: Italian\n"
 "MIME-Version: 1.0\n"
@@ -15,272 +15,285 @@ msgstr ""
 "Language: it_IT\n"
 
 #: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:149;153;157
+#: Controller/AttributesController.php:125;129;133
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1001;1348;1352;1356;1385;1800;1876;1880;1884;2102;2166;2248;2903;5264;5429;5433;5442
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
 #: Controller/PostsController.php:56
+#: Model/Galaxy.php:292
 msgid "Invalid event"
 msgstr "Evento non valido"
 
-#: Controller/AppController.php:607
+#: Console/Command/ServerShell.php:49
+#: Controller/ServersController.php:632
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+msgstr ""
+
+#: Console/Command/ServerShell.php:51
+msgid "ERROR: %s"
+msgstr ""
+
+#: Controller/AppController.php:383
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr ""
+
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
+msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+msgstr "Questa chiave di autenticazione non è autorizzata ad essere utilizzata per export dati. Contattare l'amministratore."
+
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
+msgid "You have to be logged in to do that."
+msgstr "Devi essere autenticato per farlo."
+
+#: Controller/AppController.php:627
+msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
+msgstr ""
+
+#: Controller/AppController.php:752
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Fatto. attribute_count generato da zero per "
 
-#: Controller/AppController.php:726
-#: Controller/AttributesController.php:2668
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
 #: Controller/ShadowAttributesController.php:1276
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "Job in coda. Puoi visualizzarne il progresso nella pagina dei job attivi (amministrazione -> jobs)."
 
-#: Controller/AttributesController.php:140;1392
+#: Controller/AttributesController.php:116;1403
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "ID evento non specificato."
 
-#: Controller/AttributesController.php:143
+#: Controller/AttributesController.php:119
 msgid "You don't have permissions to create attributes"
 msgstr "Non hai i permessi per creare attributi"
 
-#: Controller/AttributesController.php:163;489;666
+#: Controller/AttributesController.php:139;488;668
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1684;1705;1739
-#: Controller/ObjectsController.php:442
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
 msgid "You do not have permission to do that."
 msgstr "Non hai il permesso di farlo."
 
-#: Controller/AttributesController.php:414;864;869;873;1072;1152;2684;2698;2731;2753;2762;3309;3313;3409;3413
-#: Controller/ShadowAttributesController.php:824;1067;1091;1124;1134
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
 #: Controller/TagsController.php:491
 msgid "Invalid attribute"
 msgstr "Attributo non valido"
 
-#: Controller/AttributesController.php:424
-#: Controller/ShadowAttributesController.php:500
+#: Controller/AttributesController.php:421
+#: Controller/ShadowAttributesController.php:499
 msgid "You do not have the permission to view this event."
 msgstr "Non hai i permessi per visualizzare questo evento."
 
-#: Controller/AttributesController.php:472
+#: Controller/AttributesController.php:468
 msgid "Attribute not an attachment or malware-sample"
 msgstr "L'attributo non è un allegato o un campione malware"
 
-#: Controller/AttributesController.php:504;677
-#: Controller/ShadowAttributesController.php:548
-msgid "PHP says file was not uploaded. Are you attacking me?"
-msgstr "Il PHP dice che il file non è stato caricato. Mi stai attaccando?"
-
-#: Controller/AttributesController.php:680
-#: Controller/ShadowAttributesController.php:551;561
-msgid "There was a problem to upload the file."
-msgstr "C'è stato un problema nel caricamento del file."
-
-#: Controller/AttributesController.php:824
-msgid "The ThreatConnect data has been imported."
-msgstr "I dati provenienti da ThreatConnect sono stati importati."
-
-#: Controller/AttributesController.php:827
-msgid "%s entries imported."
-msgstr "%s elementi sono stati importati."
-
-#: Controller/AttributesController.php:831
-msgid "%s entries could not be imported."
-msgstr "%s elementi non possono essere importati."
-
-#: Controller/AttributesController.php:881;924;926
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "Attributo non valido."
-
-#: Controller/AttributesController.php:920
-msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
-msgstr "L'attributo non può essere salvato: quello incluso nella richiesta non è più aggiornato della copia locale."
-
-#: Controller/AttributesController.php:936;1401
-#: Controller/EventsController.php:4635;4648;5213;5227
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
 msgid "Invalid Event."
 msgstr "Evento non valido."
 
-#: Controller/AttributesController.php:953
+#: Controller/AttributesController.php:503;679
+#: Controller/ShadowAttributesController.php:546
+msgid "PHP says file was not uploaded. Are you attacking me?"
+msgstr "Il PHP dice che il file non è stato caricato. Mi stai attaccando?"
+
+#: Controller/AttributesController.php:682
+#: Controller/ShadowAttributesController.php:549;559
+msgid "There was a problem to upload the file."
+msgstr "C'è stato un problema nel caricamento del file."
+
+#: Controller/AttributesController.php:826
+msgid "The ThreatConnect data has been imported."
+msgstr "I dati provenienti da ThreatConnect sono stati importati."
+
+#: Controller/AttributesController.php:829
+msgid "%s entries imported."
+msgstr "%s elementi sono stati importati."
+
+#: Controller/AttributesController.php:833
+msgid "%s entries could not be imported."
+msgstr "%s elementi non possono essere importati."
+
+#: Controller/AttributesController.php:883;931;933
+#: Controller/ShadowAttributesController.php:829
+msgid "Invalid attribute."
+msgstr "Attributo non valido."
+
+#: Controller/AttributesController.php:927
+msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
+msgstr "L'attributo non può essere salvato: quello incluso nella richiesta non è più aggiornato della copia locale."
+
+#: Controller/AttributesController.php:960
 msgid "The attribute has been saved"
 msgstr "L'attributo è stato salvato"
 
-#: Controller/AttributesController.php:985
+#: Controller/AttributesController.php:995
 msgid "The attribute could not be saved. Please, try again."
 msgstr "L'attributo non può essere salvato. Si prega di riprovare."
 
-#: Controller/AttributesController.php:1076
+#: Controller/AttributesController.php:1087
 msgid "Invalid event id."
 msgstr "ID evento non valido."
 
-#: Controller/AttributesController.php:1106
-#: Controller/EventsController.php:2023
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
+#: Controller/ShadowAttributesController.php:729
 msgid "Invalid input."
 msgstr "Inserimento non valido."
 
-#: Controller/AttributesController.php:1111
+#: Controller/AttributesController.php:1122
 msgid "Invalid field."
 msgstr "Campo non valido."
 
-#: Controller/AttributesController.php:1156
+#: Controller/AttributesController.php:1167
 msgid "Invalid attribute id."
 msgstr "ID attributo non valido."
 
-#: Controller/AttributesController.php:1231;1241
+#: Controller/AttributesController.php:1242;1252
 msgid "Attribute deleted"
 msgstr "Attributo eliminato"
 
-#: Controller/AttributesController.php:1236;1238
+#: Controller/AttributesController.php:1247;1249
 msgid "Attribute was not deleted"
 msgstr "L'attributo non è stato eliminato"
 
-#: Controller/AttributesController.php:1263;3155
-#: Controller/ShadowAttributesController.php:864
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
 msgid "Invalid Attribute"
 msgstr "Attributo non valido"
 
-#: Controller/AttributesController.php:1290
+#: Controller/AttributesController.php:1301
 msgid "Could not restore the attribute"
 msgstr "Impossibile ripristinare l'attributo"
 
-#: Controller/AttributesController.php:1311;1318;1322
+#: Controller/AttributesController.php:1322;1329;1333
 msgid "Attribute not found or not authorised."
 msgstr "Attributo non trovato o utente non autorizzato."
 
-#: Controller/AttributesController.php:1372
+#: Controller/AttributesController.php:1383
 msgid "This function is only accessible via POST requests."
 msgstr "Questa funzione è accessibile solo via richieste POST."
 
-#: Controller/AttributesController.php:1427
+#: Controller/AttributesController.php:1438
 msgid "No matching attributes found."
 msgstr "Nessun attributo corrispondente trovato."
 
-#: Controller/AttributesController.php:1461
+#: Controller/AttributesController.php:1472
 msgid "This method can only be accessed via AJAX."
 msgstr "Questo metodo è accessibile solo via richiesta AJAX."
 
-#: Controller/AttributesController.php:1472
+#: Controller/AttributesController.php:1482
 msgid "You are not authorized to edit this event."
 msgstr "Non sei autorizzato a modificare questo evento."
 
-#: Controller/AttributesController.php:1537
+#: Controller/AttributesController.php:1580
 msgid "No event ID provided."
 msgstr "Nessun ID evento fornito."
 
-#: Controller/AttributesController.php:1640
-msgid "Invalid tag"
-msgstr "Tag non valido"
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
+msgid "Synonyms: "
+msgstr ""
 
-#: Controller/AttributesController.php:2107;2282;2391;2441;2524;2610
-#: Controller/EventsController.php:2484;2600;2662;2720;3079;3301;3993;4011
-msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
-msgstr "Questa chiave di autenticazione non è autorizzata ad essere utilizzata per export dati. Contattare l'amministratore."
-
-#: Controller/AttributesController.php:2112;2277;2384
-#: Controller/EventsController.php:3084
+#: Controller/AttributesController.php:1997;2104
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr "Non sei autorizzato. Si prega di inviare lo header Autorization con la propria chiave di autenticazione insieme ad un header Accept per mime application/xml."
 
-#: Controller/AttributesController.php:2123
-msgid "Content type and parameter mismatch. Expecting JSON."
-msgstr "Tipo di contenuto e parametro non corrispondenti. Atteso JSON."
-
-#: Controller/AttributesController.php:2128
-msgid "Content type and parameter mismatch. Expecting XML."
-msgstr "Tipo di contenuto e parametro non corrispondenti. Atteso XML."
-
-#: Controller/AttributesController.php:2132;2290
+#: Controller/AttributesController.php:2010
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
 msgstr "Specificare i termini di ricerca nella URL o effettuare una POST di un array JSON/XML (con l'elemento root \"request\" e specificando i corretti header accept e content type)."
 
-#: Controller/AttributesController.php:2310
+#: Controller/AttributesController.php:2030
 msgid "You don't have access to that event."
 msgstr "Non hai accesso a quell'evento."
 
-#: Controller/AttributesController.php:2373
+#: Controller/AttributesController.php:2093
 msgid "No matches."
 msgstr "Nessuna corrispondenza."
 
-#: Controller/AttributesController.php:2395;2404
+#: Controller/AttributesController.php:2115;2124
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Attributo invalido oppure non autorizzato a visualizzarlo."
 
-#: Controller/AttributesController.php:2445;2528;2614
-#: Controller/EventsController.php:2488;2605;2667;2724;3305;3997;4015
-msgid "You have to be logged in to do that."
-msgstr "Devi essere autenticato per farlo."
-
-#: Controller/AttributesController.php:2472
+#: Controller/AttributesController.php:2192
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
 msgstr "Specificare i termini di ricerca nella url o via richiesta POST di un array json/xml (con l'elemento radice \"request\" e specificando le corrette intestazioni in base al tipo di contenuto)."
 
-#: Controller/AttributesController.php:2536
+#: Controller/AttributesController.php:2256
 msgid "Invalid event ID format."
 msgstr "Formato ID evento non valido."
 
-#: Controller/AttributesController.php:2645
+#: Controller/AttributesController.php:2365
 #: Controller/ShadowAttributesController.php:1254
 msgid "All done. "
 msgstr "Fatto. "
 
-#: Controller/AttributesController.php:2677;2724
+#: Controller/AttributesController.php:2397;2444
 #: Controller/ShadowAttributesController.php:1062
 msgid "Invalid field requested."
 msgstr "Campo richiesto non valido."
 
-#: Controller/AttributesController.php:2680;2727
+#: Controller/AttributesController.php:2400;2447
 msgid "This function can only be accessed via AJAX."
 msgstr "Questa funzione è accessibile solo tramite AJAX."
 
-#: Controller/AttributesController.php:2792;2800
-#: Controller/EventsController.php:3689;3967
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "Evento non trovato o non si dispone dei permessi per creare attributi"
 
-#: Controller/AttributesController.php:2821
+#: Controller/AttributesController.php:2541
 msgid "This action can only be accessed via AJAX."
 msgstr "Questo metodo è accessibile solo via richiesta AJAX."
 
-#: Controller/AttributesController.php:2830;3081;3095;3106
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
 msgid "You are not authorised to do that."
 msgstr "Non sei autorizzato a farlo."
 
-#: Controller/AttributesController.php:2935
-#: Controller/EventsController.php:4431
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
 msgid "This functionality requires API key access."
 msgstr "Questa funzionalità richiede accesso con chiave API."
 
-#: Controller/AttributesController.php:2943
+#: Controller/AttributesController.php:2663
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr "Questo metodo è solo per il sistema API. Si prega di consultare la pagina dedicata all'automazione per informazioni su come usarlo."
 
-#: Controller/AttributesController.php:2955
+#: Controller/AttributesController.php:2675
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "Nessun hash o ID evento ricevuto. È necessario impostare almeno uno dei due."
 
-#: Controller/AttributesController.php:3116
+#: Controller/AttributesController.php:2836
 msgid "Invalid script."
 msgstr "Script non valido."
 
-#: Controller/AttributesController.php:3181
+#: Controller/AttributesController.php:2901
 msgid "No valid enrichment options found for this attribute."
 msgstr "Nessuna opzione di enrichment trovata per questo attributo."
 
-#: Controller/AttributesController.php:3245
+#: Controller/AttributesController.php:2964
 msgid "Invalid type requested."
 msgstr "Tipo richiesto non valido."
 
-#: Controller/AttributesController.php:3476
-#: Controller/EventsController.php:5209
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "Disabilitare la correlazione non è consentito su questa istanza."
 
-#: Controller/AttributesController.php:3480;3495
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3243;3258
+#: Controller/ShadowAttributesController.php:677
 msgid "Invalid Attribute."
 msgstr "Attributo non valido."
 
-#: Controller/AttributesController.php:3483;3498
-#: Controller/EventsController.php:5216;5230
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
 msgid "You don't have permission to do that."
 msgstr "Non hai il permesso per farlo."
 
@@ -288,254 +301,286 @@ msgstr "Non hai il permesso per farlo."
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "Il blacklist degli eventi non è al momento abilitato su questa istanza."
 
-#: Controller/EventsController.php:804
+#: Controller/EventsController.php:848
 msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
 msgstr "Nessun certificato 0509 o chiave GnuPG configurate nel tuo profilo. Per ricevere le email, carica il tuo certificato pubblico o la chiave GnuPG nel tuo profilo."
 
-#: Controller/EventsController.php:806
+#: Controller/EventsController.php:850
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "Nessuna chiave GnuPG configurate nel tuo profilo. Per ricevere le email, carica la chiave pubblica nel tuo profilo."
 
-#: Controller/EventsController.php:812
+#: Controller/EventsController.php:856
 msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
 msgstr "Nessun certificato 0509 o chiave GnuPG configurate nel tuo profilo. Per ricevere gli attributi nelle email, carica il tuo certificato pubblico o la chiave GnuPG nel tuo profilo."
 
-#: Controller/EventsController.php:814
+#: Controller/EventsController.php:858
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr "Nessuna chiave GnuPG configurate nel tuo profilo. Per ricevere gli attributi nelle email, carica la chiave pubblica nel tuo profilo."
 
-#: Controller/EventsController.php:1527
+#: Controller/EventsController.php:1559
+msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
+msgstr ""
+
+#: Controller/EventsController.php:1769
 msgid "You don't have permissions to create events"
 msgstr "Non hai il permesso di creare eventi"
 
-#: Controller/EventsController.php:1533
+#: Controller/EventsController.php:1775
 msgid "No valid event data received."
 msgstr "Nessun dato evento valido ricevuto."
 
-#: Controller/EventsController.php:1569
+#: Controller/EventsController.php:1811
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "Sharing Group non valido o non autorizzato (l'utente di sincronizzazione non è incluso nello Sharing Group)."
 
-#: Controller/EventsController.php:1573;1577
+#: Controller/EventsController.php:1815;1819
 msgid "Invalid Sharing Group or not authorised."
 msgstr "Sharing Group non valido o non autorizzato."
 
-#: Controller/EventsController.php:1601
+#: Controller/EventsController.php:1843
 msgid "Event blocked by local blacklist."
 msgstr "Evento bloccato dalla blacklist locale."
 
-#: Controller/EventsController.php:1614;1693;1955
+#: Controller/EventsController.php:1856;1933;2197
 msgid "The event has been saved"
 msgstr "L'evento è stato salvato"
 
-#: Controller/EventsController.php:1622
+#: Controller/EventsController.php:1864
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "Evento già esistente, se desideri modificarlo, utilizzare la URLnelle intestazioni."
 
-#: Controller/EventsController.php:1633
+#: Controller/EventsController.php:1870
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "Una voce di blacklist sta bloccando la creazione di ogni evento. Si prega di contattare l'amministratore dell'istanza"
 
-#: Controller/EventsController.php:1635;1958
+#: Controller/EventsController.php:1872;2200
 msgid "The event could not be saved. Please, try again."
 msgstr "L'evento non può essere salvato. Si prega di riprovare."
 
-#: Controller/EventsController.php:1719
+#: Controller/EventsController.php:1912
+msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
+msgstr ""
+
+#: Controller/EventsController.php:1959
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "Puoi caricare solo report MISP in formato XML o JSON."
 
-#: Controller/EventsController.php:1720
+#: Controller/EventsController.php:1960
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "Caricamento file fallito o il file non ha l'estensione attesa (.xml/ .json)."
 
-#: Controller/EventsController.php:1768
+#: Controller/EventsController.php:2009
 msgid "STIX document imported, event's created: "
 msgstr "Il file STIX è stato importato, sono stati creati i seguenti eventi: "
 
-#: Controller/EventsController.php:1771
+#: Controller/EventsController.php:2012
 msgid "STIX document imported."
 msgstr "Il file STIX è stato importato importato."
 
-#: Controller/EventsController.php:1774
+#: Controller/EventsController.php:2015
 msgid "Could not import STIX document: "
 msgstr "Impossibile importare il file STIX: "
 
-#: Controller/EventsController.php:1781
+#: Controller/EventsController.php:2022
 msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
 msgstr "Caricamento del file fallito. Controlla di aver selezione un file stix da caricare e che non superi la grandezza massima di "
 
-#: Controller/EventsController.php:1805;1890
+#: Controller/EventsController.php:2046;2131
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "Non sei autorizzato a farlo. Si prega di considerare l'opportunità di usare la funzionalità 'proponi attributi'."
 
-#: Controller/EventsController.php:1813
+#: Controller/EventsController.php:2054
 msgid "Invalid event ID entered."
 msgstr "ID evento non valido."
 
-#: Controller/EventsController.php:1818
+#: Controller/EventsController.php:2059
 msgid "You are not authorised to read the selected event."
 msgstr "Non sei autorizzato a visualizzare l'evento."
 
-#: Controller/EventsController.php:2109;2172
+#: Controller/EventsController.php:2349;2387;2450
 msgid "You don't have the permission to do that."
 msgstr "Non hai l'autorizzazione per farlo."
 
-#: Controller/EventsController.php:2259
+#: Controller/EventsController.php:2358
+msgid "Event unpublished."
+msgstr ""
+
+#: Controller/EventsController.php:2537
 msgid "Email sent to the reporter."
 msgstr "Email inviata al segnalante."
 
-#: Controller/EventsController.php:2261
+#: Controller/EventsController.php:2539
 msgid "Sending of email failed"
 msgstr "Invio email fallito"
 
-#: Controller/EventsController.php:2397
+#: Controller/EventsController.php:2678
 msgid "This feature is currently disabled"
 msgstr "Questa funzionalità è al momento disabilitata"
 
-#: Controller/EventsController.php:2439;4025
+#: Controller/EventsController.php:2720;3986
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
 msgstr "Specificare i termini di ricerca nella URL o effettuare una POST di un XML (con l'elemento root \"request\")."
 
-#: Controller/EventsController.php:2475
+#: Controller/EventsController.php:2756
 msgid "Invalid Event ID."
 msgstr "ID evento non valido."
 
-#: Controller/EventsController.php:2522
+#: Controller/EventsController.php:2803
 msgid "No events found that match the passed parameters."
 msgstr "Nessun evento trovato corrispondente ai parametri inviati."
 
-#: Controller/EventsController.php:2547
+#: Controller/EventsController.php:2828
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
 msgstr "Specificare i termini di ricerca nella URL o postare un json/xml con i parametri di filtraggio. Filtri validi: id (ID evento), tags (lista di tag), from (data in formato YYYY-MM-DD), to (data in formato YYYY-MM-DD), last (eventi con una data di pubblicazione successiva a - opzioni valide in formato time + fino a in formato 6d o 2w, ecc...)"
 
-#: Controller/EventsController.php:2622;2684
+#: Controller/EventsController.php:2903
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
 msgstr "Specificare i termini di ricerca nella URL o postare un json o un xml con i parametri di filtro."
 
-#: Controller/EventsController.php:2641
-#: Model/Attribute.php:1927
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
 msgid "Invalid hash type."
 msgstr "Tipo hash non valido."
 
-#: Controller/EventsController.php:2871
+#: Controller/EventsController.php:3025
 msgid "Filename not allowed."
 msgstr "Nome file non consentito."
 
-#: Controller/EventsController.php:2892
+#: Controller/EventsController.php:3045
 msgid "Problem with writing the ioc file. Please report to administrator."
 msgstr "Problemi nella scrittura del file degli IoC. Si prega di riportarlo all'amministratore."
 
-#: Controller/EventsController.php:2986
+#: Controller/EventsController.php:3139
 msgid "This is not a valid MISP XML file."
 msgstr "File MISP XML non valido."
 
-#: Controller/EventsController.php:3101
-msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type)."
-msgstr "Specificare i termini di ricerca nella URL o effettuare una POST di un array JSON/XML (con l'elemento root \"request\" e specificando i corretti header accept e contenty type)."
-
-#: Controller/EventsController.php:3294
+#: Controller/EventsController.php:3291
 msgid "Not yet implemented"
 msgstr "Non ancora implementato"
 
-#: Controller/EventsController.php:3312;3316
+#: Controller/EventsController.php:3309;3313
 msgid "Invalid event or not authorised."
 msgstr "Evento non valido o utente non autorizzato."
 
-#: Controller/EventsController.php:3336;3406
+#: Controller/EventsController.php:3333;3403
 msgid "You don't have the privileges to access this."
 msgstr "Non hai i privilegi di accesso a questo."
 
-#: Controller/EventsController.php:3920
-msgid "Could not add tags."
-msgstr "Impossibile aggiungere tag."
+#: Controller/EventsController.php:3610
+#: Controller/TagCollectionsController.php:307
+msgid "Invalid Tag."
+msgstr ""
 
-#: Controller/EventsController.php:3971;5055
-#: Controller/ObjectsController.php:46;140;144;438
+#: Controller/EventsController.php:3626
+#: Controller/TagCollectionsController.php:323
+msgid "Tag is already attached to this event."
+msgstr ""
+
+#: Controller/EventsController.php:3637;3643
+#: Controller/TagCollectionsController.php:330
+msgid "Tag(s) added."
+msgstr ""
+
+#: Controller/EventsController.php:3639
+msgid "Tag could not be added."
+msgstr ""
+
+#: Controller/EventsController.php:3645
+#: Controller/TagCollectionsController.php:338
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
 msgid "Invalid event."
 msgstr "Evento non valido."
 
-#: Controller/EventsController.php:4085;4115;4131
+#: Controller/EventsController.php:3918
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
+msgstr ""
+
+#: Controller/EventsController.php:4049;4079;4095
 msgid "You do not have the permission to do that."
 msgstr "Non hai l'autorizzazione per farlo."
 
-#: Controller/EventsController.php:4196;4334
+#: Controller/EventsController.php:4160;4300
 msgid "Invalid ID"
 msgstr "ID invalido"
 
-#: Controller/EventsController.php:4200;4338
+#: Controller/EventsController.php:4164;4304
 msgid "Event not found or you are not authorised to view it."
 msgstr "Evento non valido o non sei autorizzato a visualizzarlo."
 
-#: Controller/EventsController.php:4434;4441
+#: Controller/EventsController.php:4405;4412
 msgid "Please POST the samples as described on the automation page."
 msgstr "Si prega di effettuare una richiesta POST come descritto nella pagina per l'automazione."
 
-#: Controller/EventsController.php:4470
+#: Controller/EventsController.php:4441
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr "Nessun campione ricevuto, o non nel corretto formato. Si prega di consultare la documentazione API della pagina per l'automazione."
 
-#: Controller/EventsController.php:4478
+#: Controller/EventsController.php:4449
 msgid "Event not found"
 msgstr "Evento non trovato"
 
-#: Controller/EventsController.php:4501
+#: Controller/EventsController.php:4472
 msgid "Event not found."
 msgstr "Evento non trovato."
 
-#: Controller/EventsController.php:4511
+#: Controller/EventsController.php:4482
 msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
 msgstr "Il livello di distribuzione a 5 non è supportato quando si carica un campione senza specificare un ID evento. Il livello di distribuzione 5 è destinato ad essere applicato ad eventi esistenti."
 
-#: Controller/EventsController.php:4536
+#: Controller/EventsController.php:4507
 msgid "The creation of a new event with the supplied information has failed."
 msgstr "La creazione di un nuovo evento con le informazioni fornite è fallita."
 
-#: Controller/EventsController.php:4671;4693;4722;4747;4772;4802;4823
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
 msgid "Invalid type."
 msgstr "Tipo non valido."
 
-#: Controller/EventsController.php:4866
+#: Controller/EventsController.php:4906
 msgid "Invalid method."
 msgstr "Metodo invalido."
 
-#: Controller/EventsController.php:4946
+#: Controller/EventsController.php:4989
 msgid "%s services are not enabled."
 msgstr "I servizi %s non sono abilitati."
 
-#: Controller/EventsController.php:4950
+#: Controller/EventsController.php:4993
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "Attributo non trovato o non si è autorizzati alla sua visualizzazione."
 
-#: Controller/EventsController.php:4956
+#: Controller/EventsController.php:4999
 msgid "No valid %s options found for this attribute."
 msgstr "Nessuna opzione %s valida trovata per questo attributo."
 
-#: Controller/EventsController.php:4973
+#: Controller/EventsController.php:5016
 msgid "no valid %s options found for this attribute."
 msgstr "nessuna opzione %s valida trovata per questo attributo."
 
-#: Controller/EventsController.php:4995
+#: Controller/EventsController.php:5038
 msgid "%s service not reachable."
 msgstr "Servizio %s non raggiungibile."
 
-#: Controller/EventsController.php:5007
+#: Controller/EventsController.php:5050
 msgid ": Enriched via the %s"
 msgstr ": Arricchito tramite %s"
 
-#: Controller/EventsController.php:5136
+#: Controller/EventsController.php:5184
 msgid "Import service not reachable."
 msgstr "Servizio Import non raggiungibile."
 
-#: Controller/EventsController.php:5303
+#: Controller/EventsController.php:5351
 msgid "Invalid ID."
 msgstr "ID non valido."
 
-#: Controller/EventsController.php:5351
-#: Controller/ShadowAttributesController.php:312;317;534
+#: Controller/EventsController.php:5399
+#: Controller/ShadowAttributesController.php:311;316;532
 msgid "Invalid Event"
 msgstr "Evento non valido"
 
-#: Controller/EventsController.php:5369
+#: Controller/EventsController.php:5420
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "Processo di arricchimento creato in backgroud. Controlla più tardi l'esito dell'operazione."
 
@@ -543,122 +588,138 @@ msgstr "Processo di arricchimento creato in backgroud. Controlla più tardi l'es
 msgid "You don't have the required privileges to do that."
 msgstr "Non hai i privilegi richiesti per farlo."
 
-#: Controller/FeedsController.php:193;291
+#: Controller/FeedsController.php:205;303
 msgid "Feed added."
 msgstr "Feed inserito."
 
-#: Controller/FeedsController.php:201
+#: Controller/FeedsController.php:213
 msgid "Feed could not be added. Invalid field: %s"
 msgstr "Il feed non può essere inserito perchè contiene i seguenti campi non validi: %s"
 
-#: Controller/FeedsController.php:226;326;348;470;502;682
+#: Controller/FeedsController.php:238;338;360;482;517;721
 msgid "Invalid feed."
 msgstr "Feed non valido."
 
-#: Controller/FeedsController.php:299
+#: Controller/FeedsController.php:311
 msgid "Feed could not be updated. Invalid fields: %s"
 msgstr "Il feed non può essere aggiornato perchè contiene i seguenti campi non validi: %s"
 
-#: Controller/FeedsController.php:322
+#: Controller/FeedsController.php:334
 msgid "This action requires a post request."
 msgstr "Questa azione richiede una richiesta POST."
 
-#: Controller/FeedsController.php:355;474
+#: Controller/FeedsController.php:367;486
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "Il feed è disabilitato al momento. Assicurarsi di abilitarlo."
 
-#: Controller/FeedsController.php:368;434
+#: Controller/FeedsController.php:380;446
 msgid "Starting fetch from Feed."
 msgstr "Avvia recupero dati dal Feed."
 
-#: Controller/FeedsController.php:379
+#: Controller/FeedsController.php:391
 msgid "Pull queued for background execution."
 msgstr "Pull messo in coda per esecuzione in background."
 
-#: Controller/FeedsController.php:384;386
+#: Controller/FeedsController.php:396;398
 msgid "Fetching the feed has failed."
 msgstr "Recupero dati dal feed fallita."
 
-#: Controller/FeedsController.php:390
+#: Controller/FeedsController.php:402
 msgid "Fetching the feed has successfuly completed."
 msgstr "Recupero dati dal feed terminato con successo."
 
-#: Controller/FeedsController.php:451
+#: Controller/FeedsController.php:463
 msgid "Fetching the feed has successfully completed."
 msgstr "Recupero dati dal feed terminato con successo."
 
-#: Controller/FeedsController.php:481
+#: Controller/FeedsController.php:493
 msgid "Event added."
 msgstr "Evento aggiunto."
 
-#: Controller/FeedsController.php:484
+#: Controller/FeedsController.php:496
 msgid "Event already up to date."
 msgstr "Evento già aggiornato."
 
-#: Controller/FeedsController.php:486
+#: Controller/FeedsController.php:498
 msgid "Event updated."
 msgstr "Evento aggiornato."
 
-#: Controller/FeedsController.php:490
+#: Controller/FeedsController.php:502
 msgid "Could not %s event."
 msgstr "Impossibile %s l'evento."
 
-#: Controller/FeedsController.php:493
+#: Controller/FeedsController.php:505
 msgid "Download failed."
 msgstr "Download fallito."
 
-#: Controller/FeedsController.php:561
+#: Controller/FeedsController.php:597
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "Impossibile recuperare dati dal feed. L'errore HTTP di risposta è: "
 
-#: Controller/FeedsController.php:600;651
+#: Controller/FeedsController.php:636;687
 msgid "Invalid feed type."
 msgstr "Tipo feed non valido."
 
-#: Controller/FeedsController.php:714
+#: Controller/FeedsController.php:753
 msgid "This event is blocked by the Feed filters."
 msgstr "Questo evento è bloccato dai filtri Feed."
 
-#: Controller/FeedsController.php:716
+#: Controller/FeedsController.php:755
 msgid "Could not download the selected Event"
 msgstr "Impossibile scaricare l'evento selezionato"
 
-#: Controller/FeedsController.php:752;756
+#: Controller/FeedsController.php:791;795
 msgid "Invalid Feed."
 msgstr "Feed non valido."
 
-#: Controller/FeedsController.php:777
+#: Controller/FeedsController.php:816
 msgid "Only POST requests are allowed."
 msgstr "Sono ammesse solo richiesta POST."
 
-#: Controller/FeedsController.php:781
+#: Controller/FeedsController.php:820
 msgid "Feed not found."
 msgstr "File non trovato."
 
-#: Controller/FeedsController.php:790
+#: Controller/FeedsController.php:829
 msgid "Data pulled."
 msgstr "Dati estratti."
 
-#: Controller/FeedsController.php:792
+#: Controller/FeedsController.php:831
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "Impossibile estrarre i dati selezionati. Motivo: %s"
 
-#: Controller/FeedsController.php:809
+#: Controller/FeedsController.php:848
 msgid "Starting feed caching."
 msgstr "Avviato il caching del feed."
 
-#: Controller/FeedsController.php:824
+#: Controller/FeedsController.php:863
 msgid "Caching the feeds has failed."
 msgstr "Caching dei feed fallito."
 
-#: Controller/FeedsController.php:827
+#: Controller/FeedsController.php:866
 msgid "Caching the feeds has successfully completed."
 msgstr "Il caching dei feed è stato completato con successo."
 
-#: Controller/FeedsController.php:858
+#: Controller/FeedsController.php:900
 msgid "Invalid feed list received."
 msgstr "Ricevuta lista feed invalida."
 
+#: Controller/GalaxiesController.php:92
+msgid "All clusters"
+msgstr "Tutti i clusters"
+
+#: Controller/GalaxiesController.php:135
+msgid "All namespaces"
+msgstr ""
+
+#: Controller/GalaxiesController.php:250
+msgid "Failed to parse request."
+msgstr ""
+
+#: Controller/GalaxiesController.php:253
+msgid "No clusters picked."
+msgstr ""
+
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr "Tutti i processi completati sono stati eliminati"
@@ -671,11 +732,23 @@ msgstr "Tutti i processi sono stati eliminati"
 msgid "Invalid object"
 msgstr "Oggetto non valido"
 
-#: Controller/ObjectReferencesController.php:187
+#: Controller/ObjectReferencesController.php:188
 msgid "Invalid object reference"
 msgstr "Riferimento oggetto non valido"
 
-#: Controller/ObjectTemplatesController.php:88
+#: Controller/ObjectTemplatesController.php:31
+msgid "All Objects"
+msgstr "Tutti gli oggetti"
+
+#: Controller/ObjectTemplatesController.php:99
+msgid "Invalid object template"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:103
+msgid "Invalid object template id."
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
 msgstr "ObjectTemplate cancellato"
 
@@ -696,23 +769,23 @@ msgstr "Non hai i permessi per creare oggetti."
 msgid "Invalid template."
 msgstr "Template non valido."
 
-#: Controller/ObjectsController.php:303
+#: Controller/ObjectsController.php:311
 msgid "You don't have permissions to edit objects."
 msgstr "Non hai i permessi per modificare oggetti."
 
-#: Controller/ObjectsController.php:317;328;427
+#: Controller/ObjectsController.php:325;336;439
 msgid "Invalid object."
 msgstr "Oggetto non valido."
 
-#: Controller/ObjectsController.php:421
+#: Controller/ObjectsController.php:433
 msgid "You don't have permissions to delete objects."
 msgstr "Non hai i permessi per cancellare oggetti."
 
-#: Controller/ObjectsController.php:531;538;542
+#: Controller/ObjectsController.php:543;550;554
 msgid "Object not found or not authorised."
 msgstr "Oggetto non trovato o non autorizzato."
 
-#: Controller/ObjectsController.php:799
+#: Controller/ObjectsController.php:811
 msgid "%s objects successfully reconstructed."
 msgstr "%s gli oggetti sono stati ricostruiti correttamente."
 
@@ -776,123 +849,147 @@ msgstr "La regola non può essere salvata. Riprova."
 msgid "Role deleted"
 msgstr "Ruolo cancellato"
 
-#: Controller/ServersController.php:204;394
+#: Controller/ServersController.php:226;417
 msgid "The pull filter rules must be in valid JSON format."
 msgstr "Le regole del filtro pull devono essere in formato JSON valido."
 
-#: Controller/ServersController.php:214;404
+#: Controller/ServersController.php:236;427
 msgid "The push filter rules must be in valid JSON format."
 msgstr "Le regole del filtro push devono essere in formato JSON valido."
 
-#: Controller/ServersController.php:268;434
+#: Controller/ServersController.php:291;457
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr "L'organizzazione non può essere creata in quanto l'Uuid è già in uso."
 
-#: Controller/ServersController.php:280
+#: Controller/ServersController.php:303
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format? Also, make sure the organisation's name doesn't clash with an existing one."
 msgstr "La nuova organizzazione non puo essere salvata, sei sicuro che l'uuid è del formato corretto? Controlla che non esista già un organizzazione con lo stesso nome."
 
-#: Controller/ServersController.php:309;490
+#: Controller/ServersController.php:332;513
 msgid "The server has been saved"
 msgstr "Server salvato"
 
-#: Controller/ServersController.php:316;497
+#: Controller/ServersController.php:339;520
 msgid "The server could not be saved. Please, try again."
 msgstr "Il server non è stato salvato. Si prega di riprovare."
 
-#: Controller/ServersController.php:369;565;590;598;659;1412
+#: Controller/ServersController.php:392;589;614;623;683;1360
 msgid "Invalid server"
 msgstr "Server non valido"
 
-#: Controller/ServersController.php:451
+#: Controller/ServersController.php:474
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr "Impossibile salvare la nuova organizzazione, sicuro che il Uuid sia nel corretto formato?."
 
-#: Controller/ServersController.php:572
+#: Controller/ServersController.php:596
 msgid "Server deleted"
 msgstr "Server cancellato"
 
-#: Controller/ServersController.php:575
+#: Controller/ServersController.php:599
 msgid "Server was not deleted"
 msgstr "Server non cancellato"
 
-#: Controller/ServersController.php:602
+#: Controller/ServersController.php:626
 msgid "Pull setting not enabled for this server."
 msgstr "Settaggi Pull non abilitati per questo server."
 
-#: Controller/ServersController.php:611
-msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
-msgstr "Non autorizzato. Può essere dovuto ad una chiave API non valida, o perché l'utente per la sincronizzazione non ha abilitati i permessi per accedere al server remoto. Un'altra ragione può essere l'errato settaggio della sincronizzazione del server."
+#: Controller/ServersController.php:659
+msgid "Pull queued for background execution. Job ID: %s"
+msgstr ""
 
-#: Controller/ServersController.php:1309
+#: Controller/ServersController.php:696
+msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
+msgstr ""
+
+#: Controller/ServersController.php:709
+msgid "Push complete. %s events pushed, %s events could not be pushed."
+msgstr ""
+
+#: Controller/ServersController.php:734
+msgid "Push queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:1257
 msgid "File not found."
 msgstr "File non trovato."
 
-#: Controller/ServersController.php:1315
+#: Controller/ServersController.php:1263
 msgid "File could not be deleted."
 msgstr "Il file non può essere cancellato."
 
-#: Controller/ServersController.php:1338;1354
+#: Controller/ServersController.php:1286;1302
 msgid "Upload failed."
 msgstr "Caricamento fallito."
 
-#: Controller/ServersController.php:1346
+#: Controller/ServersController.php:1294
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "File già esistente. Se lo si vuole sostituire, prima rimuovere il vecchio file."
 
-#: Controller/ShadowAttributesController.php:212
+#: Controller/ServersController.php:1748
+msgid "Starting server caching."
+msgstr ""
+
+#: Controller/ServersController.php:1763
+msgid "Caching the servers has failed."
+msgstr ""
+
+#: Controller/ServersController.php:1766
+msgid "Caching the servers has successfully completed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:211
 msgid "Moving of the file that this attachment references failed."
 msgstr "Spostamento del file che si riferisce a questo allegato fallito."
 
-#: Controller/ShadowAttributesController.php:280
+#: Controller/ShadowAttributesController.php:279
 msgid "Could not discard proposal."
 msgstr "Impossibile scartare la proposta."
 
-#: Controller/ShadowAttributesController.php:341
+#: Controller/ShadowAttributesController.php:340
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr "Attributo non aggiunto: gli allegati sono aggiunti con il tasto \"Aggiungi allegato\""
 
-#: Controller/ShadowAttributesController.php:389;392;401
+#: Controller/ShadowAttributesController.php:388;391;400
 msgid "The lines"
 msgstr "Le linee"
 
-#: Controller/ShadowAttributesController.php:441
+#: Controller/ShadowAttributesController.php:440
 msgid "The proposal has been saved"
 msgstr "La proposta è stata salvata"
 
-#: Controller/ShadowAttributesController.php:453;763
+#: Controller/ShadowAttributesController.php:452;761
 msgid "Could not save the proposal. Errors: %s"
 msgstr "Impossibile salvare la proposta. Errore: %s"
 
-#: Controller/ShadowAttributesController.php:455
+#: Controller/ShadowAttributesController.php:454
 msgid "The proposal could not be saved. Please, try again."
 msgstr "La proposta non puo essere salvata. Riprova."
 
-#: Controller/ShadowAttributesController.php:492
+#: Controller/ShadowAttributesController.php:491
 msgid "Invalid Proposal"
 msgstr "Proposta non valida"
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:521
 msgid "Proposal not an attachment or malware-sample"
 msgstr "La proposta non è un allegato o un campione malware"
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:617
 msgid "The attachment has been uploaded"
 msgstr "L'allegato è stato caricato"
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:619
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr "L'allegato è stato caricato, ma alcuni attributi proposti non possono essere creati. Le proposte fallite sono: "
 
-#: Controller/ShadowAttributesController.php:624
+#: Controller/ShadowAttributesController.php:622
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr "Impossibile salvare l'allegato, si prega di contattare l'amministratore."
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:752
 msgid "The proposed Attribute has been saved"
 msgstr "L'attributo proposto è stato salvato"
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:763
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr "Lo ShadowAttribute non può essere salvato. Si prega di riprovare."
 
@@ -924,6 +1021,86 @@ msgstr "Sharing Group cancellato"
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr "Lo Sharing Group non può essere cancellato. Assicurati che non ci siano eventi, attributi o discussioni appartenenti a questo Sharing Group."
 
+#: Controller/SightingsController.php:86
+msgid "Could not add the Sighting. Reason: "
+msgstr ""
+
+#: Controller/SightingsController.php:96;99
+msgid "Sighting added"
+msgstr ""
+
+#: Controller/SightingsController.php:152
+msgid "You are not authorised to remove sightings data as you don't have permission to modify your organisation's data."
+msgstr ""
+
+#: Controller/SightingsController.php:158
+msgid "Attribute not found"
+msgstr ""
+
+#: Controller/SightingsController.php:176
+msgid "Invalid request."
+msgstr ""
+
+#: Controller/SightingsController.php:185
+msgid "Sighting added."
+msgstr ""
+
+#: Controller/SightingsController.php:187
+msgid "Sighting could not be added"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:56;177
+msgid "The tag collection has been saved"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:64;185
+msgid "The tag collection could not be added. Reason: "
+msgstr ""
+
+#: Controller/TagCollectionsController.php:85
+msgid "%s new tag collections added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:154
+msgid "Invalid Tag Collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:161
+msgid "You don't have editing rights on this Tag Collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:201;380
+msgid "Invalid tag collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:207
+msgid "Tag collection deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:215
+msgid "Tag collection could not be deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:224
+msgid "You are not allowed to delete that."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:332
+msgid "Tag(s) could not be added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:384
+msgid "Insufficient privileges to remove the tag from the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:395
+msgid "Invalid tag or tag not associated with the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:399
+msgid "Failed to remove tag from the collection."
+msgstr ""
+
 #: Controller/TagsController.php:367
 msgid "Tag deleted"
 msgstr "Tag cancellato"
@@ -932,6 +1109,27 @@ msgstr "Tag cancellato"
 msgid "Tag was not deleted"
 msgstr "Tag non cancellato"
 
+#: Controller/TagsController.php:580
+msgid "Favourite Tags"
+msgstr ""
+
+#: Controller/TagsController.php:586
+msgid "Tag Collections"
+msgstr ""
+
+#: Controller/TagsController.php:591
+msgid "All Tags"
+msgstr ""
+
+#: Controller/TagsController.php:601
+#: View/Taxonomies/view.ctp:2
+msgid "Taxonomy Library"
+msgstr ""
+
+#: Controller/TagsController.php:756
+msgid "Includes: "
+msgstr ""
+
 #: Controller/TemplatesController.php:408
 msgid "Event populated, "
 msgstr "Evento popolato, "
@@ -940,15 +1138,15 @@ msgstr "Evento popolato, "
 msgid "Event populated, but "
 msgstr "Evento popolato, ma "
 
-#: Controller/UsersController.php:42;221
+#: Controller/UsersController.php:42;247
 msgid "Invalid user or not authorised."
 msgstr "Utente non valido o non autorizzato."
 
-#: Controller/UsersController.php:54;430;657;907
+#: Controller/UsersController.php:54;456;683;929
 msgid "Invalid user"
 msgstr "Utente non valido"
 
-#: Controller/UsersController.php:119;564;728
+#: Controller/UsersController.php:119;590;754
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr "Dominio e-mail non valido. Il tuo utente può creare nuove utenze per i seguenti domini: "
 
@@ -960,59 +1158,75 @@ msgstr "Il profilo è stato aggiornato"
 msgid "The profile could not be updated. Please, try again."
 msgstr "Non è stato possibile aggiornare il profilo. Si prega di riprovare."
 
-#: Controller/UsersController.php:198
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
 msgid "Password Changed."
 msgstr "Password modificata."
 
-#: Controller/UsersController.php:203
+#: Controller/UsersController.php:222
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "La password potrebbe non essere aggiornata. Assicurarsi di soddisfare la lunghezza minima della password ed i requisiti di complessità."
 
-#: Controller/UsersController.php:575
+#: Controller/UsersController.php:601
 msgid "The user could not be saved. Invalid organisation."
 msgstr "L'utente non può essere salvato. Organizzazione non valida."
 
-#: Controller/UsersController.php:597
+#: Controller/UsersController.php:623
 msgid "The user has been saved."
 msgstr "L'utente è stato salvato."
 
-#: Controller/UsersController.php:606;843
+#: Controller/UsersController.php:632;865
 msgid "The user could not be saved. Please, try again."
 msgstr "L'utente non può essere salvato. Si prega di riprovare."
 
-#: Controller/UsersController.php:835
+#: Controller/UsersController.php:857
 msgid "The user has been saved"
 msgstr "L'utente è stato salvato"
 
-#: Controller/UsersController.php:915
+#: Controller/UsersController.php:937
 msgid "User deleted"
 msgstr "Utente cancellato"
 
-#: Controller/UsersController.php:919
+#: Controller/UsersController.php:941
 msgid "User was not deleted"
 msgstr "Utente non cancellato"
 
-#: Controller/UsersController.php:997
+#: Controller/UsersController.php:1019
 msgid "Invalid username or password, try again"
 msgstr "Nome utente o password non validi, riprovare"
 
-#: Controller/UsersController.php:1080
+#: Controller/UsersController.php:1106
 msgid "Good-Bye"
 msgstr "Arrivederci"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1147
 msgid "New authkey generated."
 msgstr "Nuova chiave API generata."
 
-#: Controller/UsersController.php:1230
+#: Controller/UsersController.php:1256
 msgid "You accepted the Terms and Conditions."
 msgstr "Hai accettato i Termini e le Condizioni."
 
-#: Controller/UsersController.php:1419
+#: Controller/UsersController.php:1438
+msgid "Recipient email not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1443
+msgid "Recipient organisation not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1480
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr "E-mail inviate, ma è fallito l'invio dei messaggi ai seguenti indirizzi: "
 
-#: Controller/UsersController.php:1421
+#: Controller/UsersController.php:1482
 msgid "E-mails sent."
 msgstr "E-mail inviate."
 
@@ -1040,972 +1254,1040 @@ msgstr "%s cancellato"
 msgid "%s was not deleted"
 msgstr "%s non è stato cancellato"
 
-#: Controller/Component/BlackListComponent.php:72
+#: Controller/Component/BlackListComponent.php:75
 msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
 msgstr "Fatto. Inseriti %d elementi alla blacklist. %d elementi non possono essere salvati."
 
-#: Controller/Component/BlackListComponent.php:123
+#: Controller/Component/BlackListComponent.php:126
 msgid "Blacklist item added."
 msgstr "Elemento aggiunto in Blacklist."
 
-#: Controller/Component/BlackListComponent.php:152
+#: Controller/Component/BlackListComponent.php:155
 msgid "Invalid blacklist entry"
 msgstr "Voce di blacklist non valida"
 
-#: Controller/Component/BlackListComponent.php:156
+#: Controller/Component/BlackListComponent.php:159
 msgid "Blacklist entry removed"
 msgstr "Voce di blacklist rimossa"
 
-#: Controller/Component/BlackListComponent.php:158
+#: Controller/Component/BlackListComponent.php:161
 msgid "Could not remove the blacklist entry"
 msgstr "Non è possibile rimuovere la voce di blacklist"
 
-#: Model/Attribute.php:567
+#: Model/Attribute.php:591
 msgid "Composite type, but value not explodable"
 msgstr "Tipo composto, ma valore non recuperabile"
 
-#: Model/Attribute.php:677
+#: Model/Attribute.php:703
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr "Cancellazione dell'allegato fallita. Si prega di segnalare all'amministratore."
 
-#: Model/Attribute.php:802
+#: Model/Attribute.php:828
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr "La stringa inserita è troppo lunga e potrebbe essere troncata. Si prega di considerare la possibilità di aggiungere i dati come allegato invece"
 
-#: Model/Attribute.php:921
+#: Model/Attribute.php:953
 msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "Il checksum ha una lunghezza o formato non validi (atteso: %s caratteri esadecimali). Si prega di ricontrollare il valore o selezionare il tipo \"altro\"."
 
-#: Model/Attribute.php:928
+#: Model/Attribute.php:960
 msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "Il checksum ha una lunghezza o formato non validi (atteso: almeno 35 caratteri esadecimali). Si prega di ricontrollare il valore o selezionare il tipo \"altro\"."
 
-#: Model/Attribute.php:935
+#: Model/Attribute.php:967
 msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr "L'input non corrisponde al formato atteso per sha1 (attesi: 40 caratteri esadecimali). Si ricordi che MISP al momento supporta solo SHA1 per i PEhashes, se si desidera il supporto esteso ad altri tipi di hash, assicurarsi di creare un ticket su github in tal proposito visitando https://github.com/MISP/MISP!"
 
-#: Model/Attribute.php:946
+#: Model/Attribute.php:978
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr "Hash SSDeep non valido. Il formato deve essere blocksize:hash:hash"
 
-#: Model/Attribute.php:957
+#: Model/Attribute.php:989
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr "Impfuzzy formato non valido. Il formato deve essere imports:hash:hash"
 
-#: Model/Attribute.php:972
+#: Model/Attribute.php:996
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:1011
 msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr "L'input non corrisponde al formato atteso per filename|sha1 (attesi: filename|40 caratteri esadecimali). Si ricordi che MISP al momento supporta solo SHA1 per i PEhashes, se si desidera il supporto esteso ad altri tipi di hash, assicurarsi di creare un ticket su github in tal proposito visitando https://github.com/MISP/MISP!"
 
-#: Model/Attribute.php:990
+#: Model/Attribute.php:1029
 msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "Il checksum ha una lunghezza o formato non validi (atteso: filename|%s caratteri esadecimali). Si prega di ricontrollare il valore o selezionare il tipo \"altro\"."
 
-#: Model/Attribute.php:995
+#: Model/Attribute.php:1034
 msgid "Invalid composite type. The format has to be %s."
 msgstr "Tipo composto non valido. Il formato deve essere %s."
 
-#: Model/Attribute.php:1006
+#: Model/Attribute.php:1045
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr "Hash SSDeep non valido (atteso: blocksize:hash:hash)."
 
-#: Model/Attribute.php:1014
+#: Model/Attribute.php:1053
 msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "Il checksum ha lunghezza o formato non valido (atteso: filename|almeno 35 caratteri esadecimali). Si prega di ricontrollare il valore o selezionare il tipo \"altro\"."
 
-#: Model/Attribute.php:1025
+#: Model/Attribute.php:1064
 msgid "Invalid CIDR notation value found."
 msgstr "Valore CIDR invalido trovato."
 
-#: Model/Attribute.php:1032;1083
+#: Model/Attribute.php:1071;1122
 msgid "IP address has an invalid format."
 msgstr "L'indirizzo IP ha un formato non valido."
 
-#: Model/Attribute.php:1037
+#: Model/Attribute.php:1076
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr "I numeri di porta devono essere interi positivi compresi fra 1 e 65535."
 
-#: Model/Attribute.php:1066
+#: Model/Attribute.php:1105
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr " nome ha un formato non valido. Ricontrollare il valore o selezionare il tipo \"altro\"."
 
-#: Model/Attribute.php:1086
+#: Model/Attribute.php:1125
 msgid "Domain name has an invalid format."
 msgstr "Il nome a dominio ha un formato invalido."
 
-#: Model/Attribute.php:1099
+#: Model/Attribute.php:1138
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr "L'indirizzo email ha un formato invalido. Ricontrollare il valore o selezionare il tipo \"altro\"."
 
-#: Model/Attribute.php:1107
+#: Model/Attribute.php:1146
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr "Formano invalido. Atteso: CVE-xxxx-xxxx..."
 
-#: Model/Attribute.php:1118
+#: Model/Attribute.php:1157
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr "Formato invalido. Sono valore inferiori a 256 caratteri che non includano alcun carattere slash o backslash."
 
-#: Model/Attribute.php:1230
+#: Model/Attribute.php:1272
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr "DateTime deve essere in formato ISO 8601."
 
-#: Model/Attribute.php:1236
+#: Model/Attribute.php:1278
 msgid "The value has to be a number greater or equal 0."
 msgstr "Il valore deve essere un numero superiore o uguale a 0."
 
-#: Model/Attribute.php:1243
+#: Model/Attribute.php:1285
 msgid "The value has to be a number between 0 and 10."
 msgstr "Il valore deve essere un numero compreso tra 0 e 10."
 
-#: Model/Attribute.php:1923;1991
+#: Model/Attribute.php:1968;2036
 msgid "Could not read user."
 msgstr "Impossibile leggere l'utente."
 
-#: Model/Attribute.php:2527
+#: Model/Attribute.php:2616
 msgid "This field is mandatory."
 msgstr "Il campo è obbligatorio."
 
-#: Model/Attribute.php:2885
+#: Model/Attribute.php:3069
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr "Qualcosa è andato storto. Ricevuto un ID di evento non numerico mentre si tentava di creare un archivio zip di un campione di malware caricato."
 
-#: Model/Event.php:4532
+#: Model/Event.php:5392
 msgid "Issues while loading the stix file. "
 msgstr "Errore durante il caricamento del file stix. "
 
-#: Model/Event.php:4534
+#: Model/Event.php:5394
 msgid "Issues with the maec library. "
 msgstr "Errore con la libreria maec. "
 
-#: Model/Event.php:4536
+#: Model/Event.php:5396
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "Errore durante l'esecuzione dello script di inserimento o input non valido. "
 
-#: Model/Event.php:4539
+#: Model/Event.php:5399
 msgid "Please ask your administrator to "
 msgstr "Contattare l'amministratore per "
 
-#: Model/Event.php:4541
+#: Model/Event.php:5401
 msgid "Please "
 msgstr "Per favore "
 
-#: Model/Event.php:4543
+#: Model/Event.php:5403
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr "controlla le dipendenze di STIX usando gli strumenti di diagnostica."
 
-#: Model/Event.php:4575
+#: Model/Event.php:5435
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:4584
+#: Model/Event.php:5444
 msgid "%s not set"
 msgstr "%s non impostato"
 
-#: Model/Server.php:114
+#: Model/Event.php:5667
+msgid "Could not add tags."
+msgstr "Impossibile aggiungere tag."
+
+#: Model/Galaxy.php:219;276;286;300
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
 msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
 msgstr "Alcune funzionalità amministrative sono esposte con le API, questo aiuta la manutenzione e la configurazione di MISP in modo automatizzato / via strumenti esterni."
 
-#: Model/Server.php:115
+#: Model/Server.php:122
 msgid "Administering MISP via the CLI"
 msgstr "Amministrare MISP via CLI"
 
-#: Model/Server.php:125
+#: Model/Server.php:132
 msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
 msgstr "Se vuoi automatizzare operazioni come il caching dei feed o il pulling da una istanza server, puoi farlo usando il seguente strumento a linea di comando. Eseguire semplicemente il comando dato via linea di comando / creare un cron job dedicato."
 
-#: Model/Server.php:126
+#: Model/Server.php:133
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr "Automatizzare certi processi di console"
 
-#: Model/Server.php:135
+#: Model/Server.php:142
 msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
 msgstr "La url base dell'applicazione (nel formato https://www.mymispinstance.com). Mole funzionalità dipendono da questo settaggio che deve essere impostato correttamente per funzionare."
 
-#: Model/Server.php:137
+#: Model/Server.php:144
 msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
 msgstr "Il baseurl impostato al momento non corrisponde con la URL tramite la quale si è effettuato accesso alla pagina. Si ignori l'avviso se si sta accedendo alla pagina tramite una URL alternativa (ad esempio via indirizzo IP)."
 
-#: Model/Server.php:143
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr "Se non è impostato a \"true\", l'istanza sarà accessibile solo all'amministratore del sito."
 
-#: Model/Server.php:151
+#: Model/Server.php:166
 msgid "Select the language MISP should use. The default is english."
 msgstr "Selezionare la lingua che MISP dovrà utilizzare. L'impostazione predefinita è l'inglese."
 
-#: Model/Server.php:161
+#: Model/Server.php:176
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr "Abilitare alcune correlazioni che hanno performance pesanti (attualmente la correlazione CIDR)"
 
-#: Model/Server.php:170
+#: Model/Server.php:185
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:195
 msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
 msgstr "In certi casi, un'istanza di MISP molto utilizzata può incorrere in errori dovuti al grande numero di richieste verso il server. Disabilitare la funzionalità di auto logout per alleggerire l'onere del server."
 
-#: Model/Server.php:179
+#: Model/Server.php:204
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr "Impostare lo score ssdeep al quale considerare due hash ssdeep correlati [1-100]"
 
-#: Model/Server.php:187
+#: Model/Server.php:212
 msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
 msgstr "Impostare il numero massimo di correlazioni che possono essere recuperate con un singolo evento. In casi estremi questo può prevenire problemi di memoria. Il valore predefinito è 5k."
 
-#: Model/Server.php:196
+#: Model/Server.php:221
 msgid "The message that users will see if the instance is not live."
 msgstr "Il messaggio visualizzato dagli utenti in caso l'istanza sia offline."
 
-#: Model/Server.php:198
+#: Model/Server.php:223
 msgid "If this is not set the default value will be used."
 msgstr "Se non impostato verrà utilizzato il valore di default."
 
-#: Model/Server.php:204;212;230;254;262;270;278;335;383;391;457
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
 msgid "This setting is deprecated and can be safely removed."
 msgstr "Questa impostazione è obsoleta e può essere tranquillamente rimossa."
 
-#: Model/Server.php:220
+#: Model/Server.php:245
 msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
 msgstr "Gli export della cache possono richiedere una considerevole quantità di spazio e possono essere disabilitati su tutta l'istanza utilizzando questa impostazione. Disabilitare l'export della cache non è raccomandato in quanto considerata una funzionalità importante, tuttavia, se il server ha dei problemi di spazio libero, può avere senso fare questo passo."
 
-#: Model/Server.php:238
+#: Model/Server.php:263
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr "Testo a piè di pagina antecedente al testo \"Powered by MISP\"."
 
-#: Model/Server.php:246
+#: Model/Server.php:271
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr "Testo a piè di pagina successivo al testo \"Powered by MISP\"."
 
-#: Model/Server.php:286
+#: Model/Server.php:311
 msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
 msgstr "Se impostato, il settaggio ti permette di visualizzare un logo nel lato destro del footer. Caricarla come una immagine custom dallo strumento gestione file."
 
-#: Model/Server.php:294
+#: Model/Server.php:319
 msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
 msgstr "Se impostato, il settaggio ti permette di visualizzare un logo come icona della home. Caricarla come una immagine custom dallo strumento gestione file."
 
-#: Model/Server.php:302
+#: Model/Server.php:327
 msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
 msgstr "Se impostato, l'immagine specificata qui rimpiazzerà il logo MISP nella pagina di login. Caricarla come una immagine custom dallo strumento gestione file."
 
-#: Model/Server.php:310
+#: Model/Server.php:335
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr "Il tag dell'organizzazione ospitante. Sarà utilizzato nell'oggetto delle email."
 
-#: Model/Server.php:318
+#: Model/Server.php:343
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr "L'organizzazione che gestisce questa istanza. Se l'opzione non è selezionata non sarà possibile aggiungere istanze di replica."
 
-#: Model/Server.php:327
+#: Model/Server.php:352
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr "Lo UUID dell'istanza MISP. Questo UUID è utilizzato per identificare questa istanza."
 
-#: Model/Server.php:329
+#: Model/Server.php:354
 msgid "No valid UUID set"
 msgstr "Nessun UUID valodo impostato"
 
-#: Model/Server.php:343
+#: Model/Server.php:368
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr "Settando questa configurazione a 'false' si nasconderanno tutti i nomi delle organizzazioni e i loghi."
 
-#: Model/Server.php:351
+#: Model/Server.php:376
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr "Inserire il livello di minaccia dell'evento nell'oggetto delle email di notifica."
 
-#: Model/Server.php:359
+#: Model/Server.php:384
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr "Questa è la stringa TLP per le email quando non viene trovato email_subject_tag."
 
-#: Model/Server.php:367
+#: Model/Server.php:392
 msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
 msgstr "Se questo tag è impostato in un evento, il suo valore verrà inviato nell'oggetto delle email. Se il tag non è impostato verrà utilizzato l'elemento email_subject_TLP_string."
 
-#: Model/Server.php:375
+#: Model/Server.php:400
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr "Includere il nome del email_subject_tag nell'oggetto. Quando è 'false' solo il tag sarà utilizzato."
 
-#: Model/Server.php:399
+#: Model/Server.php:424
 msgid "Enables the use of MISP's background processing."
 msgstr "Abilitare l'uso dei processi di background di MISP."
 
-#: Model/Server.php:407
+#: Model/Server.php:432
 msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
 msgstr "La cartella dove sono salvati gli allegato. MISP non sposterà i dati esistenti se viene cambiata l'impostazione. L'unico modo sicuro per modificare il settaggio è nel file config.php, quando MISP è fermo e dopo aver spostato/copiato i dati esistenti nella nuova destinazione. Questa cartella deve già esistere ed essere scrivibile e leggibile da MISP."
 
-#: Model/Server.php:416
+#: Model/Server.php:441
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr "Consentire alla cache XML di includere gli allegati codificati."
 
-#: Model/Server.php:424
+#: Model/Server.php:449
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr "Scaricare sempre gli allegati quando richiesti da un utente via browser"
 
-#: Model/Server.php:432
+#: Model/Server.php:457
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr "L'indirizzo email che MISP dovrà usare per tutte le notifiche"
 
-#: Model/Server.php:440
+#: Model/Server.php:465
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr "Puoi disabilitare l'invio di tutte le email da questa preferenza. Quando è abilitata, nessuna email in uscita verrà inviata da MISP."
 
-#: Model/Server.php:449
+#: Model/Server.php:474
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr "L'indirizzo email che MISP dovrà includere come contatto per il team di supporto dell'istanza."
 
-#: Model/Server.php:465
+#: Model/Server.php:490
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr "Trasforma la tipologia di attributi Vulnerabilità in link per il servizio di ricerca CVE fornito"
 
-#: Model/Server.php:473
+#: Model/Server.php:498
 msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
 msgstr "Questa impostazione controlla se le notifiche email verranno inviate quando un evento è creato dall'interfaccia REST. Potrebbe essere una buova idea disabilitare l'impostazione quando si configura per la prima volta un collegamento ad un'altra istanza, per evitare spam agli utenti durante il primo pull di dati. Breve riepilogo: 'True' = le email non sono inviata, 'False' = le email saranno inviate per gli eventi pubblicati via sincronizzazione / REST."
 
-#: Model/Server.php:481
+#: Model/Server.php:506
 msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
 msgstr "abilitando questo flag si autorizzerà l'invio della descrizione di un evento tramite l'oggetto delle email di alert. Si badi bene che l'oggetto non è cifrato da GnuPG, quindi abilitare l'opzione se si accetta che una parte della descrizione evento sarà inviata in chiaro."
 
-#: Model/Server.php:489
+#: Model/Server.php:514
 msgid "The default distribution setting for events (0-3)."
 msgstr "L'impostazione predefinita per la distrubuzione degli eventi (0-3)."
 
-#: Model/Server.php:498
+#: Model/Server.php:523
 msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
 msgstr "L'impostazione predefinita di distribuzione degli attributi, impostalo su 'event' se vuoi utilizzare il settaggio di default per la distribuzione degli eventi (0-3 o \"event\")"
 
-#: Model/Server.php:507
+#: Model/Server.php:532
 msgid "The default threat level setting when creating events."
 msgstr "Il livello di minaccia predefinito alla creazione di un evento."
 
-#: Model/Server.php:516
+#: Model/Server.php:541
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:550
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr "Abilitare le funzionalità di tagging di MISP. Altamente raccomandato."
 
-#: Model/Server.php:524
+#: Model/Server.php:558
 msgid "Show the full tag names on the event index."
 msgstr "Mostra il nome completo del tag nell'indice eventi."
 
-#: Model/Server.php:533
+#: Model/Server.php:567
 msgid "Used on the login page, before the MISP logo"
 msgstr "Usato nella pagina di login, priva del logo MISP"
 
-#: Model/Server.php:541
+#: Model/Server.php:575
 msgid "Used on the login page, after the MISP logo"
 msgstr "Usato nella pagina di login, dopo il logo MISP"
 
-#: Model/Server.php:549
+#: Model/Server.php:583
 msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
 msgstr "Usata nella pagina di login, alla sinistra del logo MISP, caricarla come immagine personalizzata dallo strumento gestione file."
 
-#: Model/Server.php:557
+#: Model/Server.php:591
 msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
 msgstr "Usata nella pagina di login, alla destra del logo MISP, caricarla come immagine personalizzata dallo strumento gestione file."
 
-#: Model/Server.php:565
+#: Model/Server.php:599
 msgid "Used in the page title, after the name of the page"
 msgstr "Usato nel titolo, dopo il nome della pagina"
 
-#: Model/Server.php:573
+#: Model/Server.php:607
 msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
 msgstr "Consente ad un utente di prendere l'ownership di un evento caricato dal tasto \"Aggiungi MISP XML\". Consente di mascherare il creatore di un evento importato manualmente, con il possibile risultato di modificare le intenzioni di rilascio originarie. Sincronizzando con un'istanza che ha un creatore diverso per lo stesso evento ci potrebbero andare incontro a conseguenze inattese."
 
-#: Model/Server.php:581
+#: Model/Server.php:615
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr "Scegliere se i termini e le condizioni devono essere visualizzate in linea (false) o scaricate (true)"
 
-#: Model/Server.php:589
+#: Model/Server.php:623
 msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
 msgstr "Il nome file dei termini e condizioni. Assicurarsi che il file sia localizzato nella propria cartella MISP/app/files/terms"
 
-#: Model/Server.php:597
+#: Model/Server.php:631
 msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
 msgstr "\"True\" abilita i campi alternativi per le organizzazioni (org sorgente e suoi membri) al posto della modalità tradizionale che mostra solo un campo organizzazione. Questo consente agli utenti di sapere se un evento è stato caricato ad un membro dell'organizzazione sulla propria istanza MISP, o se è stato originato da una istanza interconnessa."
 
-#: Model/Server.php:605
+#: Model/Server.php:639
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr "\"True\" negerà l'accesso agli eventi non pubblicati agli utenti esterni all'organizzazione del creatore, ad eccezione degli amministratori."
 
-#: Model/Server.php:614
+#: Model/Server.php:648
 msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr "Il messaggio inviato all'utente dopo la creazione dell'account (deve essere inviato manualmente dall'interfaccia di amministrazione). Utilizzare \\n per andare a capo. Le seguenti variabili saranno automaticamente sostituire nel testo: $password = una nuova password temporanea generata da MISP, $username = l'indirizzo email dell'utente, $misp = la url dell'istanza, $org = l'organizzazione a cui appartiene l'stanza, come configirato in MISP.org, $contact = l'indirizzo email utilizzato dal team di supporto, come configurato in MISP.contact. Ad esempio, \"la password per $username è $password\" apparirebbe ad un utente con email user@misp.org come \"la password per user@misp.org è hNamJae81\"."
 
-#: Model/Server.php:623
+#: Model/Server.php:657
 msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr "Il messaggio inviato agli utenti quando un reset password viene impostato. Utilizzare \\n per andare a capo. Le seguenti variabili saranno automaticamente sostituire nel testo: $password = una nuova password temporanea generata da MISP, $username = l'indirizzo email dell'utente, $misp = la url dell'istanza, $contact = l'indirizzo email utilizzato dal team di supporto, come configurato in MISP.contact. Ad esempio, \"la password per $username è $password\" apparirebbe ad un utente con email user@misp.org come \"la password per user@misp.org è hNamJae81\"."
 
-#: Model/Server.php:631
+#: Model/Server.php:665
 msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
 msgstr "Dalla versione 2.3.107 è possibile inserire in blacklist UUID di evento per evitare che vengano pushati nella propria istanza. Questa funzionalità agisce anche in maniera silente quando un evento viene cancellato, prevenendo un nuovo import dello stesso evento da altre istanze."
 
-#: Model/Server.php:638
+#: Model/Server.php:672
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr "Inserire in blacklist gli UUIDs delle organizzazioni per evitare la creazione di eventi creati dall'organizzazione in blacklist."
 
-#: Model/Server.php:645
+#: Model/Server.php:679
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr "Se abilitato, tutti i log includeranno l'indirizzo IP dell'utente."
 
-#: Model/Server.php:654
+#: Model/Server.php:688
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr "Se abilitato, MISP loggerà tutte le autenticazioni via chiave API andate a buon fine. Le URL richieste sono anch'esse loggate."
 
-#: Model/Server.php:662
+#: Model/Server.php:696
 msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
 msgstr "Questa funzionalità consente agli utenti di creare eventi per una sola organizzazione e di chiedere ad un altra di prendere la paternità. Ciò consente di rimanere anonimi chiedendo ad un partner di pubblicare l'evento per loro."
 
-#: Model/Server.php:671
+#: Model/Server.php:705
 msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
 msgstr "Quando è abilitato, il numero di correlazioni visibili all'utente attualmente loggato sarà mostrato nell'indice eventi della UI. Questo può costare in termini di prestazioni, ma è molto utile per vedere le correlazioni degli eventi al volo."
 
-#: Model/Server.php:680
+#: Model/Server.php:714
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr "Quando è abilitato, il numero di proposal per l'evento sarà mostrato nell'indice."
 
-#: Model/Server.php:689
+#: Model/Server.php:723
 msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
 msgstr "Quando è abilitato, il numero aggregato di attributi sightings nell'evento è visibile all'utente loggato nell'indice eventi della UI."
 
-#: Model/Server.php:698
+#: Model/Server.php:732
 msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
 msgstr "Quando è abilitato, il numero aggregato di discussioni postate per l'evento diventa visibile all'utente loggato nell'indice eventi della UI."
 
-#: Model/Server.php:707
+#: Model/Server.php:741
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr "Quando è abilitato solo gli amministratori delle Organizzazione e del Sito possono modificare un profilo utente."
 
-#: Model/Server.php:717
+#: Model/Server.php:751
 msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
 msgstr "Abilitare l'impostazione per bloccare le email di alert per eventi con un determinato tag. Definire il tag MISP.block_event_alert_tag."
 
-#: Model/Server.php:726
+#: Model/Server.php:760
 msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
 msgstr "Se è impostato MISP.block_event_alert, verranno bloccate le email di alert degli eventi taggati con il tag definito da questo settaggio."
 
-#: Model/Server.php:735
+#: Model/Server.php:769
 msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
 msgstr "Abilitare questa impostazione per bloccare le emai di alert per i vecchi eventi. Il periodo esatto per cui un evento è considerato vecchio è definito dall'impostazione MISP.block_old_event_alert_age."
 
-#: Model/Server.php:744
+#: Model/Server.php:778
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
 msgstr "Se l'impostazione MISP.block_old_event_alert è attiva, il sistema controllerà quanto vecchio può essere un evento per entrare nel flusso di alert email. È usato il campo \"Data\". Formato atteso: intero, in giorni"
 
-#: Model/Server.php:753
+#: Model/Server.php:787
 msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
 msgstr "Si prega di indicate la cartella temporanea che si utilizzerà per certe funzionalità di MISP. Come valore predefinito questa è impostata a /tmp e verrà utilizzata tra l'altro per memorizzare certi file temporanei estratti dalle operazioni dai processi di import."
 
-#: Model/Server.php:762
-msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/webroot/css directory and enter the name here."
-msgstr "Se si desidera personalizzare il css, basterà semplicemente copiare un file css nella cartella /var/www/MISP/webroot/css ed inserirne qui il nome."
+#: Model/Server.php:796
+msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
+msgstr ""
 
-#: Model/Server.php:771
+#: Model/Server.php:805
 msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
 msgstr "Abilitare questa impostazione per bloccare gli attributi dagli export che selezionano elementi \"to_ids\" se un proposal è stato inviato per rimuovere il flag IDS o per rimuovere l'attributo stesso. È un buon strumento per gestire i falsi positivi."
 
-#: Model/Server.php:780
+#: Model/Server.php:814
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr "Abilitare questa impostazione se i nuovi tag importati via sincronizzazione o aggiunti da altre sorgenti in entrata di eventi, non devono essere selezionati dall'utente per impostazione predefinita."
 
-#: Model/Server.php:789
+#: Model/Server.php:823
 msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
 msgstr "*ATTENZIONE* Questa impostazione disabiliterà completamente le correlazioni in questa istanza e rimuoverà ogni correlazione esistente già salvata. Abilitandola si innescherà una totale ri-correlazione di tutti i dati con tempi di esecuzione estremamente lunghi e costosi. Abilitare la funzionalità solo se si hanno ben chiare le conseguenze."
 
-#: Model/Server.php:799
+#: Model/Server.php:833
 msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
 msgstr "*ATTENZIONE* Questa impostazione darà ai creatori degli eventi la possibilità di disabilitare le correlazioni di un singolo evento / attributo che hanno creato."
 
-#: Model/Server.php:808
+#: Model/Server.php:842
 msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr "Lo host dove viene istanziato il server redis usato da MISP per operazioni generiche come il caching. Non deve essere confuso con il server redis usato per i processi di background."
 
-#: Model/Server.php:816
+#: Model/Server.php:850
 msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr "La porta dove viene istanziato il server redis usato da MISP per operazioni generiche come il caching. Non deve essere confuso con il server redis usato per i processi di background."
 
-#: Model/Server.php:824
+#: Model/Server.php:858
 msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
 msgstr "Il database del server redis usato da MISP per operazioni generiche. Se si eseguono più istanze MISP, accertarsi di utilizzare database differenti per ogni istanza."
 
-#: Model/Server.php:832
+#: Model/Server.php:866
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr "La password del server redis (se necessaria) usato da MISP per operazioni generiche."
 
-#: Model/Server.php:841
+#: Model/Server.php:875
 msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
 msgstr "Specificare quali campi filtrare quando si effettua una ricerca sulla vista eventi. Valori predefiniti sono: \"Id, uuid, valore, commento, tipo, categoria, Tag.name\""
 
-#: Model/Server.php:849
+#: Model/Server.php:883
+msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
+msgstr ""
+
+#: Model/Server.php:891
 msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
 msgstr "Abilitare questa opzione solo se si utilizzano con MISP strumenti ad altissima concorrenza. Le prestazioni generali diminuiranno, così come certe query verranno evitate in favore di un table lock più breve."
 
-#: Model/Server.php:861
+#: Model/Server.php:903
 msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
 msgstr "La posizione dell'eseguibile GnuPG. Se si vuole utilizzare un eseguibile GnuPG diverso da /usr/bin/gpg, è possibile impostare il valore qui. Se il valore predefinito è corretto, basta mantenere l'impostazione suggerita da MISP."
 
-#: Model/Server.php:869
+#: Model/Server.php:911
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr "Abilita (false) l'invio di email non cifrate agli utenti che non hanno una chiave GnuPG."
 
-#: Model/Server.php:877
+#: Model/Server.php:919
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr "Abilita (false) l'inserimento nel corpo di email non cifrate di dettagli sull'evento."
 
-#: Model/Server.php:885
+#: Model/Server.php:927
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr "Abilita la firma GnuPG delle email. Per default, le email GnuPG vengono firmate"
 
-#: Model/Server.php:893
+#: Model/Server.php:935
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr "L'indirizzo email a cui è legata la chiave GnuPG dell'istanza."
 
-#: Model/Server.php:901
+#: Model/Server.php:943
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr "La password (se configurata) della chiave GnuPG dell'istanza."
 
-#: Model/Server.php:910
+#: Model/Server.php:952
 msgid "The location of the GnuPG homedir."
 msgstr "La cartella home di GnuPG."
 
-#: Model/Server.php:921
+#: Model/Server.php:963
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr "Abilita la cifratura SMIME. Le impostazioni delle preferenze GnuPG.onlyencrypted e GnuPG.bodyonlyencrypted saranno ereditate se SMIME è abilitato."
 
-#: Model/Server.php:929
+#: Model/Server.php:971
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr "L'indirizzo email a cui è legata la chiave SMIME dell'istanza."
 
-#: Model/Server.php:937
+#: Model/Server.php:979
 msgid "The location of the public half of the signing certificate."
 msgstr "La posizione della certificato pubblico di firma."
 
-#: Model/Server.php:945
+#: Model/Server.php:987
 msgid "The location of the private half of the signing certificate."
 msgstr "La posizione del certificato privato di firma."
 
-#: Model/Server.php:953
+#: Model/Server.php:995
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr "La password (se configurata) della chiave SMIME dell'istanza."
 
-#: Model/Server.php:965
+#: Model/Server.php:1007
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr "Hostname del proxy HTTP per le richieste di sincronizzazione dall'esterno. Lasciarlo vuoto per non utilizzare un proxy."
 
-#: Model/Server.php:973
+#: Model/Server.php:1015
 msgid "The TCP port for the HTTP proxy."
 msgstr "La porta TCP del proxy HTTP."
 
-#: Model/Server.php:981
+#: Model/Server.php:1023
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr "Il metodo di autenticazione per il proxy HTTP. Attualmente supportati metodi Basic e Digest. Lasciarlo vuoto in caso di accesso non autenticato."
 
-#: Model/Server.php:989
+#: Model/Server.php:1031
 msgid "The authentication username for the HTTP proxy."
 msgstr "Il nome utente per il proxy HTTP."
 
-#: Model/Server.php:997
+#: Model/Server.php:1039
 msgid "The authentication password for the HTTP proxy."
 msgstr "La password di autenticazione per il proxy HTTP."
 
-#: Model/Server.php:1008
+#: Model/Server.php:1050
 msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
 msgstr "Il salt utilizzato per gli hash delle password. Non è possibile resettarlo dalla GUI, ma solo manaulmante dal file settings.php. Si tenga presente che la modifica invaliderà tutte le password nel database."
 
-#: Model/Server.php:1017
+#: Model/Server.php:1059
 msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
 msgstr "Abilitare questa opzione per inviare tutti i log applicativi a syslog. Si tenga a mente l'alta verbosità dei log che includeranno dati relativi agli utenti, organizzazioni, eventi."
 
-#: Model/Server.php:1026
+#: Model/Server.php:1068
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr "Lunghezza password richiesta. Se non è impostata o lo è a 0, verrà utilizzato il valore di default (12)."
 
-#: Model/Server.php:1034
+#: Model/Server.php:1076
 msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 msgstr "Complessità password richiesta. Lasciare il campo vuoto per i settaggi di default (3 su 4, con un carattere numerico o uno speciale) oppure inserire la propria regex. Si ricordi che la lunghezza è controllata in un altra chiave. Predefinito (semplici 3 su 4 o minimo 16 caratteri): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 
-#: Model/Server.php:1042
+#: Model/Server.php:1084
 msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
 msgstr "Abilitando questa opzione si richiederà agli utenti l'inserimento della loro password corrente ad ogni modifica del loro profilo (inclusa la procedura di cambio password). Per gli amministratore, la conferma sarà richiesta ad ogni modifica di profilo di ogni utente. Questa potrebbe mitigare la possibilità che un attaccante tenti di modificare la password di un account compromesso per ottenere persistenza, in ogni caso, abilitando l'opzione si daranno molti fastidi agli utenti."
 
-#: Model/Server.php:1051
+#: Model/Server.php:1093
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr "Abilitando questa opzione si sanerà il contenuto degli attributo durante il processo di \"soft-delete\""
 
-#: Model/Server.php:1060
+#: Model/Server.php:1102
 msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
 msgstr "Abilitando questa opzione si impedirà la visualizzazione dell'indice delle organizzazione a tutti ad eccezzione degli amministratori dell'istanza. Si ricordi che gli utenti potranno ancora visualizzare le organizzazione che producono dati tramite gli eventi, i proposal, la history nei log degli eventi, ecc..."
 
-#: Model/Server.php:1069
+#: Model/Server.php:1111
 msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
 msgstr "Consente l'invio della chiave API tramite il paramentro URL chiamato \"apikey\" - altamente raccomandato NON abilitare l'opzione, ma se si hanno vecchi applicativi non in grado di inviare le intestazioni di autorizzazione, questo può rappresentare un workaround. Si ripete che tale opzione dovrebbe essere utilizzata come ultima spiaggia."
 
-#: Model/Server.php:1071
+#: Model/Server.php:1113
 msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
 msgstr "Si è abilitata l'opzione per inviare la chiave API direttamente nei parametri URL. La cosa è altamente sconsigliata, si vuole veramente rivelare la propria chiavi API nei log?"
 
-#: Model/Server.php:1081
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr "Il numero di tentativi di login che un utente può fallire prima che la protezione bruteforce lo blocchi."
 
-#: Model/Server.php:1089
+#: Model/Server.php:1149
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr "La durata (in secondi) di quanto tempo l'utente verrà bloccato dopo che il numero massimo di login falliti è stato esaurito."
 
-#: Model/Server.php:1100
+#: Model/Server.php:1160
 msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
 msgstr "Impostare a 'true' per rigenerare automaticamente la sessione dopo x numero di richieste. L'utente potrebbe incorrete in errori dovuti alla mancata autenticazione e la cosa in generale è frustrante, quindi si abiliti l'opzione se realmente si necessita di rigenerare la sessione. (Non raccomandato)"
 
-#: Model/Server.php:1108
+#: Model/Server.php:1168
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr "Impostare a 'true' per controllare lo user-agent dell'utente ad ogni richiesta. Possono verificarsi occasionali logout (non raccomandato)."
 
-#: Model/Server.php:1116
+#: Model/Server.php:1176
 msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
 msgstr "Il tipo di sessione utilizzata da MISP. L'impostazione predefinita è il PHP, che utilizzerà le configurazioni di sessione del file php.ini per la sessione applicativa (opzioni supportate: php, database). L'opzione raccomandata è PHP configurandolo per l'utilizzo di sessioni redis dal file php.ini. Si aggiunga 'session.save_handler = redis' e \"session.save_path = 'tcp://localhost:6379'\" (sostituire quest'ultimo con la connessione redis) to "
 
-#: Model/Server.php:1125
-msgid "The timeout duration of sessions (in MINUTES)."
-msgstr "Il timeout di durata delle sessioni (in MINUTI)."
+#: Model/Server.php:1185
+msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
+msgstr ""
 
-#: Model/Server.php:1133
+#: Model/Server.php:1193
 msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
 msgstr "La scadenza dei cookie (in MINUTI). Il timeout di sessione viene aggiornato frequentemente, ma non i cookie. Di solito è raccomandato avere un cookie_timeout più alto del timeout di sessione."
 
-#: Model/Server.php:1144
+#: Model/Server.php:1204
 msgid "The default policy action for the values added to the RPZ."
 msgstr "L'azione di default per i valori aggiunti a RPZ."
 
-#: Model/Server.php:1153
+#: Model/Server.php:1213
 msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
 msgstr "Il walled garden predefinito utilizzato dall'export RPZ se l'impostazione walled garden è scelta per l'export."
 
-#: Model/Server.php:1161
+#: Model/Server.php:1221
 msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
 msgstr "Il seriale della parte SOA dello zone file. (numerico, formato suggerito yyyymmddrr, dove rr sta per due numerici corrispondenti alla sotto versione del file. $date verrà automaticamente riempito con la data corrente yyyymmdd, quindi $date00 è un'impostazione valida)."
 
-#: Model/Server.php:1169
+#: Model/Server.php:1229
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Il \"refresh\" specificato nella parte SOA dello zone file. (in secondi, o nella forma abbreviata come 15m)"
 
-#: Model/Server.php:1177
+#: Model/Server.php:1237
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Il \"retry\" specificato nella parte SOA dello zone file. (in secondi, o nella forma abbreviata come 15m)"
 
-#: Model/Server.php:1185
+#: Model/Server.php:1245
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "L'\"expiry\" specificato nella parte SOA dello zone file. (in secondi, o nella forma abbreviata come 15m)"
 
-#: Model/Server.php:1193
+#: Model/Server.php:1253
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Il TTL minimo specificato nella parte SOA dello zone file. (in secondi, o nella forma abbreviata come 15m)"
 
-#: Model/Server.php:1201
+#: Model/Server.php:1261
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "Il TTL dello zone file. (in secondi, o nella forma abbreviata come 15m)"
 
-#: Model/Server.php:1217
+#: Model/Server.php:1277
 msgid "Alternate nameserver"
 msgstr "Nameserver alternativo"
 
-#: Model/Server.php:1225
+#: Model/Server.php:1285
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr "L'indirizzo email specificato nella parte SOA dello zone file."
 
-#: Model/Server.php:1233
+#: Model/Server.php:1293
 msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
 msgstr "Abilitare o disabilitare le funzionalità pub/sub di MISP. Assicurarsi di installare tutti i pacchetti richiesti perché il plugin funzioni. Si faccia riferimento alle istruzioni di installazione per maggiori informazioni."
 
-#: Model/Server.php:1242
+#: Model/Server.php:1302
 msgid "The port that the pub/sub feature will use."
 msgstr "La porta che la funzionalità pub/sub utilizzerà."
 
-#: Model/Server.php:1251
+#: Model/Server.php:1311
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr "Posizione del db Redis utilizzato da MISP e lo script Python PUB per mettere in coda i dati da pubblicare."
 
-#: Model/Server.php:1260
+#: Model/Server.php:1320
 msgid "The port that Redis is listening on."
 msgstr "La porta a cui Redis sta in ascolto."
 
-#: Model/Server.php:1269
+#: Model/Server.php:1329
 msgid "The password, if set for Redis."
 msgstr "La password per Redis, se configurata."
 
-#: Model/Server.php:1278
+#: Model/Server.php:1338
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr "Il database da utilizzare per accodare i messaggi per le funzionalità pub/sub."
 
-#: Model/Server.php:1287
+#: Model/Server.php:1347
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr "Il namespace che dovrà essere utilizzato per accodare i messaggi per le funzionalità pub/sub."
 
-#: Model/Server.php:1296
+#: Model/Server.php:1356
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr "Abilitare questa impostazione per includere i payload in base64 dei campioni malware/allegati nell'output."
 
-#: Model/Server.php:1304
+#: Model/Server.php:1364
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr "Abilitare o disabilitare la pubblicazione di ogni creazione/modifica/cancellazione evento."
 
-#: Model/Server.php:1312
+#: Model/Server.php:1372
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr "Abilitare o disabilitare la pubblicazione di ogni creazione/modifica/cancellazione oggetto."
 
-#: Model/Server.php:1320
+#: Model/Server.php:1380
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr "Abilitare o disabilitare la pubblicazione di ogni creazione/cancellazione di riferimento ad un oggetto."
 
-#: Model/Server.php:1328
+#: Model/Server.php:1388
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr "Abilitare o disabilitare la pubblicazione di ogni creazione/modifica/soft-deletion di attributi."
 
-#: Model/Server.php:1336
+#: Model/Server.php:1396
 msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr "Abilitare o disabilitare la pubblicazione di ogni creazione/modifica/cancellazione tag così come dei tag allegati/rimossi da vari elementi MISP."
 
-#: Model/Server.php:1344
+#: Model/Server.php:1404
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr "Abilitare o disabilitare la pubblicazione di nuovi sighting verso il feed pub/sub ZMQ."
 
-#: Model/Server.php:1352
+#: Model/Server.php:1412
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr "Abilitare o disabilitare la pubblicazione di utenti nuovi/modificati nel feed pub/sub di ZMQ."
 
-#: Model/Server.php:1360
+#: Model/Server.php:1420
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr "Abilitare o disabilitare la pubblicazione di organizzazioni nuove/modificate nel feed pub/sub di ZMQ."
 
-#: Model/Server.php:1368
+#: Model/Server.php:1428
 msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr "Abilitare o disabilitare la pubblicazione dei log nel feed pub/sub ZMQ. Si ricordi che questo può aumentare anche di molto la verbosità in ragione dei settaggi sui log."
 
-#: Model/Server.php:1376
+#: Model/Server.php:1436
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr "Abilitare l'invio dei log ad un'istanza ElasticSearch"
 
-#: Model/Server.php:1384
-msgid "The URL(s) at which to access ElasticSearch - comma seperate if you want to have more than one."
-msgstr "Le URL a cui accedere ad ElasticSearch - separate da virgola se se ne vuole avere più di una."
+#: Model/Server.php:1444
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
+msgstr ""
 
-#: Model/Server.php:1392
+#: Model/Server.php:1452
 msgid "The index in which to place logs"
 msgstr "L'indice in cui inserire i log"
 
-#: Model/Server.php:1400
+#: Model/Server.php:1460
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr "Abilita o disabilita il caricamento dei campioni malware su S3 piuttosto che su disco (attenzione: si richieda il permesso ad Amazon prima di tutto!)"
 
-#: Model/Server.php:1408
+#: Model/Server.php:1468
 msgid "Bucket name to upload to"
 msgstr "Nome del pacchetto da caricare"
 
-#: Model/Server.php:1416
+#: Model/Server.php:1476
 msgid "Region in which your S3 bucket resides"
 msgstr "Regione in cui il vostro S3 risidede"
 
-#: Model/Server.php:1424
+#: Model/Server.php:1484
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr "Chiave AWS da utilizzare al caricamento dei campioni (attenzione: è caldamente raccomandato che l'utilizzo di EC2 IAM ove possibile)"
 
-#: Model/Server.php:1432
+#: Model/Server.php:1492
 msgid "AWS secret key to use when uploading samples"
 msgstr "Chiave segreta AWS da usare al caricamento dei campioni"
 
-#: Model/Server.php:1440
+#: Model/Server.php:1500
 msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
 msgstr "Questa impostazione definisce chi avrà accesso alla visualizzazione dei report sightings. Il default prevede solo il proprietario (oltre a tutti che vedono il proprio contributo) mentre altre opzioni \"Sighting reporters\" (ovvero l'autore dell'evento e tutti quelli che hanno fornito sighting in riguardo) e \"Everyone\" (ovvero tutti quelli che hanno accesso alla visualizzazione dell'evento/attributo)."
 
-#: Model/Server.php:1449
+#: Model/Server.php:1509
 msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
 msgstr "Abilitando l'anonimizzazione dei sighting questi verranno semplicemente aggregati invece di mostrare l'organizzazione che ha inviato un sighting. Gli utenti avranno la possibilità di sapere il numero di sighting inviati dalla propria organizzazione ed il numero di quelli inviati da altre organizzazioni"
 
-#: Model/Server.php:1457
+#: Model/Server.php:1517
 msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
 msgstr "Impostare l'intervallo in cui verranno presi in considerazione le segnalazioni sighting durante la generazione dei grafici. Per esempio un sighting con sighted_date a 7 anni fa potrebbe non essere più rilevante. Fornire il valore in numero di giorni, predefinito è 365 giorni"
 
-#: Model/Server.php:1465
+#: Model/Server.php:1525
 msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
 msgstr "Abilitare questa funzionalità se si desidera gestire l'autenticazione con strumenti esterni autenticandosi in MISP utilizzando una intestazione personalizzata."
 
-#: Model/Server.php:1475
+#: Model/Server.php:1535
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr "Impostare l'intestazione che MISP dovrà controllare. Se lasciato vuoto verrà utilizzato il valore predefinito di Authorization header."
 
-#: Model/Server.php:1484
+#: Model/Server.php:1544
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr "Utilizzare una intestazione namespace per lo header auth - per defualt l'impostazione è abilitata"
 
-#: Model/Server.php:1493
+#: Model/Server.php:1553
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr "Il valore predefinito del namespace nel header di autorizzazione - lavore predefitino HTTP_"
 
-#: Model/Server.php:1502
+#: Model/Server.php:1562
 msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
 msgstr "Se questa impostazione è attiva l'unico modo per autenticarsi sarà l'intestazione personalizzata. In alternativa è possibile eseguire una modalità mista che loggherà gli utenti autenticavi tramite l'intestazione, se trovata, altrimenti questi verranno reindirizzati verso la normale pagina di login."
 
-#: Model/Server.php:1511
+#: Model/Server.php:1571
 msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
 msgstr "Se si utilizza uno strumento esterno di autenticazione a MISP e si vorrebbe configurare la URL dello strumento come unico punto valido di entrata, si configuri questo campo. "
 
-#: Model/Server.php:1520
+#: Model/Server.php:1580
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr "Il nome del metodo di autenticazione, solo decorativo e verrà visualizzato alla creazione utente e nei log."
 
-#: Model/Server.php:1529
+#: Model/Server.php:1589
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr "Disabilitare il tasto logout per gli utenti che si sono loggati tramite un meccanismo di autenticazione esterno."
 
-#: Model/Server.php:1537
+#: Model/Server.php:1597
 msgid "Enable/disable the enrichment services"
 msgstr "Abilitare/disabilitare i servizi di enrichment"
 
-#: Model/Server.php:1545
+#: Model/Server.php:1605
 msgid "Set a timeout for the enrichment services"
 msgstr "Impostare un timeout per i servizi di enrichment"
 
-#: Model/Server.php:1553;1665
+#: Model/Server.php:1613;1725
 msgid "Enable/disable the import services"
 msgstr "Abilitare/disabilitare i servizi di import"
 
-#: Model/Server.php:1561;1682
+#: Model/Server.php:1621;1742
 msgid "Set a timeout for the import services"
 msgstr "Impostare un timeout per i servizi di import"
 
-#: Model/Server.php:1569
+#: Model/Server.php:1629
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "La URL utilizzata per accedere ai servizi di import. Il default è http://127.0.0.1:6666"
 
-#: Model/Server.php:1577
+#: Model/Server.php:1637
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "La porta utilizzata per accedere ai servizi di import. Il default è 127.0.0.1:6666"
 
-#: Model/Server.php:1585
+#: Model/Server.php:1645
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "La URL utilizzata per accedere ai servizi di export. IL default è http://127.0.0.1:6666"
 
-#: Model/Server.php:1593
+#: Model/Server.php:1653
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "La porta utilizzata per accedere ai servizi di export. Il default è 127.0.0.1:6666"
 
-#: Model/Server.php:1601
+#: Model/Server.php:1661
 msgid "Enable/disable the export services"
 msgstr "Abilitare/disabilitare i servizi di export"
 
-#: Model/Server.php:1609
+#: Model/Server.php:1669
 msgid "Set a timeout for the export services"
 msgstr "Impostare un timeout per i servizi di export"
 
-#: Model/Server.php:1617
+#: Model/Server.php:1677
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr "Abilitare/disabilitare la visualizzazione dei dati dei moduli di enrichment al passaggio del mouse"
 
-#: Model/Server.php:1625
+#: Model/Server.php:1685
 msgid "Set a timeout for the hover services"
 msgstr "Impostare il timout per i servizi hover"
 
-#: Model/Server.php:1633
+#: Model/Server.php:1693
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "La URL utilizzata per accedere ai servizi di enrichment. Il default è http://127.0.0.1:6666"
 
-#: Model/Server.php:1641
+#: Model/Server.php:1701
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "La porta utilizzata per accedere ai servizi di enrichment. La porta di default è 127.0.0.1:6666"
 
-#: Model/Server.php:1649
+#: Model/Server.php:1709
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr "La URL utilizzata per accedere a Cortex. L'indirizzo di default è http://cortex-url"
 
-#: Model/Server.php:1657
+#: Model/Server.php:1717
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr "La porta utilizzata per accedere a Cortex. La porta di default è 9000"
 
-#: Model/Server.php:1673
+#: Model/Server.php:1733
 msgid "Set an authentication key to be passed to Cortex"
 msgstr "Assegna una chiave di autenticazione da passare a Cortex"
 
-#: Model/Server.php:1690
+#: Model/Server.php:1750
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr "Assegnare il valore 'false' per disabilitare la verifica del SSL. Impostazione non raccomandata."
 
-#: Model/Server.php:1699
+#: Model/Server.php:1759
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr "Assegnare il valore 'false' se volete ignorare l'errore di non corrispondenza del nome del server con quello assegnato nel certificato."
 
-#: Model/Server.php:1708
+#: Model/Server.php:1768
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr "Assegnare il valore 'true' per accettare i certificati self-signed. Questa configurazione richiede l'abilitazione del parametro Cortex_ssl_verify_peer."
 
-#: Model/Server.php:1717
+#: Model/Server.php:1777
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr "Impostare il percorso assoluto del file contenente la 'Certificate Authority' che volete utilizzare per verificare il certificato SSL."
 
-#: Model/Server.php:1726
+#: Model/Server.php:1786
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr "Impostare una URL esterna, utilizzabile dagli utenti che utilizzano una piattaforma di autenticazione personalizzata, per resettare la password."
 
-#: Model/Server.php:1735
+#: Model/Server.php:1795
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr "Impostare una URL utilizzabile dalla vostra piattaforma di autenticazione per gestire il log out degli utenti."
 
-#: Model/Server.php:1745
+#: Model/Server.php:1805
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr "Livello di debug per questa istanza, utilizzate sempre 0 per le istanze di produzione."
 
-#: Model/Server.php:1754
+#: Model/Server.php:1814
 msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
 msgstr "Livello di debug per gli amministratori di questa istanza. Questa funzionalità per mette agli amministratori del sito in un'istanza di produzione senza visualizzare i messaggi agli utenti. L'opzione di debug che visualizza il maggior numero di informazioni sul sito, o tramite l'opzione site_admin_debug, è visualizzabile dagli amministratori del sito."
 
-#: Model/Server.php:2401
+#: Model/Server.php:1947
+msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/Server.php:2054
+msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+msgstr "Non autorizzato. Può essere dovuto ad una chiave API non valida, o perché l'utente per la sincronizzazione non ha abilitati i permessi per accedere al server remoto. Un'altra ragione può essere l'errato settaggio della sincronizzazione del server."
+
+#: Model/Server.php:2056
+msgid "Sorry, this is not yet implemented"
+msgstr ""
+
+#: Model/Server.php:2057
+msgid "Something went wrong while trying to pull"
+msgstr ""
+
+#: Model/Server.php:2069;2071
+msgid "Unknown issue."
+msgstr ""
+
+#: Model/Server.php:2535
 msgid "Enable or disable the %s module."
 msgstr "Abilita o disabilita il modulo %s."
 
-#: Model/Server.php:2404
+#: Model/Server.php:2538
 msgid "Restrict the %s module to the given organisation."
 msgstr "Limitare il %s modulo all'organizzazione."
 
-#: Model/Server.php:2412
+#: Model/Server.php:2546
 msgid "Set this required module specific setting."
 msgstr "Imposta i parametri per questo modulo obbligatorio."
 
-#: Model/Server.php:2527
+#: Model/Server.php:2661
 msgid "Value not set."
 msgstr "Valore non impostato."
 
-#: Model/Server.php:3130
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
 msgid "Organisation logos"
 msgstr "Immagine dell'organizzazione"
 
-#: Model/Server.php:3131
+#: Model/Server.php:3476
 msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
 msgstr "Immagine usata da un organizzazione all'interno fi un evento, una vista, una discussione, una proposta ecc. Controlla che il nome del file sia in formato org.png, dove org è il nome organizzazione case-sensitive."
 
-#: Model/Server.php:3133
+#: Model/Server.php:3478
 msgid "48x48 pixel .png files"
 msgstr "Il file png è 48x48 pixel"
 
-#: Model/Server.php:3136;3151
+#: Model/Server.php:3481;3496
 msgid "Filename must be in the following format: *.png"
 msgstr "Il filename deve essere del formato: *.png"
 
-#: Model/Server.php:3140
+#: Model/Server.php:3485
 msgid "Additional image files"
 msgstr "Immagini aggiuntive"
 
-#: Model/Server.php:3141
+#: Model/Server.php:3486
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr "Le immagini caricate in questa cartella posso essere usate per diversi scopi, ad esempio come immagine principale nella pagina di autenticazione"
 
-#: Model/Server.php:3148
+#: Model/Server.php:3493
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr "testo/html se visualizzato sulla pagina, altre informazioni riguardanti le condizioni d'use se fornito come download"
 
-#: Model/Server.php:3765
+#: Model/Server.php:3665
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr ""
+
+#: Model/Server.php:4115
 msgid "Removing a dead worker."
 msgstr "Rimozione di un worker down."
 
-#: Model/Server.php:3766
+#: Model/Server.php:4116
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr "Rimozione dati del worker down. Il worker era del tipo %s con pid %s"
 
-#: Model/Server.php:3770
+#: Model/Server.php:4120
 msgid "Stopping a worker."
 msgstr "Arresto di un worker."
 
-#: Model/Server.php:3771
+#: Model/Server.php:4121
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr "Arresto di un worker. Il worker era di tipo %scon pid %s"
 
@@ -2029,7 +2311,7 @@ msgstr "ha i seguenti elementi dipendenti"
 
 #: View/Attributes/add.ctp:7
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Aggiungi Attributo"
@@ -2074,7 +2356,7 @@ msgstr "Tipo "
 #: View/Attributes/add.ctp:36
 #: View/Attributes/add_attachment.ctp:24
 #: View/Attributes/edit.ctp:24
-#: View/Events/add.ctp:24
+#: View/Events/add.ctp:20
 msgid "Distribution "
 msgstr "Distribuzione "
 
@@ -2082,7 +2364,7 @@ msgstr "Distribuzione "
 #: View/Attributes/add_attachment.ctp:33
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
-#: View/Events/add.ctp:34
+#: View/Events/add.ctp:30
 #: View/Events/edit.ctp:26
 #: View/Feeds/add.ctp:176
 #: View/Feeds/edit.ctp:172
@@ -2109,23 +2391,24 @@ msgstr "Commento contestuale"
 msgid "for Intrusion Detection System"
 msgstr "per Intrusion Detection System"
 
-#: View/Attributes/add.ctp:87
+#: View/Attributes/add.ctp:91
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_mitre_attack_matrix.ctp:14;113
+#: View/Elements/view_galaxy_matrix.ctp:76;199
 #: View/Events/contact.ctp:29
 #: View/Events/edit.ctp:59
 #: View/Events/free_text_import.ctp:27
 #: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:78
+#: View/ObjectReferences/ajax/add.ctp:130
 #: View/Objects/add.ctp:147
 #: View/Objects/revise_object.ctp:85
 #: View/Organisations/admin_add.ctp:49
 #: View/Organisations/admin_edit.ctp:60
-#: View/Servers/add.ctp:126
-#: View/Servers/edit.ctp:167
-#: View/SharingGroups/add.ctp:75
+#: View/Servers/add.ctp:115
+#: View/Servers/edit.ctp:162
+#: View/SharingGroups/add.ctp:115
+#: View/TagCollections/add.ctp:21
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
 #: View/TemplateElements/ajax/template_element_add_file.ctp:67
 #: View/TemplateElements/ajax/template_element_add_text.ctp:29
@@ -2134,7 +2417,7 @@ msgstr "per Intrusion Detection System"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/Users/admin_add.ctp:97
 #: View/Users/admin_edit.ctp:91
-#: View/Users/admin_email.ctp:51
+#: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
 #: View/Users/change_pw.ctp:23
 #: View/Users/edit.ctp:41
@@ -2142,14 +2425,17 @@ msgstr "per Intrusion Detection System"
 msgid "Submit"
 msgstr "Invia"
 
-#: View/Attributes/add.ctp:88
+#: View/Attributes/add.ctp:92
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:62
+#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/exportSearch.ctp:32
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Elements/eventattributecreation.ctp:89
-#: View/Elements/view_mitre_attack_matrix.ctp:114
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/view_galaxy_matrix.ctp:200
 #: View/Elements/serverRuleElements/pull.ctp:70
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2158,21 +2444,18 @@ msgstr "Invia"
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/ajax/enrich_event.ctp:21
+#: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:15
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/exportChoice.ctp:51
 #: View/Events/ajax/importChoice.ctp:12
 #: View/Events/ajax/quick_edit.ctp:6
-#: View/Galaxies/ajax/cluster_choice.ctp:32
-#: View/Galaxies/ajax/galaxy_choice.ctp:22
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:15
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
-#: View/ObjectReferences/ajax/add.ctp:82
+#: View/ObjectReferences/ajax/add.ctp:134
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/ObjectTemplates/ajax/object_choice.ctp:10
 #: View/Objects/add.ctp:153
 #: View/Objects/revise_object.ctp:87
 #: View/Objects/ajax/delete.ctp:24
@@ -2187,11 +2470,12 @@ msgstr "Invia"
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
 #: View/Sightings/ajax/advanced.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
-#: View/Tags/ajax/select_tag.ctp:32
-#: View/Tags/ajax/taxonomy_choice.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:6
 #: View/TemplateElements/ajax/template_element_add_file.ctp:73
@@ -2201,6 +2485,7 @@ msgstr "Invia"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:35
 #: View/Templates/ajax/template_choices.ctp:15
 #: View/Users/admin_filter_user_index.ctp:107
+#: View/Users/ajax/emailConfirmTemplate.ctp:14
 #: View/Users/ajax/fetchpgpkey.ctp:24
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
@@ -2239,8 +2524,6 @@ msgstr "ID evento"
 #: View/Elements/Users/userIndexTable.ctp:4
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_view.ctp:14
-#: View/Users/view.ctp:14
 msgid "Org"
 msgstr "Org"
 
@@ -2255,7 +2538,7 @@ msgid "Event date"
 msgstr "Data evento"
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Event graph"
 msgstr "Grafico evento"
 
@@ -2283,12 +2566,12 @@ msgstr "Contrassegna tutti i nuovi attributi per IDS"
 
 #: View/Attributes/attribute_replace.ctp:26
 #: View/Noticelists/view.ctp:36
-#: View/Warninglists/view.ctp:54
+#: View/Warninglists/view.ctp:35
 msgid "Values"
 msgstr "Valori"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:75
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:46
@@ -2322,7 +2605,7 @@ msgstr "Nessuna compilazione fallita"
 msgid "disabled"
 msgstr "disabilitato"
 
-#: View/Attributes/edit.ctp:64
+#: View/Attributes/edit.ctp:68
 #: View/ShadowAttributes/add.ctp:55
 #: View/ShadowAttributes/edit.ctp:45;54
 msgid "Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this."
@@ -2330,7 +2613,7 @@ msgstr "Attenzione: stai per condividere dati di natura classificata (attributi
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -2338,10 +2621,6 @@ msgstr "Attenzione: stai per condividere dati di natura classificata (attributi
 msgid "Attributes"
 msgstr "Attributi"
 
-#: View/Attributes/index.ctp:7
-msgid "Results for all attributes"
-msgstr "Risultati per tutti gli attributi"
-
 #: View/Attributes/index.ctp:8
 msgid " with the value containing "
 msgstr " contenente il valore "
@@ -2354,57 +2633,67 @@ msgstr " sono taggati con "
 msgid " from the events "
 msgstr " dagli eventi "
 
-#: View/Attributes/index.ctp:12
-msgid " of category "
-msgstr " della categoria "
+#: View/Attributes/index.ctp:11
+msgid " carrying the tag(s) "
+msgstr ""
 
-#: View/Attributes/index.ctp:13
+#: View/Attributes/index.ctp:12
 msgid " of type "
 msgstr " del tipo "
 
-#: View/Attributes/index.ctp:14
-msgid " created by the organisation "
-msgstr " creato dall'organizzazione "
+#: View/Attributes/index.ctp:13
+msgid " of category "
+msgstr " della categoria "
 
-#: View/Attributes/index.ctp:28;173
-#: View/Elements/eventattribute.ctp:60;258
+#: View/Attributes/index.ctp:14
+msgid " created by organisation "
+msgstr ""
+
+#: View/Attributes/index.ctp:26
+msgid "Results for all attributes"
+msgstr "Risultati per tutti gli attributi"
+
+#: View/Attributes/index.ctp:39;132
+#: View/Elements/eventattribute.ctp:60;229
 #: View/Elements/eventdiscussion.ctp:15;126
+#: View/Elements/generic_table.ctp:16
+#: View/Elements/generic_table_row.ctp:16
 #: View/Elements/Feeds/eventattribute.ctp:20;86
 #: View/Elements/Servers/eventattribute.ctp:20;86
 #: View/EventBlacklists/index.ctp:13;54
-#: View/Events/index.ctp:12;89
+#: View/Events/index.ctp:12;115
 #: View/Events/proposal_event_index.ctp:12;95
 #: View/Events/ajax/index.ctp:13;39
 #: View/Feeds/freetext_index.ctp:22;86
-#: View/Feeds/index.ctp:20;230
-#: View/Feeds/preview_index.ctp:14;82
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
 #: View/Galaxies/index.ctp:13;53
-#: View/GalaxyClusters/ajax/index.ctp:11;96
+#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:33;162
-#: View/Logs/admin_index.ctp:37;111
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
 #: View/Logs/event_index.ctp:17;61
 #: View/News/index.ctp:39
 #: View/Noticelists/index.ctp:13;83
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
-#: View/ObjectTemplates/index.ctp:13;126
+#: View/ObjectTemplates/index.ctp:13;137
 #: View/OrgBlacklists/index.ctp:13;52
-#: View/Organisations/index.ctp:42;138
+#: View/Organisations/index.ctp:42;159
 #: View/Regexp/admin_index.ctp:13;51
 #: View/Regexp/index.ctp:13;45
 #: View/Roles/admin_index.ctp:13;82
 #: View/Roles/index.ctp:13;55
-#: View/Servers/index.ctp:13;117
-#: View/Servers/preview_index.ctp:15;164
-#: View/ShadowAttributes/index.ctp:12;108
-#: View/SharingGroups/index.ctp:13;86
+#: View/Servers/index.ctp:13;156
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;63
-#: View/Taxonomies/view.ctp:53;169
+#: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:12;56
+#: View/Users/admin_index.ctp:12;86
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -2412,45 +2701,47 @@ msgstr " creato dall'organizzazione "
 msgid "previous"
 msgstr "precedente"
 
-#: View/Attributes/index.ctp:30;175
-#: View/Elements/eventattribute.ctp:62;260
+#: View/Attributes/index.ctp:41;134
+#: View/Elements/eventattribute.ctp:62;231
 #: View/Elements/eventdiscussion.ctp:17;128
+#: View/Elements/generic_table.ctp:18
+#: View/Elements/generic_table_row.ctp:18
 #: View/Elements/Feeds/eventattribute.ctp:22;88
 #: View/Elements/Servers/eventattribute.ctp:22;88
 #: View/EventBlacklists/index.ctp:15;56
-#: View/Events/index.ctp:14;91
+#: View/Events/index.ctp:14;117
 #: View/Events/proposal_event_index.ctp:14;97
 #: View/Events/ajax/index.ctp:15;41
 #: View/Feeds/freetext_index.ctp:24;88
-#: View/Feeds/index.ctp:22;232
-#: View/Feeds/preview_index.ctp:16;84
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
 #: View/Galaxies/index.ctp:15;55
-#: View/GalaxyClusters/ajax/index.ctp:13;98
+#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:35;164
-#: View/Logs/admin_index.ctp:39;113
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
 #: View/Logs/event_index.ctp:19;63
 #: View/News/index.ctp:41
 #: View/Noticelists/index.ctp:15;85
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
-#: View/ObjectTemplates/index.ctp:15;128
+#: View/ObjectTemplates/index.ctp:15;139
 #: View/OrgBlacklists/index.ctp:15;54
-#: View/Organisations/index.ctp:44;140
+#: View/Organisations/index.ctp:44;161
 #: View/Regexp/admin_index.ctp:15;53
 #: View/Regexp/index.ctp:15;47
 #: View/Roles/admin_index.ctp:15;84
 #: View/Roles/index.ctp:15;57
-#: View/Servers/index.ctp:15;119
-#: View/Servers/preview_index.ctp:17;166
-#: View/ShadowAttributes/index.ctp:14;110
-#: View/SharingGroups/index.ctp:15;88
+#: View/Servers/index.ctp:15;158
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;65
-#: View/Taxonomies/view.ctp:55;171
+#: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:14;58
+#: View/Users/admin_index.ctp:14;88
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -2458,66 +2749,144 @@ msgstr "precedente"
 msgid "next"
 msgstr "successivo"
 
-#: View/Attributes/index.ctp:148
-msgid "Are you sure you want to delete this attribute?"
-msgstr "Sei sicuro di voler eliminare questo attributo?"
+#: View/Attributes/index.ctp:53
+#: View/Elements/eventattribute.ctp:152
+#: View/Elements/Events/eventIndexTable.ctp:37
+#: View/Elements/Feeds/eventattribute.ctp:45
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/view.ctp:117
+#: View/Feeds/preview_event.ctp:16
+#: View/Noticelists/view.ctp:43
+#: View/Pages/doc/using_the_system.ctp:164;207;318
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
+#: View/Tags/index.ctp:10
+#: View/Templates/add.ctp:12
+#: View/Templates/edit.ctp:12
+#: View/Templates/view.ctp:19
+msgid "Tags"
+msgstr "Tag"
 
-#: View/Attributes/index.ctp:151
-msgid "Propose an edit"
-msgstr "Proponi e modifica"
+#: View/Attributes/index.ctp:54
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/Galaxies/index.ctp:2
+msgid "Galaxies"
+msgstr "Galaxies"
 
-#: View/Attributes/index.ctp:155
-#: View/Elements/Events/eventIndexTable.ctp:82;86;229
-#: View/Elements/Users/userIndexTable.ctp:94
-#: View/Elements/dashboard/dashboard_events.ctp:4;5
-#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
-#: View/Events/proposal_event_index.ctp:45;49
-#: View/Feeds/preview_index.ctp:66
-#: View/Noticelists/index.ctp:66
-#: View/ObjectTemplates/index.ctp:104
-#: View/Organisations/index.ctp:122
-#: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/preview_index.ctp:148
-#: View/Taxonomies/index.ctp:47
-#: View/Warninglists/index.ctp:60
-msgid "View"
-msgstr "Visualizza"
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:161
+msgid "Correlate"
+msgstr "Correlazione"
 
-#: View/Attributes/index.ctp:166
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Events/view.ctp:314
+#: View/Feeds/preview_event.ctp:73
+#: View/Pages/doc/using_the_system.ctp:235
+#: View/Servers/preview_event.ctp:95
+msgid "Related Events"
+msgstr "Eventi Correlati"
+
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:163
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+msgid "Feed hits"
+msgstr "Trovati nel feed"
+
+#: View/Attributes/index.ctp:61
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
+msgid "Sightings"
+msgstr "Sightings"
+
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
+#: View/Tags/index.ctp:73
+msgid "Activity"
+msgstr "Attività"
+
+#: View/Attributes/index.ctp:63
+#: View/Elements/eventattribute.ctp:168
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/healthElements/files.ctp:33
+#: View/Elements/healthElements/workers.ctp:60
+#: View/Elements/templateElements/templateRowAttribute.ctp:94
+#: View/Elements/templateElements/templateRowFile.ctp:71
+#: View/Elements/templateElements/templateRowText.ctp:28
+#: View/EventBlacklists/index.ctp:27
+#: View/Events/export.ctp:31
+#: View/Events/resolved_attributes.ctp:53
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:51
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:66
+#: View/OrgBlacklists/index.ctp:26
+#: View/Organisations/index.ctp:102
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:25
+#: View/Roles/admin_index.ctp:35
+#: View/Servers/index.ctp:37
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:27
+#: View/Templates/index.ctp:27
+#: View/Threads/index.ctp:28
+#: View/Warninglists/index.ctp:38
+#: View/Whitelists/admin_index.ctp:24
+msgid "Actions"
+msgstr "Azioni"
+
+#: View/Attributes/index.ctp:125
 #: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
 #: View/EventBlacklists/index.ctp:47
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:223
-#: View/Feeds/preview_index.ctp:74
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
 #: View/Galaxies/index.ctp:46
-#: View/GalaxyClusters/ajax/index.ctp:90
+#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:155
-#: View/Logs/admin_index.ctp:104
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
 #: View/Logs/event_index.ctp:54
 #: View/News/index.ctp:33
 #: View/Noticelists/index.ctp:76
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:66
-#: View/ObjectTemplates/index.ctp:119
+#: View/ObjectTemplates/index.ctp:130
 #: View/OrgBlacklists/index.ctp:45
-#: View/Organisations/index.ctp:131
+#: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
 #: View/Roles/admin_index.ctp:75
 #: View/Roles/index.ctp:48
-#: View/Servers/index.ctp:110
-#: View/Servers/preview_index.ctp:156
-#: View/ShadowAttributes/index.ctp:101
-#: View/SharingGroups/index.ctp:79
+#: View/Servers/index.ctp:149
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:56
-#: View/Taxonomies/view.ctp:162
+#: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:49
+#: View/Users/admin_index.ctp:79
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -2564,26 +2933,22 @@ msgid "Containing the following expressions"
 msgstr "Contenenti le seguenti stringhe"
 
 #: View/Attributes/search.ctp:11
-msgid "Being an attribute matching the following tags"
-msgstr "Essere un attributo con i seguenti tag"
+msgid "Having tag or being an attribute of an event having the tag"
+msgstr ""
 
 #: View/Attributes/search.ctp:12
 msgid "Being attributes of the following event IDs, event UUIDs or attribute UUIDs"
 msgstr "Essere un attributi dei seguenti ID evento, UUID evento o UUID attributo"
 
-#: View/Attributes/search.ctp:13
-msgid "Being an attribute of an event matching the following tags"
-msgstr "Essere un attributo di un evento con i seguenti tag"
-
-#: View/Attributes/search.ctp:20
+#: View/Attributes/search.ctp:15
 msgid "From the following organisation(s)"
 msgstr "Dalle seguenti organizzazioni"
 
-#: View/Attributes/search.ctp:36
-msgid "Only find IOCs to use in IDS"
-msgstr "Trova solo IoC da utilizzare nel IDS"
+#: View/Attributes/search.ctp:29
+msgid "Only find IOCs flagged as to_ids"
+msgstr ""
 
-#: View/Attributes/search.ctp:40
+#: View/Attributes/search.ctp:33
 msgid "Alternate Search Result (Events)"
 msgstr "Risultati alternativi alla ricerca (Eventi)"
 
@@ -2601,26 +2966,26 @@ msgstr "Sei sicuro di cancellare l'attributo #%s? Questa operazione non cancella
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90
-#: View/Elements/galaxyQuickView.ctp:23
-#: View/Elements/side_menu.ctp:351
-#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/eventIndexTable.ctp:229
 #: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:30
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Roles/admin_index.ctp:67
-#: View/Servers/index.ctp:99
+#: View/Servers/index.ctp:138
 #: View/Tags/index.ctp:125
 msgid "Delete"
 msgstr "Cancella"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
@@ -2634,34 +2999,36 @@ msgstr "Cancella"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:56
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:168
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
 #: View/Events/ajax/handleSelected.ctp:17
 #: View/Events/ajax/toggle_correlation.ctp:20
 #: View/Feeds/preview_event.ctp:56
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:79
 #: View/Servers/ajax/update.ctp:11
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
 #: View/Templates/view.ctp:41
-#: View/Users/admin_view.ctp:32;37;104;114;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:27
 msgid "Yes"
 msgstr "Sì"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:21
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
@@ -2675,29 +3042,30 @@ msgstr "Sì"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:58;176
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:166
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/handleSelected.ctp:22
 #: View/Events/ajax/toggle_correlation.ctp:25
 #: View/Feeds/preview_event.ctp:61;66
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:89
 #: View/Servers/ajax/update.ctp:16
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
 #: View/Templates/view.ctp:42
-#: View/Users/admin_view.ctp:32;37;106;116;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
 msgid "No"
@@ -2706,7 +3074,6 @@ msgstr "No"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:5
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:5
 #: View/Attributes/ajax/attributeEditValueForm.ctp:6
 msgid "Accept change"
@@ -2715,7 +3082,6 @@ msgstr "Accetta modifica"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:6
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
 msgid "Discard change"
@@ -2732,7 +3098,7 @@ msgstr "Non modificare le impostazioni correnti"
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/view.ctp:143
+#: View/Events/view.ctp:145
 #: View/Feeds/add.ctp:167
 #: View/Feeds/edit.ctp:164
 #: View/Feeds/freetext_index.ctp:36
@@ -2754,6 +3120,50 @@ msgstr "Per Intrusion Detection System"
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr "Lascia questo campo voto per lasciare il campo commento dell'attributo inalterato."
 
+#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+msgid "Tags to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+msgid "Tags to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+msgid "Clusters to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+msgid "Clusters to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr "on"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr "off"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
 #: View/Attributes/ajax/attributeRestorationForm.ctp:5
 msgid "Attribute Restoration"
 msgstr "Recupero Attributo"
@@ -2762,6 +3172,15 @@ msgstr "Recupero Attributo"
 msgid "Are you sure you want to undelete Attribute #%s?"
 msgstr "Sei sicuro di ripristinare l'attributo #%s?"
 
+#: View/Attributes/ajax/exportSearch.ctp:2
+msgid "Choose the format that you wish to download the search results in"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:10;23
+#: View/Events/ajax/exportChoice.ctp:17;18;27;28
+msgid "Export as %s"
+msgstr "Esporta come %s"
+
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
 msgid "Remove Tag"
 msgstr "Rimuovi Tag"
@@ -2782,16 +3201,6 @@ msgstr "Rimuovi"
 msgid "Toggle Correlation %s "
 msgstr "Attiva/disattiva correlazione %s "
 
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "on"
-msgstr "on"
-
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "off"
-msgstr "off"
-
 #: View/Attributes/ajax/toggle_correlation.ctp:11
 msgid "Re-enable the correlation for this attribute."
 msgstr "Riabilita la correlazione per questo attributo."
@@ -2804,13 +3213,21 @@ msgstr "Questa operazione cancella tutte le correlazioni esistenti per questo at
 msgid "Toggle correlation for attribute"
 msgstr "Attiva/disattiva correlazione per l'attributo"
 
-#: View/Elements/ajaxAttributeTags.ctp:25
+#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Elements/ajaxTagCollectionTags.ctp:16
 #: View/Elements/ajaxTags.ctp:14
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr "Rimuovi tag"
 
+#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Pages/doc/using_the_system.ctp:303
+#: View/Templates/add.ctp:17
+#: View/Templates/edit.ctp:17
+msgid "Add tag"
+msgstr ""
+
 #: View/Elements/ajaxTags.ctp:17
 msgid "Remove tag %s"
 msgstr "Rimuovi tag %s"
@@ -2821,209 +3238,27 @@ msgstr "Rimuovi tag %s"
 msgid "Add a tag"
 msgstr "Aggiungi tag"
 
-#: View/Elements/eventattribute.ctp:71;269
+#: View/Elements/eventattribute.ctp:71;240
 #: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
 #: View/Elements/Servers/eventattribute.ctp:28;31;94;97
 msgid "view all"
 msgstr "mostra tutto"
 
-#: View/Elements/eventattribute.ctp:117
-#: View/Pages/doc/using_the_system.ctp:86
-msgid "Add attribute"
-msgstr "Aggiungi attributo"
-
-#: View/Elements/eventattribute.ctp:118
-msgid "Edit selected Attributes"
-msgstr "Modifica Attributi selezionati"
-
-#: View/Elements/eventattribute.ctp:119
-msgid "Tag selected Attributes"
-msgstr "Classifica Attributi selezionati"
-
-#: View/Elements/eventattribute.ctp:120
-msgid "Delete selected Attributes"
-msgstr "Elimina Attributi selezionati"
-
-#: View/Elements/eventattribute.ctp:121
-msgid "Accept selected Proposals"
-msgstr "Accetta Proposte selezionate"
-
-#: View/Elements/eventattribute.ctp:122
-msgid "Discard selected Proposals"
-msgstr "Elimina Proposte selezionate"
-
-#: View/Elements/eventattribute.ctp:123
-msgid "Sightings display for selected attributes"
-msgstr "Visualizza segnalazioni per gli attributi selezionati"
-
-#: View/Elements/eventattribute.ctp:127
-msgid "Populate using a template"
-msgstr "Popolare utilizzando un modello"
-
-#: View/Elements/eventattribute.ctp:129
-msgid "Populate using the freetext import tool"
-msgstr "Popolare utilizzando il tool di importazione di testo"
-
-#: View/Elements/eventattribute.ctp:131
-msgid "Replace all attributes of a category/type combination within the event"
-msgstr "Sostituisci tutti gli attributi di una combinazione categoria/tipo nell'evento"
-
-#: View/Elements/eventattribute.ctp:140;159
-msgid "Show all attributes"
-msgstr "Visualizza tutti gli attributi"
-
-#: View/Elements/eventattribute.ctp:144
-msgid "Only show %s related attributes"
-msgstr "Visualizza solo gli attributi relativi a %s"
-
-#: View/Elements/eventattribute.ctp:148
-msgid "Only show proposals"
-msgstr "Visualizza solo le Proposte"
-
-#: View/Elements/eventattribute.ctp:148
-#: View/Logs/event_index.ctp:44
-msgid "Proposal"
-msgstr "Proposte"
-
-#: View/Elements/eventattribute.ctp:149
-msgid "Only show correlating attributes"
-msgstr "Visualizza solo gli attributi di correlazione"
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Only show potentially false positive attributes"
-msgstr "Visualizza solo gli attributi relativi a falsi positivi"
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Warnings"
-msgstr "Avvisi"
-
-#: View/Elements/eventattribute.ctp:152
-msgid "Include deleted attributes"
-msgstr "Includi attributi eliminati"
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show attribute context fields"
-msgstr "Visualizza i campi di contesto degli attributi"
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show context fields"
-msgstr "Visualizza i campi di contesto"
-
-#: View/Elements/eventattribute.ctp:157
-msgid "Filter on attributes value"
-msgstr "Filtro basato sul valore degli attributi"
-
-#: View/Elements/eventattribute.ctp:159
-#: View/Events/index.ctp:41
-#: View/Servers/preview_index.ctp:42
-#: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:37
-msgid "Remove filters"
-msgstr "Rimuovi i filtri"
-
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all"
 msgstr "Seleziona tutto"
 
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 msgid "Select all attributes/proposals on current page"
 msgstr "Seleziona tutti gli attributi/proposte nella pagina corrente"
 
-#: View/Elements/eventattribute.ctp:188
-#: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/view.ctp:121
-#: View/Feeds/preview_event.ctp:16
-#: View/Noticelists/view.ctp:43
-#: View/Pages/doc/using_the_system.ctp:164;207;318
-#: View/Servers/preview_event.ctp:27
-#: View/Servers/preview_index.ctp:68
-#: View/Tags/index.ctp:10
-#: View/Templates/add.ctp:12
-#: View/Templates/edit.ctp:12
-#: View/Templates/view.ctp:19
-msgid "Tags"
-msgstr "Tag"
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
+msgstr ""
 
-#: View/Elements/eventattribute.ctp:189
-#: View/Elements/global_menu.ctp:56
-#: View/Events/view.ctp:387
-#: View/Galaxies/index.ctp:2
-msgid "Galaxies"
-msgstr "Galaxies"
-
-#: View/Elements/eventattribute.ctp:191
-msgid "Correlate"
-msgstr "Correlazione"
-
-#: View/Elements/eventattribute.ctp:192
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:263
-#: View/Feeds/preview_event.ctp:73
-#: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:95
-msgid "Related Events"
-msgstr "Eventi Correlati"
-
-#: View/Elements/eventattribute.ctp:193
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
-msgid "Feed hits"
-msgstr "Trovati nel feed"
-
-#: View/Elements/eventattribute.ctp:196
-#: View/Events/view.ctp:198
-msgid "Sightings"
-msgstr "Sightings"
-
-#: View/Elements/eventattribute.ctp:197
-#: View/Events/view.ctp:205
-#: View/Tags/index.ctp:73
-msgid "Activity"
-msgstr "Attività"
-
-#: View/Elements/eventattribute.ctp:198
-#: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/healthElements/files.ctp:33
-#: View/Elements/healthElements/workers.ctp:55
-#: View/Elements/templateElements/templateRowAttribute.ctp:94
-#: View/Elements/templateElements/templateRowFile.ctp:71
-#: View/Elements/templateElements/templateRowText.ctp:28
-#: View/EventBlacklists/index.ctp:27
-#: View/Events/export.ctp:31
-#: View/Events/resolved_attributes.ctp:53
-#: View/Feeds/index.ctp:61
-#: View/Feeds/preview_index.ctp:38
-#: View/GalaxyClusters/ajax/index.ctp:51
-#: View/Noticelists/index.ctp:37
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:55
-#: View/OrgBlacklists/index.ctp:26
-#: View/Organisations/index.ctp:81
-#: View/Pages/doc/using_the_system.ctp:187;238;286;382
-#: View/Regexp/admin_index.ctp:25
-#: View/Roles/admin_index.ctp:35
-#: View/Servers/index.ctp:36
-#: View/Servers/preview_index.ctp:80
-#: View/SharingGroups/add.ctp:34;54
-#: View/SharingGroups/edit.ctp:34;62
-#: View/SharingGroups/index.ctp:30
-#: View/Sightings/ajax/list_sightings.ctp:11
-#: View/Tags/index.ctp:76
-#: View/Taxonomies/index.ctp:27
-#: View/Templates/index.ctp:27
-#: View/Threads/index.ctp:28
-#: View/Warninglists/index.ctp:38
-#: View/Whitelists/admin_index.ctp:24
-msgid "Actions"
-msgstr "Azioni"
-
-#: View/Elements/eventattribute.ctp:238
+#: View/Elements/eventattribute.ctp:209
 msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
 "a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
 "attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
@@ -3031,7 +3266,7 @@ msgstr "Avviso sull'Attributo: Questo evento non ha attributi visualizzabili da
 "Chi ha generato questo evento potrebbe aver utilizzato uno schema specifico che non visualizza gli attributi o ha dimenticato di aggiungere gli attributi/livello di distribuzione.\n"
 "Se pensi che sia un errore o di poter contribuire con degli attributi, sentiti libero di farlo"
 
-#: View/Elements/eventattribute.ctp:242
+#: View/Elements/eventattribute.ctp:213
 msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
 msgstr "Avviso sull'Attributo: Questo evento non contiene alcun attributo. E' vivamente consigliato di popolare l'evento con attributi (indicatori ed informazioni) che lo rendano utile"
 
@@ -3039,6 +3274,140 @@ msgstr "Avviso sull'Attributo: Questo evento non contiene alcun attributo. E' vi
 msgid "Create multiple attributes one per line"
 msgstr "Crea attributi multipli mettendone uno per linea"
 
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr "Visualizza tutti gli attributi"
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr "Tutto"
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr "Visualizza solo gli attributi relativi a %s"
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr "Visualizza solo le Proposte"
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr "Proposte"
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr "Visualizza solo gli attributi di correlazione"
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr "Correlazione"
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr "Visualizza solo gli attributi relativi a falsi positivi"
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr "Attenzione"
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr "Aggiungi attributo"
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr "Modifica Attributi selezionati"
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr "Classifica Attributi selezionati"
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr "Elimina Attributi selezionati"
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr "Accetta Proposte selezionate"
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr "Elimina Proposte selezionate"
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr "Visualizza segnalazioni per gli attributi selezionati"
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr "Popolare utilizzando un modello"
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr "Popolare utilizzando il tool di importazione di testo"
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr "Sostituisci tutti gli attributi di una combinazione categoria/tipo nell'evento"
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr "Includi attributi eliminati"
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr "Visualizza i campi di contesto degli attributi"
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr "Rimuovi i filtri"
+
 #: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr "Data: "
@@ -3048,14 +3417,14 @@ msgid "Deactivated user"
 msgstr "Utenti disabilitati"
 
 #: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:223
-#: View/Elements/Events/View/row_attribute.ctp:299
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/View/row_attribute.ctp:380
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/Feeds/edit.ctp:193
 #: View/OrgBlacklists/edit.ctp:22
 #: View/Pages/doc/using_the_system.ctp:191
-#: View/Servers/index.ctp:98
-#: View/Tags/edit.ctp:35
+#: View/Servers/index.ctp:137
+#: View/Tags/edit.ctp:36
 #: View/Templates/edit.ctp:49
 msgid "Edit"
 msgstr "Modifica"
@@ -3083,12 +3452,12 @@ msgid "Insert a link to an event - just enter the event ID between the [event][/
 msgstr "Inserisci un collegamento ad un evento - scrivi l'ID dell'evento tra i tag [event][/event]."
 
 #: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:180;191
+#: View/Events/view.ctp:196;207
 #: View/Objects/orphaned_object_diagnostics.ctp:21
 #: View/Pages/doc/administration.ctp:167
 #: View/Pages/doc/using_the_system.ctp:200;279
 #: View/Posts/add.ctp:33
-#: View/ShadowAttributes/index.ctp:31
+#: View/ShadowAttributes/index.ctp:41
 msgid "Event"
 msgstr "Evento"
 
@@ -3123,9 +3492,19 @@ msgid "Code"
 msgstr "Codice"
 
 #: View/Elements/eventdiscussion.ctp:156
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr "Invia"
 
+#: View/Elements/flashErrorMessage.ctp:2
+msgid "Errors"
+msgstr ""
+
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Jobs/ajax/error.ctp:34
+msgid "Close"
+msgstr "Chiudi"
+
 #: View/Elements/footer.ctp:5
 msgid "Keyboard shortcuts for this page"
 msgstr "Combinazione di tasti veloci per questa pagina"
@@ -3137,8 +3516,8 @@ msgstr "niente"
 #: View/Elements/footer.ctp:15
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:60
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
 msgid "GnuPG key"
 msgstr "Chiave GnuPG"
 
@@ -3154,32 +3533,36 @@ msgstr "Certificato SMIME non trovato."
 msgid "View details about this galaxy"
 msgstr "Visualizza i dettagli di questa Galaxy"
 
-#: View/Elements/galaxyQuickView.ctp:17
+#: View/Elements/galaxyQuickView.ctp:19
 #: View/Elements/galaxyQuickViewMini.ctp:69
 msgid "View details about this cluster"
 msgstr "Visualizza i dettagli di questo cluster"
 
-#: View/Elements/galaxyQuickView.ctp:18
+#: View/Elements/galaxyQuickView.ctp:20
 #: View/Elements/galaxyQuickViewMini.ctp:70
 msgid "View all events containing this cluster."
 msgstr "Visualizza tutti gli eventi contenenti questo cluster."
 
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
 #: View/Elements/galaxyQuickView.ctp:24
 msgid "Are you sure you want to detach %s from this event?"
 msgstr "Sicuro di voler eliminare %s da questo evento?"
 
-#: View/Elements/galaxyQuickViewMini.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:74
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr "Sei sicuro di volere scollegare %s da %s?"
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 msgid "Add new cluster"
 msgstr "Aggiungi un cluster"
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 #: View/EventBlacklists/add.ctp:35
 #: View/EventBlacklists/edit.ctp:29
-#: View/Events/add.ctp:72
+#: View/Events/add.ctp:68
 #: View/Events/filter_event_index.ctp:125
 #: View/Feeds/add.ctp:198
 #: View/Feeds/import_feeds.ctp:19
@@ -3189,113 +3572,139 @@ msgstr "Aggiungi un cluster"
 #: View/Roles/admin_add.ctp:44
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 #: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:19
 #: View/Tags/add.ctp:35
 #: View/Users/admin_filter_user_index.ctp:62
 #: View/Whitelists/admin_add.ctp:13
 msgid "Add"
 msgstr "Aggiungi"
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/side_menu.ctp:174;188
+#: View/Elements/generic_picker.ctp:205
+msgid "Due to the large number of options, no contextual information is provided."
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:273
+msgid "Nothing to pick"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:11
+#: View/Pages/doc/general.ctp:20
+msgid "Event Actions"
+msgstr "Azioni evento"
+
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr "Elenco Eventi"
 
-#: View/Elements/global_menu.ctp:26
-#: View/Elements/side_menu.ctp:179;194
-#: View/Events/add.ctp:8
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
+#: View/Events/add.ctp:4
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
 msgstr "Aggiungi Evento"
 
-#: View/Elements/global_menu.ctp:28
-#: View/Elements/side_menu.ctp:213
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr "Lista Attributi"
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/side_menu.ctp:218
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr "Cerca Attributi"
 
-#: View/Elements/global_menu.ctp:30
-#: View/Elements/side_menu.ctp:206
-#: View/Servers/rest.ctp:4
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
+#: View/Servers/rest.ctp:20
 msgid "REST client"
 msgstr "Client REST"
 
-#: View/Elements/global_menu.ctp:32
-#: View/Elements/side_menu.ctp:238
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "Visualizza Proposte"
 
-#: View/Elements/global_menu.ctp:35
-#: View/Elements/side_menu.ctp:446
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
+#: View/Pages/doc/general.ctp:39
+msgid "Events with proposals"
+msgstr "Eventi con proposte"
+
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "Elenco classificazioni"
 
-#: View/Elements/global_menu.ctp:37
-#: View/Elements/side_menu.ctp:450
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
+msgid "List Tag Collections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 #: View/Tags/edit.ctp:4
 msgid "Add Tag"
 msgstr "Aggiungi Tag"
 
-#: View/Elements/global_menu.ctp:39
-#: View/Elements/side_menu.ctp:471
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 msgid "List Taxonomies"
 msgstr "Elenco Tassonomie"
 
-#: View/Elements/global_menu.ctp:41
-#: View/Elements/side_menu.ctp:485
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "Elenco Modelli"
 
-#: View/Elements/global_menu.ctp:43
-#: View/Elements/side_menu.ctp:487
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "Aggiungi Modello"
 
-#: View/Elements/global_menu.ctp:46
-#: View/Elements/side_menu.ctp:247
+#: View/Elements/global_menu.ctp:78
 #: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
 msgstr "Esporta"
 
-#: View/Elements/global_menu.ctp:48
-#: View/Elements/side_menu.ctp:253
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
+#: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
 #: View/Pages/doc/using_the_system.ctp:15;361
 msgid "Automation"
 msgstr "Automazione"
 
-#: View/Elements/global_menu.ctp:60
-#: View/Elements/side_menu.ctp:529
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 msgid "List Galaxies"
 msgstr "Elenco Galaxy"
 
-#: View/Elements/global_menu.ctp:67
+#: View/Elements/global_menu.ctp:101
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr "Filtri di inserimento"
 
-#: View/Elements/global_menu.ctp:72;76
+#: View/Elements/global_menu.ctp:104;109
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -3304,7 +3713,7 @@ msgstr "Filtri di inserimento"
 msgid "Import Regexp"
 msgstr "Importa Tegexp"
 
-#: View/Elements/global_menu.ctp:73;77
+#: View/Elements/global_menu.ctp:114;119
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -3313,82 +3722,88 @@ msgstr "Importa Tegexp"
 msgid "Signature Whitelist"
 msgstr "Firma Whitelist"
 
-#: View/Elements/global_menu.ctp:79
-#: View/Elements/side_menu.ctp:274
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 msgid "List Warninglists"
 msgstr "Elenco Gruppi Segnalazioni"
 
-#: View/Elements/global_menu.ctp:80
-#: View/Elements/side_menu.ctp:283
+#: View/Elements/global_menu.ctp:128
 msgid "List Noticelists"
 msgstr "Elenco Noticelists"
 
-#: View/Elements/global_menu.ctp:90
+#: View/Elements/global_menu.ctp:135
+#: View/Pages/doc/general.ctp:22;54
+msgid "Global Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:139
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
 msgstr "Notizie"
 
-#: View/Elements/global_menu.ctp:91
-#: View/Elements/side_menu.ctp:311
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "Profilo"
 
-#: View/Elements/global_menu.ctp:92;203
-#: View/Elements/side_menu.ctp:312
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: View/Elements/global_menu.ctp:96
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
-#: View/Users/statistics_data.ctp:32
+#: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr "Organizzazioni"
 
-#: View/Elements/global_menu.ctp:100
-#: View/Elements/side_menu.ctp:325
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "Permessi Ruolo"
 
-#: View/Elements/global_menu.ctp:102
-#: View/Elements/side_menu.ctp:552
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "List Object Templates"
 msgstr "Elenco Modelli Oggetti"
 
-#: View/Elements/global_menu.ctp:104
-#: View/Elements/side_menu.ctp:331
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Sharing Groups"
 msgstr "Elenco Gruppi Condivisione"
 
-#: View/Elements/global_menu.ctp:106
-#: View/Elements/side_menu.ctp:332
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
 msgid "Add Sharing Group"
 msgstr "Aggiungi Sharing Group"
 
-#: View/Elements/global_menu.ctp:109
-#: View/Elements/side_menu.ctp:334
-#: View/Events/automation.ctp:42
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
+#: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
 msgstr "Guida Utente"
 
-#: View/Elements/global_menu.ctp:110
-#: View/Elements/side_menu.ctp:335
-#: View/Pages/doc/general.ctp:61
-#: View/Pages/doc/user_management.ctp:54
-msgid "Terms &amp; Conditions"
-msgstr "Termini &amp; Condizioni"
+#: View/Elements/global_menu.ctp:186
+msgid "Categories & Types"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:111
-#: View/Elements/side_menu.ctp:336
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -3401,30 +3816,34 @@ msgstr "Termini &amp; Condizioni"
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: View/Elements/global_menu.ctp:113
+#: View/Elements/global_menu.ctp:201
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr "Elenco conversazioni"
 
-#: View/Elements/global_menu.ctp:114
+#: View/Elements/global_menu.ctp:205
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr "Inizia conversazione"
 
-#: View/Elements/global_menu.ctp:125
-#: View/Elements/side_menu.ctp:354
+#: View/Elements/global_menu.ctp:212
+#: View/Pages/doc/general.ctp:23;66
+msgid "Sync Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "Elenco Server"
 
-#: View/Elements/global_menu.ctp:127
-#: View/Elements/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
 msgid "List Feeds"
 msgstr "Elenco Feed"
 
-#: View/Elements/global_menu.ctp:136
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/administration.ctp:8
-#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
 #: View/Pages/doc/quickstart.ctp:8
@@ -3433,95 +3852,100 @@ msgstr "Elenco Feed"
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: View/Elements/global_menu.ctp:140
-#: View/Elements/side_menu.ctp:376
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "Elenco Utenti"
 
-#: View/Elements/global_menu.ctp:141
-#: View/Elements/side_menu.ctp:375
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
 msgid "Add User"
 msgstr "Aggiungi Utente"
 
-#: View/Elements/global_menu.ctp:142
-#: View/Elements/side_menu.ctp:379
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr "Contatta Utente"
 
-#: View/Elements/global_menu.ctp:144
-#: View/Elements/side_menu.ctp:316;391
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
 msgid "List Organisations"
 msgstr "Elenco Organizzazioni"
 
-#: View/Elements/global_menu.ctp:146
-#: View/Elements/side_menu.ctp:383
-msgid "Add Organisation"
-msgstr "Aggiungi Organizzazione"
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:149
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr "Elenco Ruoli"
 
-#: View/Elements/global_menu.ctp:151
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
-msgstr "Aggiungi Ruolo"
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-msgid "Maintenance"
-msgstr "Manutenzione"
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
+msgstr "Impostazioni Server & Manutenzione"
 
-#: View/Elements/global_menu.ctp:158
-#: View/Elements/side_menu.ctp:401
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "Jobs"
 
-#: View/Elements/global_menu.ctp:160
-#: View/Elements/side_menu.ctp:403
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
 msgstr "Task pianificati"
 
-#: View/Elements/global_menu.ctp:165
-#: View/Elements/side_menu.ctp:407
+#: View/Elements/global_menu.ctp:300
+msgid "Blacklist Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
 msgid "Manage Event Blacklists"
 msgstr "Gestisci Blacklist Eventi"
 
-#: View/Elements/global_menu.ctp:169
+#: View/Elements/global_menu.ctp:314
 msgid "Blacklist Organisation"
 msgstr "Metti Organizzazione nella blacklist"
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/side_menu.ctp:411
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
 msgid "Manage Org Blacklists"
 msgstr "Gestisci Blacklist Org"
 
-#: View/Elements/global_menu.ctp:180
+#: View/Elements/global_menu.ctp:327
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr "Audit"
 
-#: View/Elements/global_menu.ctp:184
-#: View/Elements/side_menu.ctp:417
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "Elenco Log"
 
-#: View/Elements/global_menu.ctp:185
-#: View/Elements/side_menu.ctp:418
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "Cerca nei Log"
 
-#: View/Elements/global_menu.ctp:207;209
+#: View/Elements/global_menu.ctp:362;367
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr "Log out"
@@ -3542,407 +3966,8 @@ msgstr "Attiva/disattiva istogramma"
 msgid "Attributes per organization"
 msgstr "Attributi per organizzazione"
 
-#: View/Elements/side_menu.ctp:17;78
-msgid "Populate From Template"
-msgstr "Popolare dal modello"
-
-#: View/Elements/side_menu.ctp:24
-msgid "Freetext Import Result"
-msgstr "Risultato importazione testo"
-
-#: View/Elements/side_menu.ctp:31
-msgid "View Event"
-msgstr "Visualizza Evento"
-
-#: View/Elements/side_menu.ctp:36;465;540
-msgid "View Correlation Graph"
-msgstr "Visualizza Grafico di Correlazione"
-
-#: View/Elements/side_menu.ctp:41
-msgid "View Event History"
-msgstr "Visualizza storico Evento"
-
-#: View/Elements/side_menu.ctp:48
-#: View/Events/edit.ctp:8
-msgid "Edit Event"
-msgstr "Modifica Evento"
-
-#: View/Elements/side_menu.ctp:50
-msgid "Delete Event"
-msgstr "Cancella Evento"
-
-#: View/Elements/side_menu.ctp:50;267;298;351;371
-#: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Servers/index.ctp:99
-msgid "Are you sure you want to delete # %s?"
-msgstr "Sicuro di voler cancellare # %s?"
-
-#: View/Elements/side_menu.ctp:61
-msgid "Add Object"
-msgstr "Aggiungi Oggetto"
-
-#: View/Elements/side_menu.ctp:66
-msgid "Add Attachment"
-msgstr "Aggiungi allegato"
-
-#: View/Elements/side_menu.ctp:73
-msgid "Populate from..."
-msgstr "Popolare da..."
-
-#: View/Elements/side_menu.ctp:86
-#: View/Events/ajax/enrich_event.ctp:2
-msgid "Enrich Event"
-msgstr "Arricchisci evento"
-
-#: View/Elements/side_menu.ctp:91
-msgid "Merge attributes from..."
-msgstr "Incorporare attributi da..."
-
-#: View/Elements/side_menu.ctp:98
-msgid "Propose Attribute"
-msgstr "Proponi Attributo"
-
-#: View/Elements/side_menu.ctp:103
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr "Proponi Allegato"
-
-#: View/Elements/side_menu.ctp:115
-#: View/Elements/Events/eventIndexTable.ctp:218
-msgid "Publish Event"
-msgstr "Pubblica Evento"
-
-#: View/Elements/side_menu.ctp:123
-msgid "Publish (no email)"
-msgstr "Pubblica (no email)"
-
-#: View/Elements/side_menu.ctp:132
-msgid "Delegate Publishing"
-msgstr "Delega la pubblicazione"
-
-#: View/Elements/side_menu.ctp:143
-#: View/EventDelegations/ajax/accept_delegation.ctp:2
-msgid "Accept Delegation Request"
-msgstr "Accetta Richiesta di Delega"
-
-#: View/Elements/side_menu.ctp:151
-msgid "Discard Delegation Request"
-msgstr "Rimuovi richiesta di delega"
-
-#: View/Elements/side_menu.ctp:157
-msgid "Publish event to ZMQ"
-msgstr "Evento pubblicato in ZMQ"
-
-#: View/Elements/side_menu.ctp:162
-msgid "Contact Reporter"
-msgstr "Contatta segnalante"
-
-#: View/Elements/side_menu.ctp:169
-msgid "Download as..."
-msgstr "Scarica come..."
-
-#: View/Elements/side_menu.ctp:201
-msgid "Import from…"
-msgstr "Importa da…"
-
-#: View/Elements/side_menu.ctp:224
-msgid "Download results as JSON"
-msgstr "Scarica risultati come JSON"
-
-#: View/Elements/side_menu.ctp:228
-msgid "Download results as XML"
-msgstr "Scarica risultati come XML"
-
-#: View/Elements/side_menu.ctp:232
-msgid "Download results as CSV"
-msgstr "Scarica risultati come CSV"
-
-#: View/Elements/side_menu.ctp:242
-#: View/Pages/doc/general.ctp:39
-msgid "Events with proposals"
-msgstr "Eventi con proposte"
-
-#: View/Elements/side_menu.ctp:259
-msgid "List Regexp"
-msgstr "Elenco Regexp"
-
-#: View/Elements/side_menu.ctp:261
-msgid "New Regexp"
-msgstr "Nuovo Regexp"
-
-#: View/Elements/side_menu.ctp:262
-msgid "Perform on existing"
-msgstr "Esegui all'uscita"
-
-#: View/Elements/side_menu.ctp:266
-msgid "Edit Regexp"
-msgstr "Modifica Regexp"
-
-#: View/Elements/side_menu.ctp:267
-msgid "Delete Regexp"
-msgstr "Cancella Regexp"
-
-#: View/Elements/side_menu.ctp:273
-msgid "View Warninglist"
-msgstr "Visualizza Warninglist"
-
-#: View/Elements/side_menu.ctp:276
-msgid "Update Warninglists"
-msgstr "Aggiorna le Warninglist"
-
-#: View/Elements/side_menu.ctp:282
-msgid "View Noticelist"
-msgstr "Visualizza la Noticelist"
-
-#: View/Elements/side_menu.ctp:285
-msgid "Update Noticelists"
-msgstr "Aggiorna Noticeslists"
-
-#: View/Elements/side_menu.ctp:291
-msgid "List Whitelist"
-msgstr "Elenco Whitelist"
-
-#: View/Elements/side_menu.ctp:293
-msgid "New Whitelist"
-msgstr "Nuova Whitelist"
-
-#: View/Elements/side_menu.ctp:297
-msgid "Edit Whitelist"
-msgstr "Modifica Whitelist"
-
-#: View/Elements/side_menu.ctp:298
-msgid "Delete Whitelist"
-msgstr "Cancella Whitelist"
-
-#: View/Elements/side_menu.ctp:305
-#: View/Users/edit.ctp:4
-msgid "Edit My Profile"
-msgstr "Modifica Profilo"
-
-#: View/Elements/side_menu.ctp:306
-#: View/Pages/doc/administration.ctp:126
-#: View/Users/admin_edit.ctp:70
-#: View/Users/change_pw.ctp:4
-msgid "Change Password"
-msgstr "Cambio Password"
-
-#: View/Elements/side_menu.ctp:321;389
-msgid "View Organisation"
-msgstr "Visualizza Organizzazione"
-
-#: View/Elements/side_menu.ctp:328
-#: View/SharingGroups/edit.ctp:3
-msgid "Edit Sharing Group"
-msgstr "Modifica Sharing Group"
-
-#: View/Elements/side_menu.ctp:329
-msgid "View Sharing Group"
-msgstr "Visualizza Sharing Group"
-
-#: View/Elements/side_menu.ctp:342
-msgid "Explore Remote Event"
-msgstr "Naviga Eventi Remoti"
-
-#: View/Elements/side_menu.ctp:343
-msgid "Fetch This Event"
-msgstr "Scarica questo evento"
-
-#: View/Elements/side_menu.ctp:343
-#: View/Feeds/preview_index.ctp:65
-#: View/Servers/preview_index.ctp:147
-msgid "Are you sure you want to fetch and save this event on your instance?"
-msgstr "Sei sicuro di voler scaricare e salvare questo evento nella tua istanza?"
-
-#: View/Elements/side_menu.ctp:344;347
-msgid "Explore Remote Server"
-msgstr "Naviga Server Remoti"
-
-#: View/Elements/side_menu.ctp:350
-#: View/Servers/edit.ctp:4
-msgid "Edit Server"
-msgstr "Modifica Server"
-
-#: View/Elements/side_menu.ctp:356
-msgid "New Server"
-msgstr "Nuovo Server"
-
-#: View/Elements/side_menu.ctp:363
-msgid "View User"
-msgstr "Visualizza Server"
-
-#: View/Elements/side_menu.ctp:364
-msgid "Reset Password"
-msgstr "Reimposta Password"
-
-#: View/Elements/side_menu.ctp:365
-msgid "Edit User"
-msgstr "Modifica Utente"
-
-#: View/Elements/side_menu.ctp:366
-msgid "Delete User"
-msgstr "Cancella Utente"
-
-#: View/Elements/side_menu.ctp:366
-#: View/Elements/Users/userIndexTable.ctp:91
-msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
-msgstr "Sei sicuro di voler cancellare # %s? È vivamente raccomandato non cancellare mai gli utenti, ma piuttosto disabilitarli."
-
-#: View/Elements/side_menu.ctp:370
-#: View/Roles/admin_edit.ctp:4
-msgid "Edit Role"
-msgstr "Modifica Ruolo"
-
-#: View/Elements/side_menu.ctp:371
-msgid "Delete Role"
-msgstr "Cancella Ruolo"
-
-#: View/Elements/side_menu.ctp:385
-#: View/Organisations/admin_edit.ctp:4
-msgid "Edit Organisation"
-msgstr "Modifica Organizzazione"
-
-#: View/Elements/side_menu.ctp:386
-#: View/Organisations/ajax/merge.ctp:5
-msgid "Merge Organisation"
-msgstr "Fondi Organizzazione"
-
-#: View/Elements/side_menu.ctp:398
-#: View/Servers/server_settings.ctp:5
-msgid "Server Settings & Maintenance"
-msgstr "Impostazioni Server & Manutenzione"
-
-#: View/Elements/side_menu.ctp:406
-msgid "Blacklists Event"
-msgstr "Blacklist Eventi"
-
-#: View/Elements/side_menu.ctp:410
-msgid "Blacklists Organisation"
-msgstr "Blacklist Organizzazioni"
-
-#: View/Elements/side_menu.ctp:426;433
-msgid "View Thread"
-msgstr "Visualizza Discussione"
-
-#: View/Elements/side_menu.ctp:427
-#: View/Posts/add.ctp:4
-msgid "Add Post"
-msgstr "Aggiungi Post"
-
-#: View/Elements/side_menu.ctp:434
-#: View/Posts/edit.ctp:4
-msgid "Edit Post"
-msgstr "Modifica Post"
-
-#: View/Elements/side_menu.ctp:439
-msgid "List Threads"
-msgstr "Elenco Discussioni"
-
-#: View/Elements/side_menu.ctp:440
-msgid "New Thread"
-msgstr "Nuova Discussione"
-
-#: View/Elements/side_menu.ctp:445
-msgid "List Favourite Tags"
-msgstr "Elenco classificazioni preferite"
-
-#: View/Elements/side_menu.ctp:455
-msgid "Edit Tag"
-msgstr "Modifica Tag"
-
-#: View/Elements/side_menu.ctp:461;473
-msgid "View Taxonomy"
-msgstr "Visualizza Tassonomia"
-
-#: View/Elements/side_menu.ctp:474
-msgid "Delete Taxonomy"
-msgstr "Cancella Tassonomia"
-
-#: View/Elements/side_menu.ctp:492
-msgid "View Template"
-msgstr "Visualizza Modello"
-
-#: View/Elements/side_menu.ctp:494
-#: View/Templates/edit.ctp:6
-msgid "Edit Template"
-msgstr "Modifica Modello"
-
-#: View/Elements/side_menu.ctp:502
-msgid "Add Feed"
-msgstr "Aggiungi Feed"
-
-#: View/Elements/side_menu.ctp:503
-msgid "Import Feeds from JSON"
-msgstr "Importa elenchi di Feed da JSON"
-
-#: View/Elements/side_menu.ctp:504
-#: View/Feeds/compare_feeds.ctp:7
-msgid "Feed overlap analysis matrix"
-msgstr "Matrice di analisi sovrapposizioni feed"
-
-#: View/Elements/side_menu.ctp:505
-msgid "Export Feed settings"
-msgstr "Esporta le impostazioni dei feed"
-
-#: View/Elements/side_menu.ctp:507
-msgid "Edit Feed"
-msgstr "Modifica Feed"
-
-#: View/Elements/side_menu.ctp:509
-msgid "PreviewIndex"
-msgstr "Anteprima Indice"
-
-#: View/Elements/side_menu.ctp:511
-msgid "PreviewEvent"
-msgstr "Anteprima Evento"
-
-#: View/Elements/side_menu.ctp:516
-msgid "View News"
-msgstr "Visualizza News"
-
-#: View/Elements/side_menu.ctp:520
-#: View/News/add.ctp:6
-msgid "Add News Item"
-msgstr "Aggiungi News"
-
-#: View/Elements/side_menu.ctp:522
-#: View/News/edit.ctp:6
-msgid "Edit News Item"
-msgstr "Modifica News"
-
-#: View/Elements/side_menu.ctp:533
-msgid "Update Galaxies"
-msgstr "Aggiorna le Galaxy"
-
-#: View/Elements/side_menu.ctp:533
-msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr "Sei sicuro di voler re-importare tutte le librerie galaxy dal sottomodulo?"
-
-#: View/Elements/side_menu.ctp:534
-msgid "Force Update Galaxies"
-msgstr "Forza aggiornamento Galaxies"
-
-#: View/Elements/side_menu.ctp:534
-msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr "Sei sicuro di voler eliminare e reimportare tutti i galaxies da questo sotto modulo?"
-
-#: View/Elements/side_menu.ctp:538;546
-msgid "View Galaxy"
-msgstr "Visualizza Galaxy"
-
-#: View/Elements/side_menu.ctp:539
-msgid "View Cluster"
-msgstr "Visualizza Cluster"
-
-#: View/Elements/side_menu.ctp:556
-msgid "Update Objects"
-msgstr "Aggiorna Oggetti"
-
-#: View/Elements/side_menu.ctp:561
-msgid "View Object Template"
-msgstr "Visualizza Oggetto Modello"
-
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:84
+#: View/Layouts/default.ctp:87
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr "Caricamento"
@@ -3977,8 +4002,11 @@ msgid "Display"
 msgstr "Visualizza"
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Jobs/index.ctp:62
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
 #: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr "Filtri"
 
@@ -3991,12 +4019,12 @@ msgstr "Storico"
 msgid "Toggle fullscreen"
 msgstr "Passa a schermo intero"
 
-#: View/Elements/view_mitre_attack_matrix.ctp:27
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
 msgstr "Visualizza tutti"
 
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all events on current page"
 msgstr "Seleziona gli eventi di questa pagina"
 
@@ -4036,35 +4064,58 @@ msgstr "Totale Post"
 msgid "#Posts"
 msgstr "#Post"
 
-#: View/Elements/Events/eventIndexTable.ctp:167
-msgid " correlation(s)"
-msgstr " correlazioni"
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/dashboard/dashboard_events.ctp:4;5
+#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
+#: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/preview_index.ctp:174
+#: View/Taxonomies/index.ctp:47
+#: View/Warninglists/index.ctp:60
+msgid "View"
+msgstr "Visualizza"
 
-#: View/Elements/Events/eventIndexTable.ctp:177;182
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
 msgid " proposal(s)"
 msgstr " proposte"
 
-#: View/Elements/Events/eventIndexTable.ctp:187
+#: View/Elements/Events/eventIndexTable.ctp:190
 msgid "NEW"
 msgstr "NUOVO"
 
-#: View/Elements/Events/eventIndexTable.ctp:207
-#: View/Jobs/index.ctp:15;63
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-msgid "All"
-msgstr "Tutto"
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
+msgstr "Pubblica Evento"
 
-#: View/Elements/Events/eventIndexTable.ctp:218
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:12
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
 msgid "Are you sure this event is complete and everyone should be informed?"
 msgstr "Sei sicuro che l'evento sia completo e tutti ne dovrebbero essere informati?"
 
-#: View/Elements/Events/eventIndexTable.ctp:219
+#: View/Elements/Events/eventIndexTable.ctp:222
 msgid "Not published"
 msgstr "Non pubblicato"
 
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr "Sicuro di voler cancellare # %s?"
+
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid "Show "
 msgstr "Mostra "
@@ -4074,51 +4125,66 @@ msgid " more..."
 msgstr " altro..."
 
 #: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:295
+#: View/Events/view.ctp:346
 msgid "Collapse…"
 msgstr "Chiudi…"
 
-#: View/Elements/Events/View/row_attribute.ctp:262
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr "- limitato ai proprietari di organizzazione."
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr "Vista avanzata"
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:343
 msgid "Restore attribute"
 msgstr "Ripristina attributo"
 
-#: View/Elements/Events/View/row_attribute.ctp:263;303
+#: View/Elements/Events/View/row_attribute.ctp:344;384
 msgid "Permanently delete attribute"
 msgstr "Cancella attributo permanentemente"
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Query enrichment"
 msgstr "Query enrichment"
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Propose enrichment"
 msgstr "Proponi enrichment"
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Query Cortex"
 msgstr "Query Cortex"
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Propose enrichment through Cortex"
 msgstr "Proponi enrichment da Cortex"
 
-#: View/Elements/Events/View/row_attribute.ctp:279
+#: View/Elements/Events/View/row_attribute.ctp:360
 msgid "Propose Edit"
 msgstr "Proponi Modifica"
 
-#: View/Elements/Events/View/row_attribute.ctp:280
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Propose Deletion"
 msgstr "Proponi Cancellazione"
 
-#: View/Elements/Events/View/row_attribute.ctp:290;295
+#: View/Elements/Events/View/row_attribute.ctp:371;376
 msgid "Add enrichment"
 msgstr "Aggiungi enrichment"
 
-#: View/Elements/Events/View/row_attribute.ctp:295
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Add enrichment via Cortex"
 msgstr "Aggiungi enrichment da Cortex"
 
-#: View/Elements/Events/View/row_attribute.ctp:307
+#: View/Elements/Events/View/row_attribute.ctp:388
 msgid "Soft-delete attribute"
 msgstr "Cancella attributo"
 
@@ -4140,24 +4206,36 @@ msgid "Expand or Collapse"
 msgstr "Espandi o Chiudi"
 
 #: View/Elements/Events/View/row_object.ctp:69
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
+msgstr "UUID"
+
+#: View/Elements/Events/View/row_object.ctp:70
 msgid "Meta-category: "
 msgstr "Meta-categoria: "
 
-#: View/Elements/Events/View/row_object.ctp:70
+#: View/Elements/Events/View/row_object.ctp:71
 #: View/Elements/Feeds/View/row_object.ctp:21
 msgid "Description: "
 msgstr "Descrizione: "
 
-#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Events/View/row_object.ctp:72
 #: View/Elements/Feeds/View/row_object.ctp:22
 msgid "Template: "
 msgstr "Modello: "
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Permanently delete object"
 msgstr "Elimina definitivamente l'oggetto"
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Soft delete object"
 msgstr "Cancella l'oggetto"
 
@@ -4198,6 +4276,7 @@ msgstr "Scarta proposta"
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
 #: View/Sightings/ajax/advanced.ctp:10
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 msgid "Add sighting"
 msgstr "Aggiungi sighting"
 
@@ -4206,7 +4285,6 @@ msgid "Mark as false-positive"
 msgstr "Contrassegna come falso-positivo"
 
 #: View/Elements/Events/View/sighting_field.ctp:14
-#: View/Events/view.ctp:203
 msgid "Advanced sightings"
 msgstr "Sighting avanzato"
 
@@ -4234,7 +4312,7 @@ msgstr " valore"
 
 #: View/Elements/Feeds/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object.ctp:20
-#: View/ObjectTemplates/view.ctp:19
+#: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:23
 msgid "Meta-category"
 msgstr "Meta-categoria"
@@ -4249,7 +4327,7 @@ msgid "all"
 msgstr "tutto"
 
 #: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/view.ctp:126
+#: View/Events/view.ctp:131
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
 #: View/Servers/preview_event.ctp:36
 #: View/Sightings/ajax/list_sightings.ctp:5
@@ -4275,12 +4353,13 @@ msgstr "Stato"
 #: View/Elements/Servers/View/row_attribute.ctp:93
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/healthElements/files.ctp:61
-#: View/Elements/healthElements/workers.ctp:61;62;63
-#: View/Events/automation.ctp:403;410;417;438;445
+#: View/Elements/healthElements/workers.ctp:66;67;68
+#: View/Events/automation.ctp:234;241;248;269;276
 #: View/Events/export.ctp:68;88
-#: View/Taxonomies/view.ctp:96;107;152
-#: View/Users/admin_view.ctp:83;92;122
-#: View/Users/view.ctp:62
+#: View/Events/legacy_automation.ctp:403;410;417;438;445
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
 msgid "N/A"
 msgstr "N/D"
 
@@ -4289,23 +4368,24 @@ msgstr "N/D"
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
 #: View/Galaxies/view.ctp:14
-#: View/ObjectTemplates/view.ctp:11
+#: View/ObjectTemplates/view.ctp:4
 #: View/Objects/revise_object.ctp:19
 #: View/Organisations/ajax/merge.ctp:57;64
 #: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/view.ctp:9
-#: View/SharingGroups/add.ctp:11;31;51
-#: View/SharingGroups/edit.ctp:11;31;59
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
 #: View/SharingGroups/view.ctp:42;67
 #: View/Templates/view.ctp:9
 #: View/Users/statistics_orgs.ctp:31
-#: View/Warninglists/view.ctp:9
+#: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "Nome"
 
 #: View/Elements/Servers/View/row_object.ctp:21
 #: View/Elements/healthElements/files.ctp:8
-#: View/Elements/healthElements/settings_tab.ctp:16
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:10
 #: View/Elements/templateElements/populateTemplateDescription.ctp:12
 #: View/Elements/templateElements/populateTemplateFile.ctp:10
@@ -4313,19 +4393,19 @@ msgstr "Nome"
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:27
 #: View/Galaxies/view.ctp:20
-#: View/ObjectTemplates/view.ctp:21
+#: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:16;94
-#: View/Organisations/view.ctp:32;89;90
+#: View/Organisations/view.ctp:15;58;59
 #: View/Pages/doc/administration.ctp:48;241
-#: View/Pages/doc/categories_and_types.ctp:50;67
+#: View/Pages/doc/categories_and_types.ctp:44;61
 #: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
 #: View/Servers/preview_event.ctp:65
-#: View/SharingGroups/add.ctp:15
-#: View/SharingGroups/edit.ctp:15
-#: View/SharingGroups/index.ctp:28
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
 #: View/Taxonomies/view.ctp:14
 #: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:14
+#: View/Warninglists/view.ctp:11
 msgid "Description"
 msgstr "Descrizione"
 
@@ -4344,11 +4424,17 @@ msgstr "Riferimenti"
 msgid "Referenced by"
 msgstr "Referenziato da"
 
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
+
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:2
+#: View/Roles/view.ctp:24
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_view.ctp:19
-#: View/Users/view.ctp:19
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
 msgstr "Ruolo"
 
@@ -4359,7 +4445,7 @@ msgstr "Ultimo accesso"
 #: View/Elements/Users/userIndexTable.ctp:17
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:54
+#: View/ShadowAttributes/index.ctp:64
 msgid "Created"
 msgstr "Creato"
 
@@ -4371,6 +4457,11 @@ msgstr "Avvia aggiornamento password"
 msgid "Create new credentials and inform user"
 msgstr "Creare la nuova password ed informare l'utente"
 
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr "Sei sicuro di voler cancellare # %s? È vivamente raccomandato non cancellare mai gli utenti, ma piuttosto disabilitarli."
+
 #: View/Elements/dashboard/dashboard_events.ctp:2
 msgid "Changes since last visit"
 msgstr "Modifiche dall'ultima visita"
@@ -4399,6 +4490,417 @@ msgstr "Eventi con proposte: "
 msgid "Delegation requests: "
 msgstr "Richieste di delega: "
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr "Popolare dal modello"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr "Risultato importazione testo"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr "Visualizza Evento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr "Visualizza Grafico di Correlazione"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr "Visualizza storico Evento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr "Modifica Evento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr "Cancella Evento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr "Aggiungi Oggetto"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr "Aggiungi allegato"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr "Popolare da..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr "Arricchisci evento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr "Incorporare attributi da..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr "Proponi Attributo"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr "Proponi Allegato"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr "Pubblica (no email)"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr "Delega la pubblicazione"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr "Accetta Richiesta di Delega"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr "Rimuovi richiesta di delega"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr "Evento pubblicato in ZMQ"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr "Contatta segnalante"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr "Scarica come..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr "Importa da…"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr "Elenco Regexp"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr "Nuovo Regexp"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr "Esegui all'uscita"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr "Modifica Regexp"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr "Cancella Regexp"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr "Visualizza Warninglist"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr "Aggiorna le Warninglist"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr "Visualizza la Noticelist"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr "Aggiorna Noticeslists"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr "Elenco Whitelist"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr "Nuova Whitelist"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr "Modifica Whitelist"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr "Cancella Whitelist"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr "Modifica Profilo"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr "Cambio Password"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr "Reimposta Password"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr "Visualizza Organizzazione"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr "Modifica Sharing Group"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr "Visualizza Sharing Group"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr "Naviga Server Remoti"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr "Naviga Eventi Remoti"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr "Scarica questo evento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr "Sei sicuro di voler scaricare e salvare questo evento nella tua istanza?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr "Modifica Server"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr "Visualizza Server"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr "Modifica Utente"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr "Cancella Utente"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr "Modifica Ruolo"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr "Cancella Ruolo"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr "Aggiungi Organizzazione"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr "Modifica Organizzazione"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr "Fondi Organizzazione"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr "Aggiungi Ruolo"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr "Blacklist Eventi"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr "Blacklist Organizzazioni"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr "Visualizza Discussione"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr "Aggiungi Post"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr "Modifica Post"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr "Elenco Discussioni"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr "Nuova Discussione"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr "Elenco classificazioni preferite"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr "Modifica Tag"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr "Visualizza Tassonomia"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr "Cancella Tassonomia"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr "Visualizza Modello"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr "Modifica Modello"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr "Aggiungi Feed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr "Importa elenchi di Feed da JSON"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr "Matrice di analisi sovrapposizioni feed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr "Esporta le impostazioni dei feed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr "Modifica Feed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr "Anteprima Indice"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr "Anteprima Evento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr "Visualizza News"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr "Aggiungi News"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr "Modifica News"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr "Aggiorna le Galaxy"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr "Sei sicuro di voler re-importare tutte le librerie galaxy dal sottomodulo?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr "Forza aggiornamento Galaxies"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr "Sei sicuro di voler eliminare e reimportare tutti i galaxies da questo sotto modulo?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr "Visualizza Galaxy"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr "Visualizza Cluster"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr "Aggiorna Oggetti"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr "Visualizza Oggetto Modello"
+
 #: View/Elements/healthElements/diagnostics.ctp:5
 msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
 msgstr "Configurazione encoding database non corretta: la connessione al database NON è configurata su UTF-8. Per favore, assicurarsi di aver de-commentato la riga 'encoding' => 'utf8' nel "
@@ -4423,11 +4925,10 @@ msgstr "Prossima versione di sviluppo"
 msgid "Outdated version"
 msgstr "Versione obsoleta"
 
-#: View/Elements/healthElements/diagnostics.ctp:26;156;170;195
-#: View/Elements/healthElements/workers.ctp:18;71
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
+#: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
-#: View/Users/admin_view.ctp:81
 msgid "OK"
 msgstr "OK"
 
@@ -4447,131 +4948,135 @@ msgstr "Stato…"
 msgid "Current branch…"
 msgstr "Branch corrente…"
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Pull the latest MISP version from github"
 msgstr "Recupera l'ultima versione MISP da github"
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Update MISP"
 msgstr "Aggiornamento MISP"
 
-#: View/Elements/healthElements/diagnostics.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "Writeable Directories and files"
 msgstr "Cartelle e file scrivibili lato server"
 
-#: View/Elements/healthElements/diagnostics.ctp:67
+#: View/Elements/healthElements/diagnostics.ctp:65
 msgid "The following directories and files have to be writeable for MISP to function properly. Make sure that the apache user has write privileges for the directories below."
 msgstr "Le seguenti cartelle e file devono avere i permessi di scrittura per MISP affinché questo funzioni correttamente. Assicurarsi che l'utente di apache ha privilegi di scrittura per le seguenti cartelle."
 
-#: View/Elements/healthElements/diagnostics.ctp:68
+#: View/Elements/healthElements/diagnostics.ctp:66
 msgid "Directories"
 msgstr "Cartelle"
 
-#: View/Elements/healthElements/diagnostics.ctp:75
+#: View/Elements/healthElements/diagnostics.ctp:73
 msgid "Directory "
 msgstr "Cartella "
 
-#: View/Elements/healthElements/diagnostics.ctp:83
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Writeable Files"
 msgstr "File scrivibili"
 
-#: View/Elements/healthElements/diagnostics.ctp:90;104
+#: View/Elements/healthElements/diagnostics.ctp:88;102
 msgid "File "
 msgstr "File "
 
-#: View/Elements/healthElements/diagnostics.ctp:97
+#: View/Elements/healthElements/diagnostics.ctp:95
 msgid "Readable Files"
 msgstr "File leggibili"
 
-#: View/Elements/healthElements/diagnostics.ctp:112
+#: View/Elements/healthElements/diagnostics.ctp:110
 msgid "PHP Settings"
 msgstr "Impostazioni PHP"
 
-#: View/Elements/healthElements/diagnostics.ctp:115;127
+#: View/Elements/healthElements/diagnostics.ctp:113;125
 msgid "Up to date"
 msgstr "Aggiornato"
 
-#: View/Elements/healthElements/diagnostics.ctp:121
-#: View/Elements/healthElements/workers.ctp:78;80
-#: View/Organisations/view.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:119
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: View/Elements/healthElements/diagnostics.ctp:123
+#: View/Elements/healthElements/diagnostics.ctp:121
 msgid "Issues determining version"
 msgstr "Problemi nel determinare la versione"
 
-#: View/Elements/healthElements/diagnostics.ctp:130;139
+#: View/Elements/healthElements/diagnostics.ctp:128;137
 msgid "Update highly recommended"
 msgstr "Aggiornamento altamente consigliato"
 
-#: View/Elements/healthElements/diagnostics.ctp:133;142
+#: View/Elements/healthElements/diagnostics.ctp:131;140
 msgid "Version unsupported, update ASAP"
 msgstr "Versione non supportata, aggiornare al più presto"
 
-#: View/Elements/healthElements/diagnostics.ctp:146
+#: View/Elements/healthElements/diagnostics.ctp:144
 msgid "PHP ini path"
 msgstr "Percorso PHP ini"
 
-#: View/Elements/healthElements/diagnostics.ctp:147
+#: View/Elements/healthElements/diagnostics.ctp:145
 msgid "PHP Version"
 msgstr "Versione PHP"
 
-#: View/Elements/healthElements/diagnostics.ctp:147;148
+#: View/Elements/healthElements/diagnostics.ctp:145;146
 msgid "recommended"
 msgstr "raccomandato"
 
-#: View/Elements/healthElements/diagnostics.ctp:148
+#: View/Elements/healthElements/diagnostics.ctp:146
 msgid "PHP CLI Version"
 msgstr "Versione PHP CLI"
 
-#: View/Elements/healthElements/diagnostics.ctp:149
+#: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
 msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
 msgstr "Le seguenti impostazioni potrebbero avere un impatto negativo su alcune funzionalità di MISP con le loro impostazioni minime correnti e raccomandate. È possibile eseguire degli aggiustamenti nel tuo php.ini. Ricorda che i settaggi raccomandati non sono richiesti, ma solo raccomandati. In base ai casi d'uso, potresti voler andare oltre i valori consigliati."
 
-#: View/Elements/healthElements/diagnostics.ctp:156
+#: View/Elements/healthElements/diagnostics.ctp:155
 #: View/Events/filter_event_index.ctp:32;190
 #: View/Pages/doc/using_the_system.ctp:66;171
 msgid "Low"
 msgstr "Basso"
 
-#: View/Elements/healthElements/diagnostics.ctp:160
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP Extensions"
 msgstr "Estensioni PHP"
 
-#: View/Elements/healthElements/diagnostics.ctp:170
+#: View/Elements/healthElements/diagnostics.ctp:169
 msgid "Not loaded"
 msgstr "Non caricato"
 
-#: View/Elements/healthElements/diagnostics.ctp:175
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr "Problemi nella lettura delle impostazioni PHP. Ciò potrebbe essere dovuto al fatto che lo script di test non è leggibile."
 
-#: View/Elements/healthElements/diagnostics.ctp:183
+#: View/Elements/healthElements/diagnostics.ctp:182
 msgid "Advanced attachment handler"
 msgstr "Gestore di avanzato degli allegati"
 
-#: View/Elements/healthElements/diagnostics.ctp:184
+#: View/Elements/healthElements/diagnostics.ctp:183
 msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
 msgstr "Gli strumenti di gestione avanzata degli allegati sono usati dalla funzionalità aggiungi allegato per estrarre informazioni aggiuntive dal sample caricato."
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PyMISP"
 msgstr "PyMISP"
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "Not installed or version outdated."
 msgstr "Non installato o versione obsoleta."
 
-#: View/Elements/healthElements/diagnostics.ctp:201
+#: View/Elements/healthElements/diagnostics.ctp:200
 msgid "STIX and Cybox libraries"
 msgstr "Librerie STIX e Cybox"
 
-#: View/Elements/healthElements/diagnostics.ctp:202
+#: View/Elements/healthElements/diagnostics.ctp:201
 msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
 msgstr "Le librerie python MITRE STIX e Cybox devono essere installate affinché l'export MISP in STIX funzioni. Assicurarsi di averle installate (come descritto nelle istruzioni di installazione di MISP) nel caso si riceva di seguito un errore."
 
-#: View/Elements/healthElements/diagnostics.ctp:203
+#: View/Elements/healthElements/diagnostics.ctp:202
 msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
 msgstr "Se si riscontrano problemi, assicurarsi che sia STIX che CyBox siano installati come descritto nel file INSTALL.txt. Le versioni richieste sono"
 
@@ -4808,72 +5313,35 @@ msgid "Permissions"
 msgstr "Permessi"
 
 #: View/Elements/healthElements/files.ctp:73
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
 #: View/Roles/admin_index.ctp:67
-#: View/SharingGroups/index.ctp:68
+#: View/SharingGroups/index.ctp:87
 msgid "Are you sure you want to delete %s?"
 msgstr "Sei sicuro di voler cancellare %s?"
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
 msgstr "Grave, la tua istanza MISP richiede attenzione immediata."
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
 msgstr "Trovati problemi, si raccomanda di risolverli."
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:5
 msgid "Good, but there are some optional settings that are incorrect / not set."
 msgstr "Bene, ma ci sono delle impostazioni opzionali errate / non configurate."
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:6
 msgid "In perfect health."
 msgstr "In perfetta salute."
 
 #: View/Elements/healthElements/overview.ctp:15
-msgid "Overall health"
-msgstr "Check generale"
+msgid "Test"
+msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:17
-msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr "Lo stato di saluti dell'istanza dipende dai maggiori problemi irrisolti."
-
-#: View/Elements/healthElements/overview.ctp:26
-msgid " settings incorrectly or not set"
-msgstr " settaggi non corretti o non impostati"
-
-#: View/Elements/healthElements/overview.ctp:27
-msgid " incorrect settings."
-msgstr " impostazioni errate."
-
-#: View/Elements/healthElements/overview.ctp:33
-msgid "Critical issues revealed by the diagnostics"
-msgstr "Problemi critici rilevati dalla diagnostica"
-
-#: View/Elements/healthElements/overview.ctp:34
-msgid " issues detected."
-msgstr " problemi rilevati."
-
-#: View/Elements/healthElements/overview.ctp:35
-msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
-msgstr "I problemi rilevati qui possono essere causati da cartelle con permessi non corretti o dipendenze non installate adeguatamente."
-
-#: View/Elements/healthElements/settings_tab.ctp:9
-msgid "Toggle subgroup"
-msgstr "Attiva/disattiva sottogruppo"
-
-#: View/Elements/healthElements/settings_tab.ctp:13
-#: View/Pages/doc/administration.ctp:45
-msgid "Priority"
-msgstr "Priorità"
-
-#: View/Elements/healthElements/settings_tab.ctp:14
-#: View/Pages/doc/administration.ctp:46
-msgid "Setting"
-msgstr "Impostazioni"
-
-#: View/Elements/healthElements/settings_tab.ctp:15
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
 #: View/Events/filter_event_index.ctp:134
 #: View/Events/resolved_attributes.ctp:45
 #: View/Events/show_i_o_c_results.ctp:13
@@ -4888,128 +5356,166 @@ msgstr "Impostazioni"
 msgid "Value"
 msgstr "Valore"
 
-#: View/Elements/healthElements/settings_tab.ctp:17
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr "Check generale"
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr "Lo stato di saluti dell'istanza dipende dai maggiori problemi irrisolti."
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr " settaggi non corretti o non impostati"
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr "Problemi critici rilevati dalla diagnostica"
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr "I problemi rilevati qui possono essere causati da cartelle con permessi non corretti o dipendenze non installate adeguatamente."
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr "Priorità"
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr "Impostazioni"
+
+#: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
 msgstr "Messaggio d'errore"
 
-#: View/Elements/healthElements/tabs.ctp:3;15;27;36
-#: View/Events/index.ctp:30;58
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
-#: View/Users/admin_index.ctp:28
-msgid "Modify filters"
-msgstr "Modifica filtri"
-
-#: View/Elements/healthElements/tabs.ctp:3
+#: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
 msgstr "Panoramica"
 
-#: View/Elements/healthElements/tabs.ctp:28
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:34
 #: View/Pages/doc/administration.ctp:38
 msgid "Diagnostics"
 msgstr "Diagnostica"
 
-#: View/Elements/healthElements/tabs.ctp:37
-#: View/Pages/doc/administration.ctp:39
-msgid "Workers"
-msgstr "Processi automatici"
-
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
 msgstr "Gestisci file"
 
-#: View/Elements/healthElements/tabs.ctp:48
+#: View/Elements/healthElements/tabs.ctp:50;65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
 msgstr "Scarica il rapporto"
 
-#: View/Elements/healthElements/workers.ctp:5
-msgid "Warning"
-msgstr "Attenzione"
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
+msgstr "Processi automatici"
 
 #: View/Elements/healthElements/workers.ctp:5
 msgid "MISP cannot access your /proc directory to check the status of the worker processes, which means that dead workers will not be detected by the diagnostic tool. If you would like to regain this functionality, make sure that the open_basedir directive is not set, or that /proc is included in it."
 msgstr "MISP non può accedere alla cartella /proc per controllare lo stato dei processi worker, ciò significa che il blocco degli worker non potrà essere rilevato dallo strumento di diagnostica. Se vuoi recuperare la funzionalità, assicurati che l'opzione open_basedir sia non impostata o che la cartella /proc sia in essa inclusa."
 
 #: View/Elements/healthElements/workers.ctp:10
+msgid "Note:"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "You have set the \"manage_workers\" variable to \"false\", therefore worker controls have been disabled."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:15
 msgid "Issues prevent jobs from being processed. Please resolve them below."
 msgstr "Alcuni problemi impediscono al job di eseguirsi. Si prega di risolverli."
 
-#: View/Elements/healthElements/workers.ctp:15
+#: View/Elements/healthElements/workers.ctp:20
 msgid "Worker started with the correct user, but the current status is unknown."
 msgstr "Il worker è stato avviato con l'utenza corretta, ma lo stato attuale è sconosciuto."
 
-#: View/Elements/healthElements/workers.ctp:24
+#: View/Elements/healthElements/workers.ctp:29
 msgid "There are issues with the worker(s), but at least one healthy worker is monitoring the queue."
 msgstr "Ci sono problemi con i/il worker, ma almeno un worker funzionante sta monitorando la coda."
 
-#: View/Elements/healthElements/workers.ctp:30
+#: View/Elements/healthElements/workers.ctp:35
 msgid "Worker type: "
 msgstr "Tipo worker: "
 
-#: View/Elements/healthElements/workers.ctp:32
+#: View/Elements/healthElements/workers.ctp:37
 msgid "Jobs in the queue: "
 msgstr "Job in coda: "
 
-#: View/Elements/healthElements/workers.ctp:40
+#: View/Elements/healthElements/workers.ctp:45
 msgid "Queue status: "
 msgstr "Stato coda: "
 
-#: View/Elements/healthElements/workers.ctp:51
+#: View/Elements/healthElements/workers.ctp:56
 msgid "Worker PID"
 msgstr "Worker PID"
 
-#: View/Elements/healthElements/workers.ctp:52
+#: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
-#: View/Users/admin_view.ctp:7
-#: View/Users/view.ctp:2
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
 msgid "User"
 msgstr "Utente"
 
-#: View/Elements/healthElements/workers.ctp:53
+#: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr "Processo worker"
 
-#: View/Elements/healthElements/workers.ctp:54
+#: View/Elements/healthElements/workers.ctp:59
 msgid "Information"
 msgstr "Informazioni"
 
-#: View/Elements/healthElements/workers.ctp:64
+#: View/Elements/healthElements/workers.ctp:69
 msgid "Worker not running!"
 msgstr "Worker non in esecuzione!"
 
-#: View/Elements/healthElements/workers.ctp:72
+#: View/Elements/healthElements/workers.ctp:77
 msgid "The worker appears to be healthy."
 msgstr "Il worker sembra essere funzionante."
 
-#: View/Elements/healthElements/workers.ctp:75
+#: View/Elements/healthElements/workers.ctp:80
 msgid "The worker was started with a user other than the apache user. MISP cannot check whether the worker is alive or not."
 msgstr "Il worker è stato avviato con un utente diverso da quello di Apache. MISP non può controllare se il worker è attivo o meno."
 
-#: View/Elements/healthElements/workers.ctp:81
+#: View/Elements/healthElements/workers.ctp:86
 msgid "Cannot check whether the worker is alive or dead."
 msgstr "Non può verificare se il worker è attivo o meno."
 
-#: View/Elements/healthElements/workers.ctp:85
+#: View/Elements/healthElements/workers.ctp:90
 msgid "Dead"
 msgstr "Inattivo"
 
-#: View/Elements/healthElements/workers.ctp:86
+#: View/Elements/healthElements/workers.ctp:91
 msgid "The Worker appears to be dead."
 msgstr "Il worker sembra essere non funzionante."
 
-#: View/Elements/healthElements/workers.ctp:100
+#: View/Elements/healthElements/workers.ctp:106
 msgid "Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it."
 msgstr "Fermare (se ancora attivo) a rimuovere questo worker. La cosa interromperà immediatamente ogni job da lui eseguito."
 
-#: View/Elements/healthElements/workers.ctp:111
+#: View/Elements/healthElements/workers.ctp:119
 msgid "Start a worker"
 msgstr "Avvia un worker"
 
-#: View/Elements/healthElements/workers.ctp:119
+#: View/Elements/healthElements/workers.ctp:130
 msgid "Restart all workers"
 msgstr "Riavvia tutti i worker"
 
@@ -5140,16 +5646,16 @@ msgstr "Campo"
 #: View/Objects/revise_object.ctp:45
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
-#: View/Pages/doc/categories_and_types.ctp:66
+#: View/Pages/doc/categories_and_types.ctp:60
 #: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
-#: View/ShadowAttributes/index.ctp:36;51
-#: View/SharingGroups/add.ctp:30
-#: View/SharingGroups/edit.ctp:30
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
 #: View/Sightings/ajax/list_sightings.ctp:7
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:35
-#: View/Warninglists/view.ctp:24
+#: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr "Tipo"
 
@@ -5188,7 +5694,7 @@ msgid "Template Name"
 msgstr "Nome modello"
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:60
+#: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr "Creato da"
@@ -5208,7 +5714,7 @@ msgid "s"
 msgstr "s"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
-#: View/ObjectReferences/ajax/add.ctp:60
+#: View/ObjectReferences/ajax/add.ctp:86
 #: View/Objects/revise_object.ctp:43
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
@@ -5222,9 +5728,9 @@ msgstr "Attributo"
 #: View/Feeds/freetext_index.ctp:31
 #: View/Objects/add.ctp:95
 #: View/Objects/revise_object.ctp:44
-#: View/Pages/doc/categories_and_types.ctp:17;23;37;43;49
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
 #: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
-#: View/ShadowAttributes/index.ctp:48
+#: View/ShadowAttributes/index.ctp:58
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_add_file.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
@@ -5234,7 +5740,7 @@ msgid "Category"
 msgstr "Categoria"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
-#: View/Pages/doc/categories_and_types.ctp:63
+#: View/Pages/doc/categories_and_types.ctp:57
 #: View/Pages/doc/using_the_system.ctp:109
 #: View/Pages/doc/md/categories_and_types.ctp:33
 msgid "Types"
@@ -5463,45 +5969,33 @@ msgstr "Elimina EventGraph"
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr "Sei sicuro di voler eliminare EventGraph #%s? L'EventGraph verrà eliminato permanentemente e non sarà recuperabile."
 
-#: View/Events/add.ctp:3
-msgid "The event created %s, but not synchronised to other MISP instances until it is published."
-msgstr "Evento creato %s, ma non sincronizzato con le altre istanze MISP fina alla sua pubblicazione."
-
-#: View/Events/add.ctp:3
-msgid "will be restricted to your organisation"
-msgstr "sarà limitato alla tua organizzazione"
-
-#: View/Events/add.ctp:3
-msgid "will be visible to the organisations having an account on this platform"
-msgstr "sara visibile alle organizzazioni con un account su questa piattaforma"
-
-#: View/Events/add.ctp:48
+#: View/Events/add.ctp:44
 #: View/Events/edit.ctp:35
 msgid "Threat Level "
 msgstr "Livello minaccia "
 
-#: View/Events/add.ctp:52
+#: View/Events/add.ctp:48
 #: View/Events/edit.ctp:38
 msgid "Analysis "
 msgstr "Analisi "
 
-#: View/Events/add.ctp:56
+#: View/Events/add.ctp:52
 #: View/Events/edit.ctp:43
-#: View/ShadowAttributes/index.ctp:42
+#: View/ShadowAttributes/index.ctp:52
 msgid "Event Info"
 msgstr "Info Evento"
 
-#: View/Events/add.ctp:60
+#: View/Events/add.ctp:56
 #: View/Events/edit.ctp:47
 msgid "Quick Event Description or Tracking Info"
 msgstr "Breve descrizione evento o info sul rilevamento"
 
-#: View/Events/add.ctp:63
+#: View/Events/add.ctp:59
 #: View/Events/edit.ctp:50
 msgid "Extends event"
 msgstr "Estendi evento"
 
-#: View/Events/add.ctp:66
+#: View/Events/add.ctp:62
 #: View/Events/edit.ctp:53
 msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr "UUID o ID dell'evento. Lascia vuoto per non applicare."
@@ -5512,7 +6006,8 @@ msgstr "Importa da OpenIOC"
 
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
-#: View/Events/upload_stix.ctp:22
+#: View/Events/upload_analysis_file.ctp:22
+#: View/Events/upload_stix.ctp:29
 msgid "Upload"
 msgstr "Upload"
 
@@ -5550,7 +6045,7 @@ msgid "Details"
 msgstr "Dettagli"
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:89
+#: View/Jobs/index.ctp:124
 msgid "Failed"
 msgstr "Fallito"
 
@@ -5563,784 +6058,678 @@ msgid "Event with this UUID already exists."
 msgstr "Un evento con lo stesso UUID esiste già."
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr "Evento "
 
 #: View/Events/automation.ctp:3
-msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
-"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
-"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
-msgstr "Le funzionalità di automazione sono progettate per generare automaticamente signature per l'IDS. Per abilitare la creazione delle signature per un dato attributo, il campo Signature dell'attributo deve essere impostato a Sì.\n"
-"    Si noti che la generazione della signature non è applicabile a tutti i tipi di attributo, al momento si supporta la generazione di signature per sistemi NIDS per IP, domini, nomi host, user agent etc., e produzione di liste di hash per MD5/SHA1 o artefatti di file. Il supporto per più attributi è stato pianificato.\n"
-"    Per rendere la funzionalità disponibile per gli strumenti automatizzati viene utilizzata una chiave di autenticazione. Ciò rende più facile ai propri strumenti l'accesso ai dati senza ulteriori richieste di autenticazione."
+msgid "Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.\n"
+"    To to make this functionality available for automated tools an authentication key is used."
+msgstr ""
 
 #: View/Events/automation.ctp:6
-msgid "Make sure you keep that key secret as it gives access to the entire database !"
-msgstr "Assicurarsi di mantenere riservata quella chiave in quanto da accesso a tutto il database!"
+msgid "Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP."
+msgstr ""
 
-#: View/Events/automation.ctp:7
+#: View/Events/automation.ctp:9
+#: View/Events/legacy_automation.ctp:7
 msgid "Your current key is: <code>%s</code>.\n"
 "    You can %s this key."
 msgstr "La tua chiave: <code>%s</code>.\n"
 "    Puoi %s la chiave."
 
-#: View/Events/automation.ctp:8
+#: View/Events/automation.ctp:10
+#: View/Events/legacy_automation.ctp:8
 msgid "reset"
 msgstr "reset"
 
-#: View/Events/automation.ctp:10
-msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
-msgstr "Dalla versione 2.2 è stato eliminato l'uso della chiave di autenticazione nella URL. Invece, passare la chiave di autenticazione tramite un lo header Authorization all'interno della richiesta. L'opzione che consente l'invio della chiave nella URL è temporaneamente ancora supportata, ma sconsigliata."
-
-#: View/Events/automation.ctp:11
-msgid "Please use the use the following header"
-msgstr "Si prega di utilizzare il seguente header"
-
-#: View/Events/automation.ctp:12
-msgid "Authorization"
-msgstr "Autorizzazione"
-
-#: View/Events/automation.ctp:13
-msgid "XML Export"
-msgstr "Esportazione XML"
-
 #: View/Events/automation.ctp:14
-msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
-msgstr "Un'esportazione automatica di tutti gli eventi e gli attributi <small>(ad eccezione dei file allegati)</small> è disponibile in un formato XML personalizzato."
+#: View/Logs/admin_index.ctp:20;21
+msgid "Search"
+msgstr "Cerca"
 
-#: View/Events/automation.ctp:15;47;76
-msgid "You can configure your tools to automatically download the following file"
-msgstr "È possibile configurare i propri strumenti per scaricare automaticamente i seguenti file"
+#: View/Events/automation.ctp:16
+#: View/Events/legacy_automation.ctp:264
+msgid "It is possible to search the database for attributes based on a list of criteria."
+msgstr "È possibile effettuare ricerche nel database per gli attributi basati su un elenco di criteri."
 
 #: View/Events/automation.ctp:17
-msgid "If you only want to fetch a specific event append the eventid number"
-msgstr "Se si desidera recuperare uno specifico evento, si aggiunge l'ID evento"
+#: View/Events/legacy_automation.ctp:265
+msgid "To return an event or a list of events in a desired format, use the following syntax"
+msgstr "Per restituire un evento o un elenco di eventi in un formato desiderato, utilizzare la seguente sintassi"
 
-#: View/Events/automation.ctp:19;144
-msgid "You can post an XML or JSON object containing additional parameters in the following formats"
-msgstr "È possibile effettuare una richiesta POST contenente un oggetto XML o JSON con parametri addizionali, nel formato seguente"
-
-#: View/Events/automation.ctp:26
-msgid "The xml download also accepts two additional the following optional parameters in the URL"
-msgstr "Il download del file XML accetta i seguenti parametri opzionali nella URL"
-
-#: View/Events/automation.ctp:29;52;85
-msgid "Restrict the download to a single event"
-msgstr "Limita il download ad un singolo evento"
-
-#: View/Events/automation.ctp:30
-msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
-msgstr "Un campo booleano che determina se gli allegati devono essere codificati ed un secondo parametro che controlla i tag selezionabili."
-
-#: View/Events/automation.ctp:31;54;87;112;134
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:18
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
 msgstr ""
 
-#: View/Events/automation.ctp:37;64;91;117;140;203;254;279
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
-msgstr "Eventi con data impostata ad una successiva a quella specificata nel campo (formato: 2018-02-15). Questo filtro userà la data dell'evento."
+#: View/Events/automation.ctp:21
+msgid "Set the return format of the search (Currently supported: json, xml, openioc, suricata, snort - more formats are being moved to restSearch with the goal being that all searches happen through this API). Can be passed as the first parameter after restSearch or via the JSON payload."
+msgstr ""
 
-#: View/Events/automation.ctp:38;65;92;118;141;204;255;280
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
-msgstr "Eventi con data impostata ad una precedente a quella specificata nel campo (formato: 2018-02-15). Questo filtro userà la data dell'evento."
+#: View/Events/automation.ctp:22
+msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
+msgstr ""
 
-#: View/Events/automation.ctp:39;119;142;205;256;281;306
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr "Eventi pubblicati nell'ultimo x lasso di tempo, dove x può essere specificato in giorni, ore, minuti (per esempio 5d o 12h oppure 30m). Questo filtro utilizzerà il timestamp di pubblicazione dell'evento."
+#: View/Events/automation.ctp:23
+msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
+msgstr ""
 
-#: View/Events/automation.ctp:41;70;97;122;259;290
-msgid "The keywords false or null should be used for optional empty parameters in the URL."
-msgstr "Le parole chiave false o null dovrebbero essere utilizzate per parametri opzionali e vuoti nella URL."
+#: View/Events/automation.ctp:24
+#: View/Events/legacy_automation.ctp:268;297
+msgid "Search for the given value in the attributes' value field."
+msgstr "Cercare il valore specificato nei valori del campo attributo."
 
-#: View/Events/automation.ctp:43
-msgid "Also check out the %s to read about the REST API."
-msgstr "Controlla anche il %s per informazioni riguardo le API REST."
-
-#: View/Events/automation.ctp:45
-msgid "CSV Export"
-msgstr "Esporta CSV"
-
-#: View/Events/automation.ctp:46
-msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
-msgstr "Un'esportazione automatica degli attributi è disponibile come CSV. Solo gli attributi contrassegnati come \"to_ids\" verranno esportati."
-
-#: View/Events/automation.ctp:49
-msgid "You can specify additional flags for CSV exports as follows"
-msgstr "Puoi specificare campi aggiuntivi per l'esportazione CSV, come di seguito"
-
-#: View/Events/automation.ctp:53
-msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
-msgstr "Selezionando questo flag verranno inclusi tutti gli attributi che non sono contrassegnati come \"to_ids\"."
-
-#: View/Events/automation.ctp:58
-msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
-msgstr "Ad esempio, per scaricare un CSV generato dagli attributi della tipologia \"dominio\" e dalla categoria \"Network Activity\" contenente tutti gli eventi ad eccezione di quello e restringendo ulteriormente agli eventi che sono taggati \"tag1\" o \"tag2\" ma non \"targ3\", abilitando solo gli attributi che sono contrassegnati \"per IDS\", utilizzare la sintassi seguente"
-
-#: View/Events/automation.ctp:61;270;299
-msgid "The attribute category, any valid MISP attribute category is accepted."
-msgstr "La categoria dell'attributo, ogni valida categoria MISP per gli attributi verrà accettata."
-
-#: View/Events/automation.ctp:62;199;269;298
+#: View/Events/automation.ctp:25
+#: View/Events/legacy_automation.ctp:62;199;269;298
 msgid "The attribute type, any valid MISP attribute type is accepted."
 msgstr "Il tipo di attributo, ogni valida tipologia MISP per gli attributi sarà accettata."
 
-#: View/Events/automation.ctp:63
-msgid "Include the event data with each attribute."
-msgstr "Includi i dati dell'evento con ogni attributo."
+#: View/Events/automation.ctp:26
+#: View/Events/legacy_automation.ctp:61;270;299
+msgid "The attribute category, any valid MISP attribute category is accepted."
+msgstr "La categoria dell'attributo, ogni valida categoria MISP per gli attributi verrà accettata."
 
-#: View/Events/automation.ctp:66
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
-msgstr "Eventi pubblicati nell'ultimo X periodo di tempo, dove X può essere definito in giorni, ore, minuti (per esempio, 5d o 12h o 30m). Questo filtro userà il timestamp di pubblicazione dell'evento."
+#: View/Events/automation.ctp:27
+#: View/Events/legacy_automation.ctp:271;300
+msgid "Search by the creator organisation by supplying the organisation identifier."
+msgstr "Ricerca in base al creatore dell'organizzazione fornendo l'identificatore di organizzazione."
 
-#: View/Events/automation.ctp:67
-msgid "The CSV created when this setting is set to true will not contain the header row.\n"
-"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:71
-msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
-msgstr "Per esportare gli attributi di tutti gli eventi che sono di tipo \"domain\", usare la seguente sintassi"
-
-#: View/Events/automation.ctp:74
-msgid "NIDS rules export"
-msgstr "Esporta regole NIDS"
-
-#: View/Events/automation.ctp:75
-msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr "L'esportazione automatica di tutti gli attributi network è disponibile nel formato Snort. Solo gli eventi <em>pubblicati</em> e gli attributi contrassegnati come <em>IDS Signature</em> sono esportati."
-
-#: View/Events/automation.ctp:81
-msgid "The full API syntax is as follows"
-msgstr "La sintassi completa dell'API è la seguente"
-
-#: View/Events/automation.ctp:84
-msgid "The export format, can be \"suricata\" or \"snort\""
-msgstr "Il formato di esportazione può essere \"suricata\" o \"snort\""
-
-#: View/Events/automation.ctp:86
-msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
-msgstr ""
-
-#: View/Events/automation.ctp:93
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr "Eventi pubblicati nell'ultimo X periodo di tempo, dove X può essere definito in giorni, ore, minuti (per esempio, 6d o 12h o 30m). Questo filtro userà il timestamp di pubblicazione dell'evento."
-
-#: View/Events/automation.ctp:94
-msgid "Restrict the export to only use the given types."
-msgstr "Restringi l'esportazione usando solo i tipi dati."
-
-#: View/Events/automation.ctp:95;120;174;206;257
-msgid "All attributes that have a hit on a warninglist will be excluded."
-msgstr "Tutti gli attributi che hanno una presenza in una warninglist verranno esclusi."
-
-#: View/Events/automation.ctp:96
-msgid "All tags will be included even if not exportable."
-msgstr "Saranno inclusi tutti i tag anche se non esportabili."
-
-#: View/Events/automation.ctp:98
-msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
-msgstr "Un esempio per un'esportazione suricata di tutti gli eventi ad esclusione di quelli taggati con tag1, senza tutte le informazioni commentate all'inizio del file, sarebbe simile a questo:"
-
-#: View/Events/automation.ctp:100
-msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
-msgstr "L'amministrazione è in grado di gestire una white list contenente nomi host, domini e IP da escludere dall'esportazione NIDS."
-
-#: View/Events/automation.ctp:102
-msgid "Hash database export"
-msgstr "Esportazione del database degli hash"
-
-#: View/Events/automation.ctp:103
-msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr "Esportazione automatica dei checksum MD5/SHA1 contenuti in attributi di tipo file. Questa lista può essere utilizzata per istruire software di analisi forense nella ricerca di file sospetti. Solo gli eventi <em>pubblicati</em> e gli attributi contrassegnati come <em>IDS Signature</em> verranno esportati."
-
-#: View/Events/automation.ctp:104;188
-msgid "You can configure your tools to automatically download the following files"
-msgstr "È possibile configurare gli strumenti per scaricare automaticamente i seguenti file"
-
-#: View/Events/automation.ctp:109
-msgid "The API's full format is as follows"
-msgstr "Il formato completo delle API è come di seguito"
-
-#: View/Events/automation.ctp:111
-msgid "The export format, can be \"md5\" or \"sha1\""
-msgstr "Il formato di esportazione può essere \"md5\" o \"sha1\""
-
-#: View/Events/automation.ctp:123
-msgid "For example, to only show sha1 values from events tagged tag1, use"
-msgstr "Per esempio, per visualizzare solo il valore sha1 dagli eventi taggati tag1, utilizzare"
-
-#: View/Events/automation.ctp:126
-msgid "STIX export"
-msgstr "Esportazione STIX"
-
-#: View/Events/automation.ctp:127
-msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
-msgstr "È possibile esportare gli eventi in formato STIX del MITRE (per maggiori informazioni su STIX, cliccare <a href=\"https://stix.mitre.org/\">qui</a>). L'esportazione STIX XML è al momento molto lenta e può intercorrere in timeout in caso di eventi di grandi dimensioni o per collezioni di eventi. Il formato JSON non soffre di questo problema. Utilizzo"
-
-#: View/Events/automation.ctp:129
-msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
-msgstr "I parametri di ricerca possono essere passati alla funzione tramite i parametri della URL o inviando con metodo POST un oggetto XML o JSON (dipende dalla tipologia restituita). I parametri seguenti possono essere passati allo strumento di esportazione STIX: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Sia <code>id</code> e <code>tags</code> possono usare gli operatori <code>&amp;&amp;</code> (and) e <code>!</code> (not) nelle query. Utilizzando i parametri via URL, la sintassi è la seguente"
-
-#: View/Events/automation.ctp:132;171
-msgid "The event's ID"
-msgstr "ID evento"
-
-#: View/Events/automation.ctp:133
-msgid "Encode attachments where applicable"
-msgstr "Codifica gli allegati ove possibile"
-
-#: View/Events/automation.ctp:151
-msgid "Various ways to narrow down the search results of the STIX export"
-msgstr "Vari modi per restringere i risultati di ricerca dell'esportazione STIX"
-
-#: View/Events/automation.ctp:152
-msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
-msgstr "Ad esempio, per recuperare tutti gli eventi taggati \"APT1\", escludendo gli eventi taggati \"OSINT\" ed escludendo l'evento #51 e #62, senza alcun allegato"
-
-#: View/Events/automation.ctp:154
-msgid "To export the same events using a POST request use"
-msgstr "Per esportare gli stessi eventi usando una richiesta POST, utilizzare"
-
-#: View/Events/automation.ctp:156
-msgid "Together with this JSON object in the POST message"
-msgstr "Insieme a questo oggetto JSON nel messaggio POST"
-
-#: View/Events/automation.ctp:158
-msgid "XML is automagically assumed when using the stix export"
-msgstr "XML è automaticamente utilizzato quando si usa l'esportazione STIX"
-
-#: View/Events/automation.ctp:160
-msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
-msgstr "La stessa ricerca può essere eseguita utilizzando il seguente oggetto XML inviato via POST (si noti che il carattere \"&\" ha necessità del carattere di escape, in alternativa si possono utilizzare elementi id e tag separati)"
-
-#: View/Events/automation.ctp:163
-msgid "RPZ export"
-msgstr "Esportazione RPZ"
-
-#: View/Events/automation.ctp:164
-msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
-msgstr ">Puoi esportare il file RPZ da utilizzare come firewall DNS utilizzando la funzionalità MISP dedicata. Il file generato includerà tutti gli attributi dominio, nome host e IP-src/IP-dst a cui si ha accesso."
-
-#: View/Events/automation.ctp:165
-msgid "It is possible to further restrict the exported values using the following filters"
-msgstr "È possibile restringere ulteriormente i valori esportati utilizzando i seguenti filtri"
-
-#: View/Events/automation.ctp:167
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
-"        "
-msgstr ""
-
-#: View/Events/automation.ctp:170
-msgid "Use semicolons instead (the search will automatically search for colons instead)"
-msgstr "Utilizzare il punto e virgola invece (altrimenti verranno automaticamente ricercati per colonne)"
-
-#: View/Events/automation.ctp:172
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
-msgstr "Eventi con data successiva a quella specificata nel capo da (formato: 2015-02-03)"
-
-#: View/Events/automation.ctp:173
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
-msgstr "Eventi con data precedente a quella specificata nel capo da (formato: 2015-02-03)"
-
-#: View/Events/automation.ctp:176
-msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
-msgstr "MISP inserirà i valori di intestazione nel file di zona e definirà l'azione intrapresa per ognuno dei valori che può essere sovrascritto. Per default questi valori sono anche quelli scaricati con l'applicazione stessa, oppure quelli sovrascritti dall'amministratore del sito. I valori sono i seguenti"
-
-#: View/Events/automation.ctp:180
-msgid "To override the above values, either use the url parameters as described below"
-msgstr "Per sovrascrivere i valori si cui sopra, utilizzare i parametri URL come descritto di seguito"
-
-#: View/Events/automation.ctp:182
-msgid "or POST an XML or JSON object with the above listed options"
-msgstr "o effettua una chiamata POST di un oggetto XML o JSON con le opzioni elencate di seguito"
-
-#: View/Events/automation.ctp:186
-msgid "Text export"
-msgstr "Esportazione testuale"
-
-#: View/Events/automation.ctp:187
-msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
-msgstr ">Esportazione di tutti gli attributi di uno specifico tipo bro verso un file di testo. Per impostazione predefinita solo gli attributi pubblicati e con la spunta su IDS vengono esportati."
-
-#: View/Events/automation.ctp:194
-msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
-msgstr "Per limitare i risultati dei tag, utilizzare la solita sintassi. Si prega di essere consapevole che i due punti (:) non possono essere utilizzati come tag di ricerca. In alternativa, utilizzare un punto e virgola (la ricerca cercherà automaticamente i due punti). Per ottenere valori ip-src da eventi taggati tag1 ma non da tag2"
-
-#: View/Events/automation.ctp:197
-msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
-msgstr "A partire dalla versione 2.3.38, è possibile limitare l'esportazione testuale con due parametri aggiuntivi. Il primo permette all'utente di limitare basendosi sull'ID evento, mentre il secondo consente ID di esportare elementi non contrassegnati come IDS. Inoltre, scegliendo \"tutti\" nel campo tipo restituirà tutti gli attributi ammissibili."
-
-#: View/Events/automation.ctp:200
+#: View/Events/automation.ctp:28
+#: View/Events/legacy_automation.ctp:200
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'."
 msgstr "Per includere un tag nei risultati basta scrivere i relativi nomi in questo parametro. Per escludere un tag inserire prima un '!'."
 
-#: View/Events/automation.ctp:201
-msgid "Only export the attributes of the given event ID"
-msgstr "Esportare solo gli attributi dell'ID evento indicato"
+#: View/Events/automation.ctp:29
+#: View/Events/legacy_automation.ctp:278
+msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
+msgstr "Abilitandolo (passando il valore \"1\" come argomento) farà ignorare tutti gli altri argomenti alla ricerca, ad eccezione della chiave autorizzativa. MISP restituirà un xml/json (dipende dalle intestazioni inviate) di tutti gli eventi che hanno corrispondenza con almeno una parte delle informazioni evento, organizzazione creatrice dell'evento o ogni altri attributo dei campi value1/value2, o nel commento dell'attributo."
 
-#: View/Events/automation.ctp:202
-msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
-msgstr "Includere gli attributi che non sono contrassegnati come Ids, anche se essi sarebbero normalmente esclusi. Inoltre esclude la funzionalità di whitelist."
+#: View/Events/automation.ctp:30;151
+#: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
+msgstr "Eventi con data impostata ad una successiva a quella specificata nel campo (formato: 2018-02-15). Questo filtro userà la data dell'evento."
 
-#: View/Events/automation.ctp:207
-msgid "Include not published Events."
-msgstr "Includi gli eventi non pubblicati."
+#: View/Events/automation.ctp:31;152
+#: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
+msgstr "Eventi con data impostata ad una precedente a quella specificata nel campo (formato: 2018-02-15). Questo filtro userà la data dell'evento."
 
-#: View/Events/automation.ctp:208;275
-msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:32
+#: View/Events/legacy_automation.ctp:282;307
+msgid "The events that should be included / excluded from the search"
+msgstr "Gli eventi che potrebbero essere inclusi/esclusi dalla ricerca"
+
+#: View/Events/automation.ctp:33
+#: View/Events/legacy_automation.ctp:283;308
+msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
+msgstr "Se impostato, codifica gli allegati/samples di malware compressi in base64 all'interno del capo data di ogni attributo"
+
+#: View/Events/automation.ctp:34
+#: View/Events/legacy_automation.ctp:284
+msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
+msgstr "Restituira come risultato soltanto i metadata (Eventi, tags, relazioni), attributi e proposte saranno omessi."
+
+#: View/Events/automation.ctp:35
+#: View/Events/legacy_automation.ctp:285;309
+msgid "Restrict the results by uuid."
+msgstr "Limita i risultati in base all'uuid."
+
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:37
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:38
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:39
+#: View/Events/legacy_automation.ctp:288;311
+msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
+msgstr "Imposta se devono essere restituiti gli eventi pubblicati o quelli non pubblicati. Se si vogliono entrambi, non impostare il valore."
+
+#: View/Events/automation.ctp:40
+#: View/Events/legacy_automation.ctp:289;313
+msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
+msgstr "Rimuovi gli attributi che postrebbero causare una corrispondenza con un elemento di una warninglist."
+
+#: View/Events/automation.ctp:41
+#: View/Events/legacy_automation.ctp:314
+msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
+msgstr "Per impostazione predefinita (0) tutti gli attributi restituiti rispondono agli altri parametri di filtro, indipendentemente dalla loro impostazione \"to_ids\". Per restringere i risultati impostare il parametro solo to_ids ad 1. È possibile utilizzare il settaggio speciale \"exclude\" per farsi restituire gli attributi con l'opzione to_ids disabilitata."
+
+#: View/Events/automation.ctp:42
+#: View/Events/legacy_automation.ctp:315
+msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
+msgstr "Se questo parametro è impostato a 1, verranno restituiti attributi \"soft-deleted\" insieme a quelli attivi. Utilizzando \"only\" come parametro verranno restituiti solo gli attributi \"soft-deleted\"."
+
+#: View/Events/automation.ctp:43
+#: View/Events/legacy_automation.ctp:316
+msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
+msgstr "Invece di usare soltanto l'ID evento, inserisci in ogni attributo anche l'UUID evento."
+
+#: View/Events/automation.ctp:44
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:45
+msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
+msgstr ""
+
+#: View/Events/automation.ctp:46
+msgid "Filter on the event's info field."
+msgstr ""
+
+#: View/Events/automation.ctp:47
+msgid "Search for a full or a substring (delimited by % for substrings) in the event info, event tags, attribute tags, attribute values or attribute comment fields."
+msgstr ""
+
+#: View/Events/automation.ctp:48
+msgid "CSV only, select the fields that you wish to include in the CSV export. By setting event level fields additionally, includeContext is not required to get event metadata."
+msgstr ""
+
+#: View/Events/automation.ctp:49
+msgid "CSV only, add additional event level data to the export. The additional fields can be added via requested_attributes too with more granularity."
+msgstr ""
+
+#: View/Events/automation.ctp:79
+msgid "CSV specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:81
+msgid "Limit the list of fields to be returned in the CSV."
+msgstr ""
+
+#: View/Events/automation.ctp:82
+msgid "Include the event level meta-data with each attribute."
+msgstr ""
+
+#: View/Events/automation.ctp:83
+msgid "The CSV created when this setting is set to true will not contain the header row."
+msgstr ""
+
+#: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
+msgid "RPZ specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:95
+#: View/Events/legacy_automation.ctp:164
+msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
+msgstr ">Puoi esportare il file RPZ da utilizzare come firewall DNS utilizzando la funzionalità MISP dedicata. Il file generato includerà tutti gli attributi dominio, nome host e IP-src/IP-dst a cui si ha accesso."
+
+#: View/Events/automation.ctp:98
+#: View/Events/legacy_automation.ctp:176
+msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
+msgstr "MISP inserirà i valori di intestazione nel file di zona e definirà l'azione intrapresa per ognuno dei valori che può essere sovrascritto. Per default questi valori sono anche quelli scaricati con l'applicazione stessa, oppure quelli sovrascritti dall'amministratore del sito. I valori sono i seguenti"
+
+#: View/Events/automation.ctp:102
+#: View/Events/legacy_automation.ctp:180
+msgid "To override the above values, either use the url parameters as described below"
+msgstr "Per sovrascrivere i valori si cui sopra, utilizzare i parametri URL come descritto di seguito"
+
+#: View/Events/automation.ctp:104
+#: View/Events/legacy_automation.ctp:182
+msgid "or POST an XML or JSON object with the above listed options"
+msgstr "o effettua una chiamata POST di un oggetto XML o JSON con le opzioni elencate di seguito"
+
+#: View/Events/automation.ctp:108
+#: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr "Esportazione verso Bro IDS"
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:109
+#: View/Events/legacy_automation.ctp:212
 msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
 msgstr "Esportazione di tutti gli attributi di uno specifico tipo bro verso un file di testo. Per impostazione predefinita solo gli attributi pubblicati e con la spunta su IDS vengono esportati."
 
-#: View/Events/automation.ctp:213
+#: View/Events/automation.ctp:110
+#: View/Events/legacy_automation.ctp:213
 msgid "You can configure your tools to automatically download a file one of the Bro types."
 msgstr "Puoi configurare i tuoi strumenti per scaricare automaticamente un file di tipo Bro."
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:116
+#: View/Events/legacy_automation.ctp:219
 msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
 msgstr "Per limitare i risultati dei tag, utilizzare la solita sintassi. Si prega di essere consapevole che i due punti (:) non possono essere utilizzati come tag di ricerca. In alternativa, utilizzare un punto e virgola (la ricerca cercherà automaticamente i due punti). Per ottenere valori ip-src da eventi taggati tag1 ma non da tag2"
 
-#: View/Events/automation.ctp:222
+#: View/Events/automation.ctp:119
+#: View/Events/legacy_automation.ctp:222
 msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
 msgstr "E' possibile limitare le esportazioni bro basandosi su dei filtri. Effetua un POST con un oggetto JSON o XML all'API Bro per filtrare i risultati."
 
-#: View/Events/automation.ctp:240
+#: View/Events/automation.ctp:137
+#: View/Events/legacy_automation.ctp:240
 msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
 msgstr "In alternativa, è anche possibile passare i filtri tramite i parametri nell'URL, anche se è altamente consigliato utilizzare una POST con gli oggetti JSON. Il formato è descritto di seguito"
 
-#: View/Events/automation.ctp:242
+#: View/Events/automation.ctp:139
+#: View/Events/legacy_automation.ctp:242
 msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
 msgstr "Il tipo Bro, qualsiasi tipo Bro è accettato. Il mapping tra tipi Bro e MARVEN è come segue"
 
-#: View/Events/automation.ctp:249;301
+#: View/Events/automation.ctp:146
+#: View/Events/legacy_automation.ctp:249;301
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
 "    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
 "    Use semicolons instead (the search will automatically search for colons instead)."
 msgstr ""
 
-#: View/Events/automation.ctp:252
+#: View/Events/automation.ctp:149
+#: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr "Limitare i risultati per l'ID evento specificato."
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:150
+#: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr "Consente di esportare gli attributi non contrassegnati come \"to_ids\"."
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr "Eventi pubblicati nell'ultimo x lasso di tempo, dove x può essere specificato in giorni, ore, minuti (per esempio 5d o 12h oppure 30m). Questo filtro utilizzerà il timestamp di pubblicazione dell'evento."
+
+#: View/Events/automation.ctp:154
+#: View/Events/legacy_automation.ctp:95;120;174;206;257
+msgid "All attributes that have a hit on a warninglist will be excluded."
+msgstr "Tutti gli attributi che hanno una presenza in una warninglist verranno esclusi."
+
+#: View/Events/automation.ctp:156
+#: View/Events/legacy_automation.ctp:41;70;97;122;259;290
+msgid "The keywords false or null should be used for optional empty parameters in the URL."
+msgstr "Le parole chiave false o null dovrebbero essere utilizzate per parametri opzionali e vuoti nella URL."
+
+#: View/Events/automation.ctp:157
+#: View/Events/legacy_automation.ctp:260
 msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
 msgstr "Ad esempio, per recuperare tutti gli attributi per l'evento #5, inclusi gli ID non contrassegnati come IDS, utilizzare la seguente riga"
 
-#: View/Events/automation.ctp:263
-msgid "Searches with JSON/XML/OpenIOC results"
-msgstr "Ricerche con risultati JSON/XML/OpenIOC"
-
-#: View/Events/automation.ctp:264
-msgid "It is possible to search the database for attributes based on a list of criteria."
-msgstr "È possibile effettuare ricerche nel database per gli attributi basati su un elenco di criteri."
-
-#: View/Events/automation.ctp:265
-msgid "To return an event or a list of events in a desired format, use the following syntax"
-msgstr "Per restituire un evento o un elenco di eventi in un formato desiderato, utilizzare la seguente sintassi"
-
-#: View/Events/automation.ctp:267
-msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
-msgstr "Impostare il formato del risultato della ricerca (attualmente supportati: json, xml, openioc - altri formati saranno aggiunti prossimamente)."
-
-#: View/Events/automation.ctp:268;297
-msgid "Search for the given value in the attributes' value field."
-msgstr "Cercare il valore specificato nei valori del campo attributo."
-
-#: View/Events/automation.ctp:271;300
-msgid "Search by the creator organisation by supplying the organisation identifier."
-msgstr "Ricerca in base al creatore dell'organizzazione fornendo l'identificatore di organizzazione."
-
-#: View/Events/automation.ctp:272
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
-msgstr ""
-
-#: View/Events/automation.ctp:278
-msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
-msgstr "Abilitandolo (passando il valore \"1\" come argomento) farà ignorare tutti gli altri argomenti alla ricerca, ad eccezione della chiave autorizzativa. MISP restituirà un xml/json (dipende dalle intestazioni inviate) di tutti gli eventi che hanno corrispondenza con almeno una parte delle informazioni evento, organizzazione creatrice dell'evento o ogni altri attributo dei campi value1/value2, o nel commento dell'attributo."
-
-#: View/Events/automation.ctp:282;307
-msgid "The events that should be included / excluded from the search"
-msgstr "Gli eventi che potrebbero essere inclusi/esclusi dalla ricerca"
-
-#: View/Events/automation.ctp:283;308
-msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
-msgstr "Se impostato, codifica gli allegati/samples di malware compressi in base64 all'interno del capo data di ogni attributo"
-
-#: View/Events/automation.ctp:284
-msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
-msgstr "Restituira come risultato soltanto i metadata (Eventi, tags, relazioni), attributi e proposte saranno omessi."
-
-#: View/Events/automation.ctp:285;309
-msgid "Restrict the results by uuid."
-msgstr "Limita i risultati in base all'uuid."
-
-#: View/Events/automation.ctp:286;310
-msgid "Restrict the results by the last publish timestamp (newer than)."
-msgstr "Limita i risultati in base all'ultima data di publicazione (Più recenti di)."
-
-#: View/Events/automation.ctp:287
-msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
-msgstr "Limitare i risultati con il timestamp (ultima modifica). Sarà restituito ogni evento con un timestamp successivo a quello dato. Nel caso in cui la ricerca sia basata sugli attributi, verrà utilizzato il timestamp dell'attributo come riferimento."
-
-#: View/Events/automation.ctp:288;311
-msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
-msgstr "Imposta se devono essere restituiti gli eventi pubblicati o quelli non pubblicati. Se si vogliono entrambi, non impostare il valore."
-
-#: View/Events/automation.ctp:289;313
-msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
-msgstr "Rimuovi gli attributi che postrebbero causare una corrispondenza con un elemento di una warninglist."
-
-#: View/Events/automation.ctp:291
-msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
-msgstr "Ad esempio, per trovare qualsiasi evento contenente la frase \"ottobre rosso\", utilizzare la sintassi seguente (l'esempio è riportato come richiesta POST invece che GET, cosa vivamente raccomandata. Richieste GET sono problematiche e obsolete.)"
-
-#: View/Events/automation.ctp:294;320;349
-msgid "POST message payload (json)"
-msgstr "POST message payload (XML)"
-
-#: View/Events/automation.ctp:296
-msgid "To just return a list of attributes, use the following syntax"
-msgstr "Per ottenere una elenco di attributi, utilizzare la sintassi seguente"
-
-#: View/Events/automation.ctp:304
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
-msgstr "Eventi con data successiva a quella specificata nel capo da (formato: 2015-02-15)"
-
-#: View/Events/automation.ctp:305
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
-msgstr "Eventi con data precedente a quella specificata nel capo da (formato: 2015-02-15)"
-
-#: View/Events/automation.ctp:312
-msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
-msgstr "Filtrare i risultati in base al timestamp (dell'attributo). Verrà restituito ogni attributo con un timestamp successivo a quello dato."
-
-#: View/Events/automation.ctp:314
-msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
-msgstr "Per impostazione predefinita (0) tutti gli attributi restituiti rispondono agli altri parametri di filtro, indipendentemente dalla loro impostazione \"to_ids\". Per restringere i risultati impostare il parametro solo to_ids ad 1. È possibile utilizzare il settaggio speciale \"exclude\" per farsi restituire gli attributi con l'opzione to_ids disabilitata."
-
-#: View/Events/automation.ctp:315
-msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
-msgstr "Se questo parametro è impostato a 1, verranno restituiti attributi \"soft-deleted\" insieme a quelli attivi. Utilizzando \"only\" come parametro verranno restituiti solo gli attributi \"soft-deleted\"."
-
-#: View/Events/automation.ctp:316
-msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
-msgstr "Invece di usare soltanto l'ID evento, inserisci in ogni attributo anche l'UUID evento."
-
-#: View/Events/automation.ctp:317
-msgid "Only return attributes from events that have received a modification after the given timestamp."
-msgstr "Come risultato ottieni solo gli attributi di evento che hanno una data di modifica successiva alla data indicata."
-
-#: View/Events/automation.ctp:322
-msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
-msgstr "Le parole chiave false e null dovrebbero essere utilizzare per parametri vuoti opzionali nella URL. Si ricordi che questo è richiesto solo se si utilizzano i parametri URL obsoleti."
-
-#: View/Events/automation.ctp:324
-msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
-"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:327
-msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
-msgstr "È possibile anche effettuare una ricerca per indirizzi IP utilizzando il CIDR. Assicurarsi di utilizzare il carattere '|' (pipe) invece di '/' (slash). Si ricordi che i due punti (:) non possono essere utilizzati nella ricerca tag. Utilizzare invece il punto e virgola (il processo cercherà automaticamente i due punti altrimenti). Per un esempio pratico, vedere sotto"
-
-#: View/Events/automation.ctp:329
+#: View/Events/automation.ctp:160
+#: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr "Esporta gli attributi di un evento con uno specifico tipo di XML"
 
-#: View/Events/automation.ctp:330
+#: View/Events/automation.ctp:161
+#: View/Events/legacy_automation.ctp:330
 msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
 msgstr "Se si desidera esportare tutti gli attributi di un determinato tipo appartenenti ad un evento, utilizzare la sintassi seguente"
 
-#: View/Events/automation.ctp:332
+#: View/Events/automation.ctp:163
+#: View/Events/legacy_automation.ctp:332
 msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
 "    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
 "    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:168
+#: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr "Scarica allegato o sample malware"
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:169
+#: View/Events/legacy_automation.ctp:338
 msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
 msgstr "Se si conosce l'ID di un sample malware o di un allegato, è possibile scaricarlo con la seguente sintassi"
 
-#: View/Events/automation.ctp:340
+#: View/Events/automation.ctp:171
+#: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr "Scarica sample malware tramite hash"
 
-#: View/Events/automation.ctp:341
+#: View/Events/automation.ctp:172
+#: View/Events/legacy_automation.ctp:341
 msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
 msgstr "È inoltre possibile scaricare i sample conoscendo il suo hash MD5. È sufficiente inviare lo hash come oggetto JSON/XML o nella URL (la URL che ha ignorato l'oggetto passato) per ricevere in risposta un oggetto JSON/XML contenente il sample compresso e codificato in base64 corredato da qualche informazione di contesto."
 
-#: View/Events/automation.ctp:342
+#: View/Events/automation.ctp:173
+#: View/Events/legacy_automation.ctp:342
 msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
 msgstr "È anche possibile utilizzare questa API per ottenere tutti i sample dagli eventi che contengono lo hash passato. Per questa funzionalità, è sufficiente inviare il flag \"allSamples\". Si noti che se si vogliono ottenere tutti i sample dagli eventi, è possibile utilizzare tutti gli hash supportati (%s) per la ricerca.</p>"
 
-#: View/Events/automation.ctp:343
+#: View/Events/automation.ctp:174
+#: View/Events/legacy_automation.ctp:343
 msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
 msgstr "È anche possibile ottenere tutti i sample da un evento partendo dall'ID evento, passandolo come parametro eventID. Assicurarsi che sia l'ID evento che lo hash siano passati alla richiesta, altrimenti sarà restituito un messaggio di errore. Inoltre, se non viene fornito alcun hash, il flag allSamples sarà impostato automaticamente."
 
-#: View/Events/automation.ctp:345
+#: View/Events/automation.ctp:176
+#: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr "POST message payload (XML)"
 
-#: View/Events/automation.ctp:353
+#: View/Events/automation.ctp:180
+#: View/Events/legacy_automation.ctp:294;320;349
+msgid "POST message payload (json)"
+msgstr "POST message payload (XML)"
+
+#: View/Events/automation.ctp:184
+#: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr "Breve descrizione di tutti i parametri nell'oggetto passato"
 
-#: View/Events/automation.ctp:354
+#: View/Events/automation.ctp:185
+#: View/Events/legacy_automation.ctp:354
 msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
 msgstr "Un hash in formato MD5. Se l'opzione allSamples è configurata, può essere uno dei seguenti: %s"
 
-#: View/Events/automation.ctp:355
+#: View/Events/automation.ctp:186
+#: View/Events/legacy_automation.ctp:355
 msgid "If set, it will return all samples from events that have a match for the hash provided above."
 msgstr "Se impostato, verranno restituiti tutti i sample da eventi che hanno una corrispondenza per lo hash fornito."
 
-#: View/Events/automation.ctp:356
+#: View/Events/automation.ctp:187
+#: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr "Se impostato, recupererà solo i dati dall'ID evento specificato."
 
-#: View/Events/automation.ctp:357
+#: View/Events/automation.ctp:188
+#: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr "Carica sample malware utilizzando la API \"Upload Sample\""
 
-#: View/Events/automation.ctp:359
+#: View/Events/automation.ctp:190
+#: View/Events/legacy_automation.ctp:359
 msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
 msgstr "Questa API consente di popolare un evento di cui hai i permessi di modifica con campioni malware (e tutti i relativi hash). In alternativa, se non si specifica un ID evento, ne verrà creato uno nuovo."
 
-#: View/Events/automation.ctp:360
+#: View/Events/automation.ctp:191
+#: View/Events/legacy_automation.ctp:360
 msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
 msgstr "Il file deve essere codificato base64 ed inviato con richiesta POST come spiegato di seguito. Tutti i campioni verranno compressi e protetti da password (la password sarà \"infected\"). Gli hash del file originale verranno collezionati come attributi aggiuntivi."
 
-#: View/Events/automation.ctp:361
+#: View/Events/automation.ctp:192
+#: View/Events/legacy_automation.ctp:361
 msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
 msgstr "L'ID evento è opzionale. MISP accetta sia oggetti JSON che XML, come richiesta POST alla URL di cui sopra."
 
-#: View/Events/automation.ctp:362
+#: View/Events/automation.ctp:193
+#: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr "La struttura dell'oggetto atteso è la seguente"
 
-#: View/Events/automation.ctp:371
+#: View/Events/automation.ctp:202
+#: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr "Sono attesi i seguenti parametri facoltativi"
 
-#: View/Events/automation.ctp:372
+#: View/Events/automation.ctp:203
+#: View/Events/legacy_automation.ctp:372
 msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
 msgstr "L'ID evento è facoltativo. Può essere passato via URL o in un oggetto via richiesta POST, ma la richiesta via URL ha precedenza nel caso entrambe vengano fornite. Non fornendo un ID evento, MISP ne creerà uno nuovo per tutti i malware sample inviati. È possibile impostare delle impostazioni predefinite, in caso contrario verranno utilizzate le impostazioni di default."
 
-#: View/Events/automation.ctp:373
+#: View/Events/automation.ctp:204
+#: View/Events/legacy_automation.ctp:373
 msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
 msgstr "Le impostazioni di distribuzione degli attributi e del nuovo evento creato, se rilevante. [0-3]"
 
-#: View/Events/automation.ctp:374
+#: View/Events/automation.ctp:205
+#: View/Events/legacy_automation.ctp:374
 msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
 msgstr "Puoi impostare tutti gli attributi creati durante la transazione per essere contrassegnati come ids o no."
 
-#: View/Events/automation.ctp:375
+#: View/Events/automation.ctp:206
+#: View/Events/legacy_automation.ctp:375
 msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 msgstr "La categoria sarà assegnata ai samples caricati. Le opzioni accettate sono: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 
-#: View/Events/automation.ctp:376
+#: View/Events/automation.ctp:207
+#: View/Events/legacy_automation.ctp:376
 msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
 msgstr "Utilizzato per popolare il campo \"Info evento\" se non viene fornito alcun ID. In alternativa, se non configurato, MISP semplicemente produrrà un messaggio che lo indica come parte della collezione malware generata in un certo giorno."
 
-#: View/Events/automation.ctp:377
+#: View/Events/automation.ctp:208
+#: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr "Il livello di analisi dei nuovi eventi creati, se applicabile. [0-2]"
 
-#: View/Events/automation.ctp:378
+#: View/Events/automation.ctp:209
+#: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr "Il livello del threat dei nuovi eventi creati, se applicabile. [0-3]"
 
-#: View/Events/automation.ctp:379
+#: View/Events/automation.ctp:210
+#: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr "Popolerà il campo commento di ogni attributo creato usando questa API."
 
-#: View/Events/automation.ctp:380
+#: View/Events/automation.ctp:211
+#: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr "Inserisci o rimuovi i tags dall'evento"
 
-#: View/Events/automation.ctp:381
+#: View/Events/automation.ctp:212
+#: View/Events/legacy_automation.ctp:381
 msgid "You can add or remove an existing tag from an event in the following way"
 msgstr "Puoi inserire o rimuove un tag da un event in questo modo"
 
-#: View/Events/automation.ctp:384
+#: View/Events/automation.ctp:215
+#: View/Events/legacy_automation.ctp:384
 msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
 msgstr "Basta postare un oggetto JSON nel formato seguente (per l'uso della API appropriata dipende dalla volontà di aggiungere o rimuovere un tag da un evento)"
 
-#: View/Events/automation.ctp:386
+#: View/Events/automation.ctp:217
+#: View/Events/legacy_automation.ctp:386
 msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
 msgstr "Dove \"tag\" è l'ID del tag. Puoi anche utilizzare il nome del tag nel modo seguente"
 
-#: View/Events/automation.ctp:388
+#: View/Events/automation.ctp:219
+#: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr "Proposte e l'API"
 
-#: View/Events/automation.ctp:389
+#: View/Events/automation.ctp:220
+#: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr "Puoi utilizzare le proposte via API direttamente dalla versione 2.3.148"
 
-#: View/Events/automation.ctp:393
+#: View/Events/automation.ctp:224
+#: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr "HTTP"
 
-#: View/Events/automation.ctp:394
+#: View/Events/automation.ctp:225
+#: View/Events/legacy_automation.ctp:394
 #: View/Pages/doc/using_the_system.ctp:445
-#: View/SharingGroups/add.ctp:52
-#: View/SharingGroups/edit.ctp:60
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
 msgid "URL"
 msgstr "URL"
 
-#: View/Events/automation.ctp:395
+#: View/Events/automation.ctp:226
+#: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr "Istruzioni"
 
-#: View/Events/automation.ctp:396
+#: View/Events/automation.ctp:227
+#: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr "Expected Payload"
 
-#: View/Events/automation.ctp:397
-#: View/Servers/rest.ctp:53
+#: View/Events/automation.ctp:228
+#: View/Events/legacy_automation.ctp:397
+#: View/Servers/rest.ctp:115
 msgid "Response"
 msgstr "Response"
 
-#: View/Events/automation.ctp:402
+#: View/Events/automation.ctp:233
+#: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr "Visualizza una proposta"
 
-#: View/Events/automation.ctp:404;424;425;431;432
+#: View/Events/automation.ctp:235;255;256;262;263
+#: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr "Oggetto ShadowAttribute"
 
-#: View/Events/automation.ctp:409
+#: View/Events/automation.ctp:240
+#: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr "Visualizza tutte le proposte gli eventi della mia organizzazione"
 
-#: View/Events/automation.ctp:411;418
+#: View/Events/automation.ctp:242;249
+#: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr "Oggetti ShadowAttribute"
 
-#: View/Events/automation.ctp:416
+#: View/Events/automation.ctp:247
+#: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr "Visualizza tutte le proposte per un evento"
 
-#: View/Events/automation.ctp:423
+#: View/Events/automation.ctp:254
+#: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr "Proporre un nuovo attributo per un evento"
 
-#: View/Events/automation.ctp:430
+#: View/Events/automation.ctp:261
+#: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr "Proporre una modifica a un attributo"
 
-#: View/Events/automation.ctp:437
+#: View/Events/automation.ctp:268
+#: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr "Accetta proposta"
 
-#: View/Events/automation.ctp:439;446
+#: View/Events/automation.ctp:270;277
+#: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
 #: View/Pages/doc/using_the_system.ctp:254
 msgid "Message"
 msgstr "Message"
 
-#: View/Events/automation.ctp:444
+#: View/Events/automation.ctp:275
+#: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr "Scarta proposta"
 
-#: View/Events/automation.ctp:449
+#: View/Events/automation.ctp:280
+#: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr "All'inserimento di un oggetto shadow attribute, utilizzare i seguenti formati"
 
-#: View/Events/automation.ctp:454
+#: View/Events/automation.ctp:285
+#: View/Events/legacy_automation.ctp:454
 msgid "None of the above fields are mandatory, but at least one of them has to be provided."
 msgstr "Nessuno dei precedenti campi è obbligatorio, ma almeno uno di loro deve essere inserito."
 
-#: View/Events/automation.ctp:456
+#: View/Events/automation.ctp:287
+#: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr "Filtra i metadati dell'evento"
 
-#: View/Events/automation.ctp:457
+#: View/Events/automation.ctp:288
+#: View/Events/legacy_automation.ctp:457
 msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
 msgstr "Come descritto nella sezione REST, è possibile recuperare una lista di eventi e dei loro metadati inviando una richiesta GET alla API /events. Tuttavia, questa API in particolare è un po' più versatile. È possibile inviare parametri di ricerca per effettuare ricerche negli eventi in vari campi e recuperare una lista di eventi corrispondenti (insieme ai loro metadati). Si utilizzi la seguente URL"
 
-#: View/Events/automation.ctp:461
+#: View/Events/automation.ctp:292
+#: View/Events/legacy_automation.ctp:461
 msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
 "    An example for a valid lookup"
 msgstr ""
 
-#: View/Events/automation.ctp:472
+#: View/Events/automation.ctp:303
+#: View/Events/legacy_automation.ctp:472
 msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
 msgstr "Quanto sopra restituirebbe tutti gli eventi pubblicati, senza limitarsi alla propria organizzazione solo se includono il termine \"Locky\" nella descrizione evento. È possibile usare il punto esclamativo per negare un valore dove opportuno."
 
-#: View/Events/automation.ctp:473
+#: View/Events/automation.ctp:304
+#: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr "L'elenco dei parametri validi"
 
-#: View/Events/automation.ctp:474
+#: View/Events/automation.ctp:305
+#: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr "Filtri sugli eventi pubblicati o non pubblicati [0,1] - negabile con l'operatore \"!\""
 
-#: View/Events/automation.ctp:475
+#: View/Events/automation.ctp:306
+#: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr "Filtri sulle stringhe trovate in informazioni evento - negabile con l'operatore \"!\""
 
-#: View/Events/automation.ctp:476
+#: View/Events/automation.ctp:307
+#: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr "Filtri sui tag allegati - negabile con l'operatore \"!\""
 
-#: View/Events/automation.ctp:477
+#: View/Events/automation.ctp:308
+#: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr "Filtri basati su specifici ID di eventi - annullabile"
 
-#: View/Events/automation.ctp:478
+#: View/Events/automation.ctp:309
+#: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr "Filtri basati sul lovello di threat [1,2,3,4] - annullabile"
 
-#: View/Events/automation.ctp:479
+#: View/Events/automation.ctp:310
+#: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr "Filtri basati sul livello di distribuzione [1,2,3,4] - annullabile"
 
-#: View/Events/automation.ctp:480
+#: View/Events/automation.ctp:311
+#: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr "Filtri basati sulla fase di analisi dell'evento [1,2,3,4] - annullabile"
 
-#: View/Events/automation.ctp:481
+#: View/Events/automation.ctp:312
+#: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr "Filtri basati sul contenuto di un attributo - annullabile"
 
-#: View/Events/automation.ctp:482
+#: View/Events/automation.ctp:313
+#: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr "Filtri basati dul creatore dell'organizzazione - annulabile"
 
-#: View/Events/automation.ctp:483
+#: View/Events/automation.ctp:314
+#: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr "Filtri basati sull'indirizzo email del utente creatore (Soltanto amministratore) - annullabile"
 
-#: View/Events/automation.ctp:484
+#: View/Events/automation.ctp:315
+#: View/Events/legacy_automation.ctp:484
 msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr "Filtri basati su data, qualsiasi cosa è successiva a tale data in formato YYYY-MM-DD è accettata - non annullabile"
 
-#: View/Events/automation.ctp:485
+#: View/Events/automation.ctp:316
+#: View/Events/legacy_automation.ctp:485
 msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr "Filtri basati su data, qualsiasi cosa è precedente a tale data in formato YYYY-MM-DD è accettata - non annullabile"
 
+#: View/Events/automation.ctp:319
+msgid "Freetext Import API"
+msgstr ""
+
+#: View/Events/automation.ctp:321
+msgid "The freetext import tool is also exposed to the API."
+msgstr ""
+
+#: View/Events/automation.ctp:322
+msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
+msgstr ""
+
+#: View/Events/automation.ctp:323
+msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:324
+msgid "The contents of the POST body should be the text to be parsed."
+msgstr ""
+
 #: View/Events/contact.ctp:8
 msgid "Contact organization reporting event "
 msgstr "Contatta l'organizzazione che ha generato l'evento "
@@ -6534,7 +6923,7 @@ msgid "Ongoing"
 msgstr "In corso"
 
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:9;101
+#: View/Jobs/index.ctp:9;136
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr "Completato"
@@ -6558,7 +6947,7 @@ msgid "All communities"
 msgstr "Tutte le communities"
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:53
+#: View/Feeds/index.ctp:103
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr "Obiettivo"
@@ -6610,48 +6999,381 @@ msgstr "Input file"
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/Organisations/view.ctp:97;98
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:33
 msgid "Events"
 msgstr "Eventi"
 
-#: View/Events/index.ctp:30
-msgid "Filter events"
-msgstr "Filtro eventi"
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
+msgstr "Modifica filtri"
 
-#: View/Events/index.ctp:31
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr "Cancella gli eventi selezionati"
 
-#: View/Events/index.ctp:44
-msgid "Quickfilter"
-msgstr "Filtro rapido"
+#: View/Events/index.ctp:73
+msgid "My events only"
+msgstr "Soltato i miei eventi"
 
-#: View/Events/index.ctp:44
-#: View/Organisations/index.ctp:59
-#: View/Servers/preview_index.ctp:45
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr "I miei eventi"
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr "Soltanti gli eventi della mia organizzazione"
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr "Eventi Org"
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
 msgid "Filter"
 msgstr "Filtro"
 
-#: View/Events/index.ctp:58
-msgid "My events only"
-msgstr "Soltato i miei eventi"
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
+msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My Events"
-msgstr "I miei eventi"
+#: View/Events/legacy_automation.ctp:3
+msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
+"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgstr "Le funzionalità di automazione sono progettate per generare automaticamente signature per l'IDS. Per abilitare la creazione delle signature per un dato attributo, il campo Signature dell'attributo deve essere impostato a Sì.\n"
+"    Si noti che la generazione della signature non è applicabile a tutti i tipi di attributo, al momento si supporta la generazione di signature per sistemi NIDS per IP, domini, nomi host, user agent etc., e produzione di liste di hash per MD5/SHA1 o artefatti di file. Il supporto per più attributi è stato pianificato.\n"
+"    Per rendere la funzionalità disponibile per gli strumenti automatizzati viene utilizzata una chiave di autenticazione. Ciò rende più facile ai propri strumenti l'accesso ai dati senza ulteriori richieste di autenticazione."
 
-#: View/Events/index.ctp:72
-msgid "My organisation's events only"
-msgstr "Soltanti gli eventi della mia organizzazione"
+#: View/Events/legacy_automation.ctp:6
+msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgstr "Assicurarsi di mantenere riservata quella chiave in quanto da accesso a tutto il database!"
 
-#: View/Events/index.ctp:72
-msgid "Org Events"
-msgstr "Eventi Org"
+#: View/Events/legacy_automation.ctp:10
+msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
+msgstr "Dalla versione 2.2 è stato eliminato l'uso della chiave di autenticazione nella URL. Invece, passare la chiave di autenticazione tramite un lo header Authorization all'interno della richiesta. L'opzione che consente l'invio della chiave nella URL è temporaneamente ancora supportata, ma sconsigliata."
+
+#: View/Events/legacy_automation.ctp:11
+msgid "Please use the use the following header"
+msgstr "Si prega di utilizzare il seguente header"
+
+#: View/Events/legacy_automation.ctp:12
+msgid "Authorization"
+msgstr "Autorizzazione"
+
+#: View/Events/legacy_automation.ctp:13
+msgid "XML Export"
+msgstr "Esportazione XML"
+
+#: View/Events/legacy_automation.ctp:14
+msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+msgstr "Un'esportazione automatica di tutti gli eventi e gli attributi <small>(ad eccezione dei file allegati)</small> è disponibile in un formato XML personalizzato."
+
+#: View/Events/legacy_automation.ctp:15;47;76
+msgid "You can configure your tools to automatically download the following file"
+msgstr "È possibile configurare i propri strumenti per scaricare automaticamente i seguenti file"
+
+#: View/Events/legacy_automation.ctp:17
+msgid "If you only want to fetch a specific event append the eventid number"
+msgstr "Se si desidera recuperare uno specifico evento, si aggiunge l'ID evento"
+
+#: View/Events/legacy_automation.ctp:19;144
+msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+msgstr "È possibile effettuare una richiesta POST contenente un oggetto XML o JSON con parametri addizionali, nel formato seguente"
+
+#: View/Events/legacy_automation.ctp:26
+msgid "The xml download also accepts two additional the following optional parameters in the URL"
+msgstr "Il download del file XML accetta i seguenti parametri opzionali nella URL"
+
+#: View/Events/legacy_automation.ctp:29;52;85
+msgid "Restrict the download to a single event"
+msgstr "Limita il download ad un singolo evento"
+
+#: View/Events/legacy_automation.ctp:30
+msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+msgstr "Un campo booleano che determina se gli allegati devono essere codificati ed un secondo parametro che controlla i tag selezionabili."
+
+#: View/Events/legacy_automation.ctp:31;54;87;112;134
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:43
+msgid "Also check out the %s to read about the REST API."
+msgstr "Controlla anche il %s per informazioni riguardo le API REST."
+
+#: View/Events/legacy_automation.ctp:45
+msgid "CSV Export"
+msgstr "Esporta CSV"
+
+#: View/Events/legacy_automation.ctp:46
+msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
+msgstr "Un'esportazione automatica degli attributi è disponibile come CSV. Solo gli attributi contrassegnati come \"to_ids\" verranno esportati."
+
+#: View/Events/legacy_automation.ctp:49
+msgid "You can specify additional flags for CSV exports as follows"
+msgstr "Puoi specificare campi aggiuntivi per l'esportazione CSV, come di seguito"
+
+#: View/Events/legacy_automation.ctp:53
+msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
+msgstr "Selezionando questo flag verranno inclusi tutti gli attributi che non sono contrassegnati come \"to_ids\"."
+
+#: View/Events/legacy_automation.ctp:58
+msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
+msgstr "Ad esempio, per scaricare un CSV generato dagli attributi della tipologia \"dominio\" e dalla categoria \"Network Activity\" contenente tutti gli eventi ad eccezione di quello e restringendo ulteriormente agli eventi che sono taggati \"tag1\" o \"tag2\" ma non \"targ3\", abilitando solo gli attributi che sono contrassegnati \"per IDS\", utilizzare la sintassi seguente"
+
+#: View/Events/legacy_automation.ctp:63
+msgid "Include the event data with each attribute."
+msgstr "Includi i dati dell'evento con ogni attributo."
+
+#: View/Events/legacy_automation.ctp:66
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+msgstr "Eventi pubblicati nell'ultimo X periodo di tempo, dove X può essere definito in giorni, ore, minuti (per esempio, 5d o 12h o 30m). Questo filtro userà il timestamp di pubblicazione dell'evento."
+
+#: View/Events/legacy_automation.ctp:67
+msgid "The CSV created when this setting is set to true will not contain the header row.\n"
+"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:71
+msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
+msgstr "Per esportare gli attributi di tutti gli eventi che sono di tipo \"domain\", usare la seguente sintassi"
+
+#: View/Events/legacy_automation.ctp:74
+msgid "NIDS rules export"
+msgstr "Esporta regole NIDS"
+
+#: View/Events/legacy_automation.ctp:75
+msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr "L'esportazione automatica di tutti gli attributi network è disponibile nel formato Snort. Solo gli eventi <em>pubblicati</em> e gli attributi contrassegnati come <em>IDS Signature</em> sono esportati."
+
+#: View/Events/legacy_automation.ctp:81
+msgid "The full API syntax is as follows"
+msgstr "La sintassi completa dell'API è la seguente"
+
+#: View/Events/legacy_automation.ctp:84
+msgid "The export format, can be \"suricata\" or \"snort\""
+msgstr "Il formato di esportazione può essere \"suricata\" o \"snort\""
+
+#: View/Events/legacy_automation.ctp:86
+msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:93
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr "Eventi pubblicati nell'ultimo X periodo di tempo, dove X può essere definito in giorni, ore, minuti (per esempio, 6d o 12h o 30m). Questo filtro userà il timestamp di pubblicazione dell'evento."
+
+#: View/Events/legacy_automation.ctp:94
+msgid "Restrict the export to only use the given types."
+msgstr "Restringi l'esportazione usando solo i tipi dati."
+
+#: View/Events/legacy_automation.ctp:96
+msgid "All tags will be included even if not exportable."
+msgstr "Saranno inclusi tutti i tag anche se non esportabili."
+
+#: View/Events/legacy_automation.ctp:98
+msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
+msgstr "Un esempio per un'esportazione suricata di tutti gli eventi ad esclusione di quelli taggati con tag1, senza tutte le informazioni commentate all'inizio del file, sarebbe simile a questo:"
+
+#: View/Events/legacy_automation.ctp:100
+msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
+msgstr "L'amministrazione è in grado di gestire una white list contenente nomi host, domini e IP da escludere dall'esportazione NIDS."
+
+#: View/Events/legacy_automation.ctp:102
+msgid "Hash database export"
+msgstr "Esportazione del database degli hash"
+
+#: View/Events/legacy_automation.ctp:103
+msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr "Esportazione automatica dei checksum MD5/SHA1 contenuti in attributi di tipo file. Questa lista può essere utilizzata per istruire software di analisi forense nella ricerca di file sospetti. Solo gli eventi <em>pubblicati</em> e gli attributi contrassegnati come <em>IDS Signature</em> verranno esportati."
+
+#: View/Events/legacy_automation.ctp:104;188
+msgid "You can configure your tools to automatically download the following files"
+msgstr "È possibile configurare gli strumenti per scaricare automaticamente i seguenti file"
+
+#: View/Events/legacy_automation.ctp:109
+msgid "The API's full format is as follows"
+msgstr "Il formato completo delle API è come di seguito"
+
+#: View/Events/legacy_automation.ctp:111
+msgid "The export format, can be \"md5\" or \"sha1\""
+msgstr "Il formato di esportazione può essere \"md5\" o \"sha1\""
+
+#: View/Events/legacy_automation.ctp:123
+msgid "For example, to only show sha1 values from events tagged tag1, use"
+msgstr "Per esempio, per visualizzare solo il valore sha1 dagli eventi taggati tag1, utilizzare"
+
+#: View/Events/legacy_automation.ctp:126
+msgid "STIX export"
+msgstr "Esportazione STIX"
+
+#: View/Events/legacy_automation.ctp:127
+msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
+msgstr "È possibile esportare gli eventi in formato STIX del MITRE (per maggiori informazioni su STIX, cliccare <a href=\"https://stix.mitre.org/\">qui</a>). L'esportazione STIX XML è al momento molto lenta e può intercorrere in timeout in caso di eventi di grandi dimensioni o per collezioni di eventi. Il formato JSON non soffre di questo problema. Utilizzo"
+
+#: View/Events/legacy_automation.ctp:129
+msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
+msgstr "I parametri di ricerca possono essere passati alla funzione tramite i parametri della URL o inviando con metodo POST un oggetto XML o JSON (dipende dalla tipologia restituita). I parametri seguenti possono essere passati allo strumento di esportazione STIX: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Sia <code>id</code> e <code>tags</code> possono usare gli operatori <code>&amp;&amp;</code> (and) e <code>!</code> (not) nelle query. Utilizzando i parametri via URL, la sintassi è la seguente"
+
+#: View/Events/legacy_automation.ctp:132;171
+msgid "The event's ID"
+msgstr "ID evento"
+
+#: View/Events/legacy_automation.ctp:133
+msgid "Encode attachments where applicable"
+msgstr "Codifica gli allegati ove possibile"
+
+#: View/Events/legacy_automation.ctp:151
+msgid "Various ways to narrow down the search results of the STIX export"
+msgstr "Vari modi per restringere i risultati di ricerca dell'esportazione STIX"
+
+#: View/Events/legacy_automation.ctp:152
+msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
+msgstr "Ad esempio, per recuperare tutti gli eventi taggati \"APT1\", escludendo gli eventi taggati \"OSINT\" ed escludendo l'evento #51 e #62, senza alcun allegato"
+
+#: View/Events/legacy_automation.ctp:154
+msgid "To export the same events using a POST request use"
+msgstr "Per esportare gli stessi eventi usando una richiesta POST, utilizzare"
+
+#: View/Events/legacy_automation.ctp:156
+msgid "Together with this JSON object in the POST message"
+msgstr "Insieme a questo oggetto JSON nel messaggio POST"
+
+#: View/Events/legacy_automation.ctp:158
+msgid "XML is automagically assumed when using the stix export"
+msgstr "XML è automaticamente utilizzato quando si usa l'esportazione STIX"
+
+#: View/Events/legacy_automation.ctp:160
+msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
+msgstr "La stessa ricerca può essere eseguita utilizzando il seguente oggetto XML inviato via POST (si noti che il carattere \"&\" ha necessità del carattere di escape, in alternativa si possono utilizzare elementi id e tag separati)"
+
+#: View/Events/legacy_automation.ctp:163
+msgid "RPZ export"
+msgstr "Esportazione RPZ"
+
+#: View/Events/legacy_automation.ctp:165
+msgid "It is possible to further restrict the exported values using the following filters"
+msgstr "È possibile restringere ulteriormente i valori esportati utilizzando i seguenti filtri"
+
+#: View/Events/legacy_automation.ctp:167
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
+"        "
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:170
+msgid "Use semicolons instead (the search will automatically search for colons instead)"
+msgstr "Utilizzare il punto e virgola invece (altrimenti verranno automaticamente ricercati per colonne)"
+
+#: View/Events/legacy_automation.ctp:172
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
+msgstr "Eventi con data successiva a quella specificata nel capo da (formato: 2015-02-03)"
+
+#: View/Events/legacy_automation.ctp:173
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
+msgstr "Eventi con data precedente a quella specificata nel capo da (formato: 2015-02-03)"
+
+#: View/Events/legacy_automation.ctp:186
+msgid "Text export"
+msgstr "Esportazione testuale"
+
+#: View/Events/legacy_automation.ctp:187
+msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
+msgstr ">Esportazione di tutti gli attributi di uno specifico tipo bro verso un file di testo. Per impostazione predefinita solo gli attributi pubblicati e con la spunta su IDS vengono esportati."
+
+#: View/Events/legacy_automation.ctp:194
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
+msgstr "Per limitare i risultati dei tag, utilizzare la solita sintassi. Si prega di essere consapevole che i due punti (:) non possono essere utilizzati come tag di ricerca. In alternativa, utilizzare un punto e virgola (la ricerca cercherà automaticamente i due punti). Per ottenere valori ip-src da eventi taggati tag1 ma non da tag2"
+
+#: View/Events/legacy_automation.ctp:197
+msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
+msgstr "A partire dalla versione 2.3.38, è possibile limitare l'esportazione testuale con due parametri aggiuntivi. Il primo permette all'utente di limitare basendosi sull'ID evento, mentre il secondo consente ID di esportare elementi non contrassegnati come IDS. Inoltre, scegliendo \"tutti\" nel campo tipo restituirà tutti gli attributi ammissibili."
+
+#: View/Events/legacy_automation.ctp:201
+msgid "Only export the attributes of the given event ID"
+msgstr "Esportare solo gli attributi dell'ID evento indicato"
+
+#: View/Events/legacy_automation.ctp:202
+msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+msgstr "Includere gli attributi che non sono contrassegnati come Ids, anche se essi sarebbero normalmente esclusi. Inoltre esclude la funzionalità di whitelist."
+
+#: View/Events/legacy_automation.ctp:207
+msgid "Include not published Events."
+msgstr "Includi gli eventi non pubblicati."
+
+#: View/Events/legacy_automation.ctp:208;275
+msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:263
+msgid "Searches with JSON/XML/OpenIOC results"
+msgstr "Ricerche con risultati JSON/XML/OpenIOC"
+
+#: View/Events/legacy_automation.ctp:267
+msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
+msgstr "Impostare il formato del risultato della ricerca (attualmente supportati: json, xml, openioc - altri formati saranno aggiunti prossimamente)."
+
+#: View/Events/legacy_automation.ctp:272
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr "Limita i risultati in base all'ultima data di publicazione (Più recenti di)."
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr "Limitare i risultati con il timestamp (ultima modifica). Sarà restituito ogni evento con un timestamp successivo a quello dato. Nel caso in cui la ricerca sia basata sugli attributi, verrà utilizzato il timestamp dell'attributo come riferimento."
+
+#: View/Events/legacy_automation.ctp:291
+msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
+msgstr "Ad esempio, per trovare qualsiasi evento contenente la frase \"ottobre rosso\", utilizzare la sintassi seguente (l'esempio è riportato come richiesta POST invece che GET, cosa vivamente raccomandata. Richieste GET sono problematiche e obsolete.)"
+
+#: View/Events/legacy_automation.ctp:296
+msgid "To just return a list of attributes, use the following syntax"
+msgstr "Per ottenere una elenco di attributi, utilizzare la sintassi seguente"
+
+#: View/Events/legacy_automation.ctp:304
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
+msgstr "Eventi con data successiva a quella specificata nel capo da (formato: 2015-02-15)"
+
+#: View/Events/legacy_automation.ctp:305
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
+msgstr "Eventi con data precedente a quella specificata nel capo da (formato: 2015-02-15)"
+
+#: View/Events/legacy_automation.ctp:312
+msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
+msgstr "Filtrare i risultati in base al timestamp (dell'attributo). Verrà restituito ogni attributo con un timestamp successivo a quello dato."
+
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr "Come risultato ottieni solo gli attributi di evento che hanno una data di modifica successiva alla data indicata."
+
+#: View/Events/legacy_automation.ctp:322
+msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
+msgstr "Le parole chiave false e null dovrebbero essere utilizzare per parametri vuoti opzionali nella URL. Si ricordi che questo è richiesto solo se si utilizzano i parametri URL obsoleti."
+
+#: View/Events/legacy_automation.ctp:324
+msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
+"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:327
+msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
+msgstr "È possibile anche effettuare una ricerca per indirizzi IP utilizzando il CIDR. Assicurarsi di utilizzare il carattere '|' (pipe) invece di '/' (slash). Si ricordi che i due punti (:) non possono essere utilizzati nella ricerca tag. Utilizzare invece il punto e virgola (il processo cercherà automaticamente i due punti altrimenti). Per un esempio pratico, vedere sotto"
 
 #: View/Events/merge.ctp:4
 msgid "Merge events"
@@ -6676,19 +7398,19 @@ msgid "Proposals"
 msgstr "Proposte"
 
 #: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:93
+#: View/Events/view.ctp:106
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr "Contributori"
 
 #: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:113
-#: View/Jobs/index.ctp:65
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
 #: View/Logs/admin_search.ctp:6
 #: View/Pages/doc/administration.ctp:87;104;116;181;195
 #: View/Pages/doc/using_the_system.ctp:166
-#: View/Users/admin_view.ctp:24
-#: View/Users/view.ctp:9
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
 msgid "Email"
 msgstr "Email"
 
@@ -6766,11 +7488,8 @@ msgid "Successfully added attributes"
 msgstr "Attributi aggiunti con successo"
 
 #: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Events/view.ctp:56
 #: View/Feeds/preview_event.ctp:11
 #: View/Galaxies/view.ctp:18
-#: View/ObjectTemplates/view.ctp:15
-#: View/Organisations/view.ctp:54
 #: View/Organisations/ajax/merge.ctp:58
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
@@ -6793,6 +7512,14 @@ msgstr "Contenuto"
 msgid "Visualisation"
 msgstr "Visualizzazione"
 
+#: View/Events/upload_analysis_file.ctp:6
+msgid "Import analysis file"
+msgstr ""
+
+#: View/Events/upload_analysis_file.ctp:61
+msgid "Create Objects"
+msgstr ""
+
 #: View/Events/upload_stix.ctp:6
 msgid "Import %s file"
 msgstr "Importa file %s"
@@ -6801,193 +7528,186 @@ msgstr "Importa file %s"
 msgid "%s file"
 msgstr "%s file"
 
-#: View/Events/view.ctp:49
-msgid "Extended view"
-msgstr "Visualizzazione estesa"
+#: View/Events/upload_stix.ctp:24
+msgid "Include the original imported file as attachment"
+msgstr ""
 
-#: View/Events/view.ctp:51
+#: View/Events/view.ctp:53
 #: View/Servers/preview_event.ctp:12
 #: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Event ID"
 msgstr "ID Evento"
 
-#: View/Events/view.ctp:63
+#: View/Events/view.ctp:57
 msgid "Source Organisation"
 msgstr "Organizzazione sorgente"
 
-#: View/Events/view.ctp:68
+#: View/Events/view.ctp:66
 msgid "Member Organisation"
 msgstr "Membro organizzazione"
 
-#: View/Events/view.ctp:83
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
 msgid "Owner org"
 msgstr "Organizzazione proprietaria"
 
-#: View/Events/view.ctp:131
+#: View/Events/view.ctp:135
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
 #: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
 msgstr "Livello minaccia"
 
-#: View/Events/view.ctp:139
+#: View/Events/view.ctp:140
 #: View/Feeds/preview_event.ctp:37
 #: View/Pages/doc/using_the_system.ctp:70;177;210
 #: View/Servers/preview_event.ctp:48
 msgid "Analysis"
 msgstr "Analisi"
 
-#: View/Events/view.ctp:159
+#: View/Events/view.ctp:161
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr "Informazioni"
 
-#: View/Events/view.ctp:165;167
+#: View/Events/view.ctp:165
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
 msgstr "Pubblicato"
 
-#: View/Events/view.ctp:169
+#: View/Events/view.ctp:173
 msgid "#Attributes"
 msgstr "#Attributi"
 
-#: View/Events/view.ctp:171
+#: View/Events/view.ctp:177
+msgid "First recorded change"
+msgstr ""
+
+#: View/Events/view.ctp:181
 msgid "Last change"
 msgstr "Ultima modifica"
 
-#: View/Events/view.ctp:176
+#: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
 msgid "Extends"
 msgstr "Estende"
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:210
 msgid "Extended by"
 msgstr "Esteso da"
 
-#: View/Events/view.ctp:194
-msgid "Currently in "
-msgstr "Attualmente in essere "
+#: View/Events/view.ctp:217
+msgid "extended"
+msgstr ""
 
-#: View/Events/view.ctp:202
-msgid "- restricted to own organisation only."
-msgstr "- limitato ai proprietari di organizzazione."
+#: View/Events/view.ctp:217
+msgid "atomic"
+msgstr ""
 
-#: View/Events/view.ctp:203
-msgid "Advanced Sightings"
-msgstr "Vista avanzata"
-
-#: View/Events/view.ctp:219
-msgid "you"
-msgstr "tu"
-
-#: View/Events/view.ctp:220
-msgid " has"
-msgstr " ha"
-
-#: View/Events/view.ctp:223
-msgid "You have"
-msgstr "Tu hai"
-
-#: View/Events/view.ctp:226
+#: View/Events/view.ctp:265
 msgid "Delegation request"
 msgstr "Richieste di delega"
 
-#: View/Events/view.ctp:227
-msgid "%s requested that %s take over this event."
-msgstr ""
-
-#: View/Events/view.ctp:227
+#: View/Events/view.ctp:277
 msgid "View request details"
 msgstr "Guarda i dettagli dell'evento"
 
-#: View/Events/view.ctp:232
-msgid "Correlation"
-msgstr "Correlazione"
-
-#: View/Events/view.ctp:238;247
-#: View/Users/admin_view.ctp:125
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: View/Events/view.ctp:238
-msgid "enable"
-msgstr "abilita"
-
-#: View/Events/view.ctp:242;249
-#: View/ObjectTemplates/index.ctp:32
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
 #: View/Taxonomies/view.ctp:24
-#: View/Warninglists/view.ctp:38
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: View/Events/view.ctp:242
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr "abilita"
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr "disattiva"
 
-#: View/Events/view.ctp:277
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr "Visualizzazione estesa"
+
+#: View/Events/view.ctp:328
 msgid "Show (%s more)"
 msgstr "Mostra altri %s"
 
-#: View/Events/view.ctp:335
+#: View/Events/view.ctp:386;415
 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."
+#: View/Events/view.ctp:387;416
+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
+#: View/Events/view.ctp:424
 msgid "Warning: Potential false positives"
 msgstr "Attenzione: Potenziali falsi positivi"
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Toggle pivot graph"
 msgstr "Attiva/disattiva il grafico pivot"
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Pivots"
 msgstr "Pivots"
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Toggle galaxies"
 msgstr "Attiva/disattiva galaxies"
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Galaxy"
 msgstr "Galaxy"
 
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Toggle Event graph"
 msgstr "Attiva/disattiva il grafico dell'evento"
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Toggle Correlation graph"
 msgstr "Attiva/disattiva il grafica delle correlazioni"
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Correlation graph"
 msgstr "Visualizza Grafico di Correlazione"
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "Toggle ATT&CK matrix"
 msgstr "Attiva/disattiva la matrice ATT&CK"
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "ATT&CK matrix"
 msgstr "Matrice ATT&CK"
 
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 msgid "Toggle attributes"
 msgstr "Attiva/disattiva attributi"
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Toggle discussions"
 msgstr "Attiva/disattiva discussioni"
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Discussion"
 msgstr "Discussione"
 
@@ -7023,16 +7743,24 @@ msgstr "Sicuro di voler cancellare "
 msgid " Event #"
 msgstr " Evento #"
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:7
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:6
 msgid "Publish Event%s"
 msgstr "Pubblica Evento%s"
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:8
+msgid "Unpublish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:20
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
-#: View/Feeds/index.ctp:54
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Feeds/index.ctp:104
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -7042,10 +7770,6 @@ msgstr "Pubblica"
 msgid "Choose the format that you wish to download the event in"
 msgstr "Scegli il formato con cui scaricare l'evento"
 
-#: View/Events/ajax/exportChoice.ctp:17;18;27;28
-msgid "Export as %s"
-msgstr "Esporta come %s"
-
 #: View/Events/ajax/importChoice.ctp:2
 msgid "Choose the format that you would like to use for the import"
 msgstr "Scegli il formato che vorresti usare per l'importazione"
@@ -7216,7 +7940,7 @@ msgstr "Se abilitato ai flag IDS verrà sempre assegnato il valore 'off' quando
 
 #: View/Feeds/add.ctp:156
 #: View/Feeds/edit.ctp:153
-#: View/Feeds/index.ctp:55
+#: View/Feeds/index.ctp:105
 msgid "Delta Merge"
 msgstr "Unione differenziale"
 
@@ -7257,16 +7981,16 @@ msgstr "Gli eventi con le seguenti organizzazioni sono bloccati"
 
 #: View/Feeds/add.ctp:196
 #: View/Feeds/edit.ctp:191
-#: View/Servers/add.ctp:113
-#: View/Servers/edit.ctp:152;158
+#: View/Servers/add.ctp:102
+#: View/Servers/edit.ctp:147;153
 msgid "Modify"
 msgstr "Modifica"
 
-#: View/Feeds/compare_feeds.ctp:58
+#: View/Feeds/compare_feeds.ctp:66
 msgid "None or less than 1% of the data of %s is contained in %s (%s matching values)"
 msgstr "Nessuno o meno del 1% dei dati di %s è contenuto in %s (%s valori trovati)"
 
-#: View/Feeds/compare_feeds.ctp:59
+#: View/Feeds/compare_feeds.ctp:67
 msgid "%s\\% of the data of %s is contained in %s (%s matching values)"
 msgstr "s%\\% dei dati di %s è contenuto in %s (%s valori trovati)"
 
@@ -7287,53 +8011,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr "Indica la url del server esterno con cui sincronizzarsi. Esempio: https://misppriv.circl.lu"
 
 #: View/Feeds/edit.ctp:207
-#: View/Servers/add.ctp:143
-#: View/Servers/edit.ctp:186
+#: View/Servers/add.ctp:132
+#: View/Servers/edit.ctp:181
 msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
 msgstr ""
 
 #: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:185
+#: View/Servers/add.ctp:133
+#: View/Servers/edit.ctp:180
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr "Indica l'organizzazione del server esterno con cui sincronizzarsi. Esempio: DE"
 
 #: View/Feeds/edit.ctp:209
-#: View/Servers/add.ctp:145
-#: View/Servers/edit.ctp:187
+#: View/Servers/add.ctp:134
+#: View/Servers/edit.ctp:182
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:146
-#: View/Servers/edit.ctp:188
+#: View/Servers/add.ctp:135
+#: View/Servers/edit.ctp:183
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
 #: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:189
+#: View/Servers/add.ctp:136
+#: View/Servers/edit.ctp:184
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:212
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:185
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:191
+#: View/Servers/edit.ctp:186
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:192
+#: View/Servers/edit.ctp:187
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority."
 msgstr ""
 
 #: View/Feeds/edit.ctp:215
-#: View/Servers/add.ctp:151
-#: View/Servers/edit.ctp:194
+#: View/Servers/add.ctp:140
+#: View/Servers/edit.ctp:189
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -7385,130 +8109,104 @@ msgstr ""
 msgid "Fetch and store all feed data"
 msgstr "Recuperare e archiviare i dati di tutti i feed"
 
-#: View/Feeds/index.ctp:27
+#: View/Feeds/index.ctp:33
 msgid "Enable selected"
 msgstr "Attiva selezionati"
 
-#: View/Feeds/index.ctp:27
-msgid "Enable Selected"
-msgstr "Attiva selezionati"
-
-#: View/Feeds/index.ctp:28
+#: View/Feeds/index.ctp:39
 msgid "Disable selected"
 msgstr "Disattiva selezionati"
 
-#: View/Feeds/index.ctp:28
-msgid "Disable Selected"
-msgstr "Disattiva selezionati"
-
-#: View/Feeds/index.ctp:29
+#: View/Feeds/index.ctp:45
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:29
-msgid "Enable Caching for Selected"
-msgstr "Attivare la cache per selezionato"
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:51
 msgid "Disable caching for selected"
 msgstr "Disattivare la cache per selezionato"
 
-#: View/Feeds/index.ctp:30
-msgid "Disable Caching for  Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
-msgid "Default feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:61
 msgid "Default feeds"
 msgstr "Feeds predefiniti"
 
-#: View/Feeds/index.ctp:31
-msgid "Custom feeds filter"
-msgstr "Filtro feeds personalizzato"
-
-#: View/Feeds/index.ctp:31
+#: View/Feeds/index.ctp:66
 msgid "Custom feeds"
 msgstr "Feed personalizzati"
 
-#: View/Feeds/index.ctp:31
-msgid "Custom Feeds"
-msgstr "Feed personalizzati"
-
-#: View/Feeds/index.ctp:32
+#: View/Feeds/index.ctp:71
 msgid "All feeds"
 msgstr "Tutti i feeds"
 
-#: View/Feeds/index.ctp:32
-msgid "All Feeds"
-msgstr "Tutti i feeds"
-
-#: View/Feeds/index.ctp:33
+#: View/Feeds/index.ctp:76
 msgid "Enabled feeds"
 msgstr "Abilita feeds"
 
-#: View/Feeds/index.ctp:33
-msgid "Enabled Feeds"
-msgstr "Abilita feeds"
+#: View/Feeds/index.ctp:95
+msgid "Enable pulling the feed into your MISP as events/attributes."
+msgstr ""
 
-#: View/Feeds/index.ctp:48
+#: View/Feeds/index.ctp:96
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:98
 msgid "Feed Format"
 msgstr "Formato feed"
 
-#: View/Feeds/index.ctp:50
-#: View/Jobs/index.ctp:76
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr "Input"
 
-#: View/Feeds/index.ctp:56
+#: View/Feeds/index.ctp:106
 msgid "Override IDS"
 msgstr "Sovrascrivere IDS"
 
-#: View/Feeds/index.ctp:60
+#: View/Feeds/index.ctp:110
 msgid "Caching"
 msgstr "Caching"
 
-#: View/Feeds/index.ctp:108
-#: View/Servers/index.ctp:73;74
+#: View/Feeds/index.ctp:158
+#: View/Servers/index.ctp:74;75
 msgid "Rules"
 msgstr "Regole"
 
-#: View/Feeds/index.ctp:135
+#: View/Feeds/index.ctp:185
 msgid "Error: Invalid event!"
 msgstr "Errore: Evento non valido!"
 
-#: View/Feeds/index.ctp:140
+#: View/Feeds/index.ctp:190
 msgid "Fixed event %s"
 msgstr "Eventi corretti %s"
 
-#: View/Feeds/index.ctp:143
+#: View/Feeds/index.ctp:193
 msgid "New fixed event"
 msgstr ""
 
-#: View/Feeds/index.ctp:195
+#: View/Feeds/index.ctp:245
+#: View/Servers/index.ctp:94
 msgid "Age: "
 msgstr "Età: "
 
-#: View/Feeds/index.ctp:197
+#: View/Feeds/index.ctp:247
+#: View/Servers/index.ctp:102
 msgid "Not cached"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr "Esplorare gli eventi in modalità remota"
 
-#: View/Feeds/index.ctp:210
+#: View/Feeds/index.ctp:260
 msgid "Fetch all events"
 msgstr "Tutti gli eventi"
 
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 msgid "Are you sure you want to permanently remove the feed (%s)?"
 msgstr "Sei sicuro di voler rimuovere in modo permanente questo feed (%s)?"
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:267
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -7530,46 +8228,30 @@ msgid "Namespace"
 msgstr "Namespace"
 
 #: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:17
+#: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:19
+#: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr "Versione"
 
-#: View/Galaxies/ajax/cluster_choice.ctp:2
-msgid "Select Cluster"
-msgstr "Seleziona Cluster"
-
-#: View/Galaxies/ajax/cluster_choice.ctp:11
-msgid "search clusters…"
-msgstr "trova cluster…"
-
-#: View/Galaxies/ajax/cluster_choice.ctp:28
-msgid "Back to Galaxy Selection"
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:2
-msgid "Select Cluster Source"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "Galaxy Cluster Deletion"
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All clusters"
-msgstr "Tutti i clusters"
-
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All Galaxies"
-msgstr "Tutti i Galaxies"
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:2
-msgid "Select Galaxy Namespace Source"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies."
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All namespaces"
+#: View/GalaxyClusters/ajax/index.ctp:82
+msgid "Delete galaxy cluster"
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All Namespaces"
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
 msgstr ""
 
 #: View/Jobs/index.ctp:12
@@ -7584,37 +8266,37 @@ msgstr ""
 msgid "Completed."
 msgstr "Completato."
 
-#: View/Jobs/index.ctp:63
+#: View/Jobs/index.ctp:68;98
 msgid "Show all queues"
 msgstr "Visualizza tutte le code"
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:74;99
 msgid "Show default queue"
 msgstr "Visualizza la coda predefinita"
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:99
 #: View/Roles/admin_index.ctp:22
 #: View/Roles/index.ctp:22
 msgid "Default"
 msgstr "Default"
 
-#: View/Jobs/index.ctp:65
-msgid "Show email queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
-msgid "Show cache queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:101
 msgid "Cache"
 msgstr ""
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:127
 msgid "No worker active"
 msgstr ""
 
-#: View/Jobs/index.ctp:124
+#: View/Jobs/index.ctp:159
 msgid "View stacktrace"
 msgstr ""
 
@@ -7634,10 +8316,6 @@ msgstr ""
 msgid "No error data found. Generally job error data is purged from Redis after 24 hours, however, you can still view the errors in the log files in \"/app/tmp/logs\"."
 msgstr ""
 
-#: View/Jobs/ajax/error.ctp:34
-msgid "Close"
-msgstr "Chiudi"
-
 #: View/Logs/admin_index.ctp:2
 #: View/Logs/event_index.ctp:6
 msgid "Logs"
@@ -7679,22 +8357,20 @@ msgstr ""
 msgid "from IP"
 msgstr "dall'IP"
 
-#: View/Logs/admin_index.ctp:20;21
-msgid "Search"
-msgstr "Cerca"
-
-#: View/Logs/admin_index.ctp:59
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr ""
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:50
-#: View/ObjectTemplates/view.ctp:13
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/Templates/view.ctp:33
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
 msgstr "Organizzazione"
 
@@ -7780,12 +8456,12 @@ msgstr "Tipo di relazione"
 msgid "Target UUID"
 msgstr "UUID Destinazione"
 
-#: View/ObjectReferences/ajax/add.ctp:53
+#: View/ObjectReferences/ajax/add.ctp:54
 #: View/Objects/orphaned_object_diagnostics.ctp:38
 msgid "Object"
 msgstr "Oggetto"
 
-#: View/ObjectReferences/ajax/add.ctp:68
+#: View/ObjectReferences/ajax/add.ctp:120
 msgid "Target Details"
 msgstr "Dettaglli Destinazione"
 
@@ -7806,7 +8482,7 @@ msgid " The Attribute will be permanently deleted and unrecoverable. Also, this
 msgstr " L'Attributo verrà cancellato permanentemente ed in modo irrecuperabile. Inoltre, ciò impedirà la propagazione della cancellazione ad altre istanze."
 
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:24
-#: View/Pages/doc/categories_and_types.ctp:46
+#: View/Pages/doc/categories_and_types.ctp:40
 #: View/Pages/doc/md/categories_and_types.ctp:23
 msgid "Categories"
 msgstr "Categorie"
@@ -7827,43 +8503,35 @@ msgstr "Disattiva correlazioni"
 msgid "Object Template index"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:54
-#: View/ObjectTemplates/view.ctp:23
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr "Requisiti"
 
-#: View/ObjectTemplates/index.ctp:107
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:108
+#: View/ObjectTemplates/index.ctp:119
 msgid "Are you sure you want to delete template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:7
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr "Id"
+
+#: View/ObjectTemplates/view.ctp:33
 msgid " Object Template"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:9
-msgid "Object Template ID"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:2
-msgid "Select Object Category"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All meta-categories"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All Objects"
-msgstr "Tutti gli oggetti"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:50
-msgid "Back to categories"
-msgstr "Torna alle categorie"
-
 #: View/Objects/add.ctp:6
 msgid " Object"
 msgstr " Oggetto"
@@ -7940,15 +8608,6 @@ msgstr ""
 msgid "To IDS"
 msgstr "Imposta IDS"
 
-#: View/Objects/revise_object.ctp:49
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/ajax/merge.ctp:65
-#: View/SharingGroups/add.ctp:32
-#: View/SharingGroups/edit.ctp:32
-msgid "UUID"
-msgstr "UUID"
-
 #: View/Objects/ajax/delete.ctp:6
 msgid "Object Deletion"
 msgstr ""
@@ -7970,6 +8629,7 @@ msgid "Simply paste a list of all the organisation UUIDs that you wish to block
 msgstr ""
 
 #: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr ""
 
@@ -8094,9 +8754,9 @@ msgstr ""
 msgid "Click here"
 msgstr "Clicca qui"
 
-#: View/Organisations/index.ctp:5
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:51
+#: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr "Tutte le organizzazioni"
@@ -8105,7 +8765,7 @@ msgstr "Tutte le organizzazioni"
 msgid ", both local and remote"
 msgstr ""
 
-#: View/Organisations/index.ctp:9
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr ""
@@ -8114,7 +8774,7 @@ msgstr ""
 msgid " on other instances"
 msgstr ""
 
-#: View/Organisations/index.ctp:13
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr "Organizzazioni locali"
@@ -8131,55 +8791,52 @@ msgstr ""
 msgid "View all"
 msgstr "Mostra tutto"
 
-#: View/Organisations/index.ctp:65
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:30
 msgid "Logo"
 msgstr "Logo"
 
-#: View/Organisations/index.ctp:76
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr "Aggiunto da"
 
-#: View/Organisations/index.ctp:117
+#: View/Organisations/index.ctp:138
 #: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 ""
 
-#: View/Organisations/view.ctp:3
-msgid "Organisation "
-msgstr "Organizzazione "
-
-#: View/Organisations/view.ctp:7
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:4
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/Users/admin_view.ctp:9
-#: View/Users/view.ctp:4
-#: View/Warninglists/view.ctp:4
-msgid "Id"
-msgstr "Id"
-
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr "Locale o remoto"
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:12
 #: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr "Locale"
 
-#: View/Organisations/view.ctp:26
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr "Remoto"
 
-#: View/Organisations/view.ctp:40
-msgid "E-mail domain restrictions"
-msgstr "Restrizioni su dominio email"
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
+msgstr ""
 
-#: View/Organisations/view.ctp:93;94
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr "Organizzazione "
+
+#: View/Organisations/view.ctp:62;63
 msgid "Members"
 msgstr "Membri"
 
@@ -8192,7 +8849,6 @@ msgid "Available Organisations"
 msgstr "Organizzazioni disponibili"
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
 msgid "Added Organisations"
 msgstr "Organizzazioni inserite"
 
@@ -8257,6 +8913,14 @@ msgstr "Azzera il contatore attributi"
 msgid "Events need to have no validation issues"
 msgstr ""
 
+#: View/Pages/administration.ctp:15
+msgid "Recorrelate attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:16
+msgid "Recorrelate proposals"
+msgstr ""
+
 #: View/Pages/administration.ctp:18
 msgid "Verify Certificates"
 msgstr "Verifica certificati"
@@ -8273,6 +8937,10 @@ msgstr ""
 msgid "Hotfix 2.3.57: Increase the max length of the organization field when adding a new server connection."
 msgstr ""
 
+#: View/Pages/administration.ctp:20
+msgid "Convert log fields to text"
+msgstr ""
+
 #: View/Pages/administration.ctp:20
 msgid "Hotfix 2.3.78: Some of the log fields that were varchar(255) ended up truncating the data. This function will change them to \"text\""
 msgstr ""
@@ -8285,18 +8953,34 @@ msgstr ""
 msgid "Hotfix 2.3.107: it was previously possible to get duplicate attribute UUIDs in the database, this script will remove all duplicates and ensure that duplicates will not be entered into the database in the future."
 msgstr ""
 
+#: View/Pages/administration.ctp:22
+msgid "Remove duplicate events (with the same UUID)"
+msgstr ""
+
 #: View/Pages/administration.ctp:22
 msgid "Hotfix 2.3.115: In some rare situations it could occur that a duplicate of an event was created on an instance, with the exact same uuid. This action will remove any such duplicates and make sure that this cannot happen again."
 msgstr ""
 
+#: View/Pages/administration.ctp:23
+msgid "Prune orphaned attributes"
+msgstr ""
+
 #: View/Pages/administration.ctp:23
 msgid "In some rare occasions it can happen that you end up with some attributes in your database that do not belong to an event - for example during a race condition between an event insert and a delete. This tool will collect and delete any such orphaned attributes. If you ever run into an issue where you cannot add an attribute with a specific valid value, this is probably the reason."
 msgstr ""
 
+#: View/Pages/administration.ctp:24
+msgid "Clean regex table of potentially malicious entries"
+msgstr ""
+
 #: View/Pages/administration.ctp:24
 msgid "Hotfix 2.3.160: Prior to this version it was possible for a user/admin with Regex permission to create a malicious regular expression that could be used to execute arbitrary code. Since this version it is no longer possible to input such expressions, but already existing malicious entries still have to be cleaned using this tool."
 msgstr ""
 
+#: View/Pages/administration.ctp:25
+msgid "Remove URL type attribute sanitisation"
+msgstr ""
+
 #: View/Pages/administration.ctp:25
 msgid "Hotfix 2.3.173: Sanitised URLs can cause issues with the NIDS exports and as of this version attributes will be modified on entry to correct this. To correct existing entries, run this script."
 msgstr ""
@@ -8350,7 +9034,6 @@ msgid "If the migration of your data from 2.4 is not complete this will lead to
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:3
-#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:3
 #: View/Pages/doc/general.ctp:3
 #: View/Pages/doc/quickstart.ctp:3;14
@@ -8360,7 +9043,6 @@ msgid "Quick Start"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:4
-#: View/Pages/doc/categories_and_types.ctp:4
 #: View/Pages/doc/concepts.ctp:4
 #: View/Pages/doc/general.ctp:4;14
 #: View/Pages/doc/quickstart.ctp:4
@@ -8370,7 +9052,6 @@ msgid "General Layout"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:5
-#: View/Pages/doc/categories_and_types.ctp:5
 #: View/Pages/doc/concepts.ctp:5;14
 #: View/Pages/doc/general.ctp:5
 #: View/Pages/doc/quickstart.ctp:5
@@ -8380,7 +9061,6 @@ msgid "General Concepts"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:6
-#: View/Pages/doc/categories_and_types.ctp:6
 #: View/Pages/doc/concepts.ctp:6
 #: View/Pages/doc/general.ctp:6
 #: View/Pages/doc/quickstart.ctp:6
@@ -8390,7 +9070,6 @@ msgid "User Management and Global actions"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:7
-#: View/Pages/doc/categories_and_types.ctp:7
 #: View/Pages/doc/concepts.ctp:7
 #: View/Pages/doc/general.ctp:7
 #: View/Pages/doc/quickstart.ctp:7
@@ -8433,7 +9112,7 @@ msgid "FAQ"
 msgstr "Domande frequenti"
 
 #: View/Pages/doc/administration.ctp:22
-#: View/Pages/doc/categories_and_types.ctp:9
+#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:9
 #: View/Pages/doc/general.ctp:9
 #: View/Pages/doc/quickstart.ctp:9
@@ -8491,6 +9170,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
+#: View/Servers/edit.ctp:82
 msgid "Misc settings"
 msgstr "Impostazioni varie"
 
@@ -8709,8 +9389,8 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_view.ctp:40
-#: View/Users/view.ctp:34
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
 msgid "Authkey"
 msgstr ""
 
@@ -8763,8 +9443,8 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_view.ctp:29
-#: View/Users/view.ctp:24
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr ""
 
@@ -8785,8 +9465,6 @@ msgid "Shows the currently assigned NIDS ID."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:109;125
-#: View/Users/admin_view.ctp:100
-#: View/Users/view.ctp:55
 msgid "Termsaccepted"
 msgstr ""
 
@@ -8795,7 +9473,7 @@ msgid "This flag indicates whether the user has accepted the terms of use or not
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:110
-#: View/Users/admin_view.ctp:120
+#: View/Users/admin_view.ctp:84
 msgid "Newsread"
 msgstr ""
 
@@ -8857,7 +9535,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:133;184;197
 #: View/Pages/doc/using_the_system.ctp:269
-#: View/Taxonomies/view.ctp:78
+#: View/Taxonomies/view.ctp:89
 msgid "Action"
 msgstr ""
 
@@ -9334,16 +10012,16 @@ msgstr ""
 msgid "This will create a new password hash using the currently set salt."
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:13
+#: View/Pages/doc/categories_and_types.ctp:7
 msgid "Attribute Categories and Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:14
+#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/md/categories_and_types.ctp:1
 msgid "Attribute Categories vs. Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:80
+#: View/Pages/doc/categories_and_types.ctp:74
 msgid "Click here to get the .md version for gitbook generation."
 msgstr ""
 
@@ -9352,7 +10030,7 @@ msgid "Admins and Site Admins"
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:16
-msgid "There are two types of admins in MISP: Admins (also refered to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
+msgid "There are two types of admins in MISP: Admins (also referred to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:17
@@ -9483,10 +10161,6 @@ msgstr ""
 msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:20
-msgid "Event Actions"
-msgstr "Azioni evento"
-
 #: View/Pages/doc/general.ctp:20
 msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
 msgstr ""
@@ -9495,18 +10169,10 @@ msgstr ""
 msgid "Input filters alter what and how data can be entered into this instance. Apart from the basic validation of attribute entry by type, it is possible for the site administrators to define regular expression replacements and blacklists for certain values in addition to blocking certain values from being exportable. Users can view these replacement and blacklist rules here whilst administrator can alter them."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:22;54
-msgid "Global Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:22
 msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:23;66
-msgid "Sync Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:23
 msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
 msgstr ""
@@ -9632,6 +10298,11 @@ msgstr ""
 msgid "A link to this user guide."
 msgstr ""
 
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr "Termini &amp; Condizioni"
+
 #: View/Pages/doc/general.ctp:61
 msgid "View the terms &amp; conditions again."
 msgstr ""
@@ -9897,7 +10568,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:47
+#: View/Users/statistics_data.ctp:53
 msgid "Activity Heatmap"
 msgstr ""
 
@@ -10819,12 +11490,6 @@ msgstr ""
 msgid "As described earlier, users with tagging rights can arbitrarily tag events using tags chosen from a pool of available options. If you have tagging privileges and would like to create a new tag, navigate to Event Actions - Add Tag. You'll be presented with the following form"
 msgstr ""
 
-#: View/Pages/doc/using_the_system.ctp:303
-#: View/Templates/add.ctp:17
-#: View/Templates/edit.ctp:17
-msgid "Add tag"
-msgstr ""
-
 #: View/Pages/doc/using_the_system.ctp:303
 msgid "Enter a name for the tag and click on the color field to be able to pick a colour for it."
 msgstr ""
@@ -11154,8 +11819,8 @@ msgid "Make sure that you enter the authentication key that you have been given
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:397
-#: View/Servers/add.ctp:7
-#: View/Servers/edit.ctp:7
+#: View/Servers/add.ctp:8
+#: View/Servers/edit.ctp:8
 msgid "Base URL"
 msgstr ""
 
@@ -11256,7 +11921,7 @@ msgid "Clicking the delete button will delete the link to the instance."
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:418
-#: View/Servers/index.ctp:92
+#: View/Servers/index.ctp:128
 msgid "Push all"
 msgstr ""
 
@@ -11265,7 +11930,7 @@ msgid " By clicking this button, all events that are eligible to be pushed on th
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:419
-#: View/Servers/index.ctp:89
+#: View/Servers/index.ctp:125
 msgid "Pull all"
 msgstr ""
 
@@ -11419,7 +12084,7 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
-#: View/Roles/view.ctp:14
+#: View/Roles/view.ctp:5
 msgid "Permission level"
 msgstr ""
 
@@ -11427,136 +12092,155 @@ msgstr ""
 msgid "Add Server"
 msgstr ""
 
-#: View/Servers/add.ctp:10
-#: View/Servers/edit.ctp:10
+#: View/Servers/add.ctp:6
+#: View/Servers/edit.ctp:6
+msgid "Instance identification"
+msgstr ""
+
+#: View/Servers/add.ctp:11
+#: View/Servers/edit.ctp:11
 msgid "Instance name"
 msgstr ""
 
-#: View/Servers/add.ctp:16
+#: View/Servers/add.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change."
 msgstr ""
 
-#: View/Servers/add.ctp:19
-#: View/Servers/edit.ctp:19
+#: View/Servers/add.ctp:20
+#: View/Servers/edit.ctp:20
 msgid "Internal instance"
 msgstr ""
 
-#: View/Servers/add.ctp:29
+#: View/Servers/add.ctp:30
+#: View/Servers/edit.ctp:31
+msgid "Instance ownership and credentials"
+msgstr ""
+
+#: View/Servers/add.ctp:31
+#: View/Servers/edit.ctp:32
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr ""
 
-#: View/Servers/add.ctp:35
+#: View/Servers/add.ctp:37
 msgid "Remote Sync Organisation Type"
 msgstr ""
 
-#: View/Servers/add.ctp:40
-#: View/Servers/edit.ctp:37
+#: View/Servers/add.ctp:42
+#: View/Servers/edit.ctp:43
 msgid "External Organisation"
 msgstr ""
 
-#: View/Servers/add.ctp:46
-#: View/Servers/edit.ctp:48
-msgid "Local Organisation"
+#: View/Servers/add.ctp:48
+msgid "Owner of remote instance"
 msgstr ""
 
-#: View/Servers/add.ctp:52
-#: View/Servers/edit.ctp:59
+#: View/Servers/add.ctp:54
+#: View/Servers/edit.ctp:65
 msgid "Remote Organisation's Name"
 msgstr ""
 
-#: View/Servers/add.ctp:56
-#: View/Servers/edit.ctp:63
+#: View/Servers/add.ctp:58
+#: View/Servers/edit.ctp:69
 msgid "Remote Organisation's Uuid"
 msgstr ""
 
-#: View/Servers/add.ctp:97
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:78
+msgid "Enabled synchronisation methods"
+msgstr ""
+
+#: View/Servers/add.ctp:86
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:103
+#: View/Servers/add.ctp:92
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:108
-#: View/Servers/edit.ctp:147
+#: View/Servers/add.ctp:97
+#: View/Servers/edit.ctp:142
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:109;115
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:98;104
+#: View/Servers/edit.ctp:143;149
 msgid "Events with the following tags allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:110;116
-#: View/Servers/edit.ctp:149;155
+#: View/Servers/add.ctp:99;105
+#: View/Servers/edit.ctp:144;150
 msgid "Events with the following tags blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:111;117
-#: View/Servers/edit.ctp:150;156
+#: View/Servers/add.ctp:100;106
+#: View/Servers/edit.ctp:145;151
 msgid "Events with the following organisations allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:112;118
-#: View/Servers/edit.ctp:151;157
+#: View/Servers/add.ctp:101;107
+#: View/Servers/edit.ctp:146;152
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:114
-#: View/Servers/edit.ctp:153
+#: View/Servers/add.ctp:103
+#: View/Servers/edit.ctp:148
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:142
-#: View/Servers/edit.ctp:184
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:179
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:148
+#: View/Servers/add.ctp:137
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:149
+#: View/Servers/add.ctp:138
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:150
+#: View/Servers/add.ctp:139
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr ""
 
-#: View/Servers/edit.ctp:16
+#: View/Servers/edit.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change. This also requires that the current instance's host organisation and the remote sync organisation are the same."
 msgstr ""
 
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:37
 msgid "Organisation Type"
 msgstr ""
 
-#: View/Servers/edit.ctp:69
+#: View/Servers/edit.ctp:54
+msgid "Local Organisation"
+msgstr ""
+
+#: View/Servers/edit.ctp:75
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:104
+#: View/Servers/edit.ctp:99
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:112;134
+#: View/Servers/edit.ctp:107;129
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:113;135
+#: View/Servers/edit.ctp:108;130
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:126
+#: View/Servers/edit.ctp:121
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:193
+#: View/Servers/edit.ctp:188
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:250;254
+#: View/Servers/edit.ctp:245;249
 msgid "Not set."
 msgstr ""
 
@@ -11569,7 +12253,7 @@ msgid "Example:"
 msgstr ""
 
 #: View/Servers/filter_event_index.ctp:21
-msgid "Apply filters to the remote instance"
+msgid "Apply filters to the remote instance's index"
 msgstr ""
 
 #: View/Servers/index.ctp:2
@@ -11580,34 +12264,38 @@ msgstr ""
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:30
+#: View/Servers/index.ctp:31
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Internal instance that ignores distribution level degradation *WARNING: Only use this setting if you have several internal instances and the sync link is to an internal extension of the current MISP community*"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:86
+#: View/Servers/index.ctp:122
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:88
+#: View/Servers/index.ctp:124
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
+#: View/Servers/index.ctp:131
+msgid "Cache instance"
+msgstr ""
+
 #: View/Servers/preview_event.ctp:7
 msgid "You are currently viewing an event on the remote instance %s "
 msgstr ""
@@ -11624,15 +12312,15 @@ msgstr ""
 msgid "You are currently viewing the event index of the remote instance %s"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "published"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:147
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr ""
 
@@ -11676,19 +12364,23 @@ msgstr ""
 msgid "No succeeded pushes"
 msgstr ""
 
-#: View/Servers/rest.ctp:7;17
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:54
+#: View/Servers/rest.ctp:116
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:55
+#: View/Servers/rest.ctp:117
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:56
+#: View/Servers/rest.ctp:118
 msgid "Headers"
 msgstr ""
 
@@ -11708,6 +12400,10 @@ msgstr ""
 msgid "Available Instances"
 msgstr ""
 
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
+msgid "Added Instances"
+msgstr ""
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 msgid "Add servers to sharing group"
 msgstr ""
@@ -11755,39 +12451,31 @@ msgstr ""
 msgid "IDS Signature?"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:21
-msgid "Only list proposals of my organisation"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:21
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:26
-msgid "List all proposals"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:26
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:33
+#: View/ShadowAttributes/index.ctp:43
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:39
+#: View/ShadowAttributes/index.ctp:49
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:45
+#: View/ShadowAttributes/index.ctp:55
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:71
+#: View/ShadowAttributes/index.ctp:81
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:73
+#: View/ShadowAttributes/index.ctp:83
 msgid "New Attribute"
 msgstr ""
 
@@ -11815,166 +12503,166 @@ msgstr ""
 msgid "New Sharing Group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
-msgid "General tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
 msgid "General"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
 msgid "Organisations tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
-msgid "MISP instances tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
 msgid "MISP Instances"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
-msgid "Sharing group summary"
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:12
-#: View/SharingGroups/edit.ctp:12
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
 msgid "Example: Multinational sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:13
-#: View/SharingGroups/edit.ctp:13
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
 msgid "Releasable to"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:14
-#: View/SharingGroups/edit.ctp:14
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
 msgid "Example: Community1, Organisation1, Organisation2"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:16
-#: View/SharingGroups/edit.ctp:16
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
 msgid "A description of the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:18
-#: View/SharingGroups/edit.ctp:18
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
 msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:19
-#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
 msgid "Make the sharing group selectable (active)"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:21;38;59
-#: View/SharingGroups/edit.ctp:21;38;67
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
 msgid "Next page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation(s) to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisations to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:33
-#: View/SharingGroups/edit.ctp:33
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
 #: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:37;58;74
-#: View/SharingGroups/edit.ctp:37;66;82
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
 msgid "Previous page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:42
-#: View/SharingGroups/edit.ctp:50
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
 msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:43
-#: View/SharingGroups/edit.ctp:51
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
 msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:47
-#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:53
-#: View/SharingGroups/edit.ctp:61
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
 #: View/SharingGroups/view.ctp:69
 msgid "All orgs"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:63
+#: View/SharingGroups/add.ctp:103
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:64
+#: View/SharingGroups/add.ctp:104
 msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/add.ctp:105
 msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/add.ctp:106
 msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:67
-#: View/SharingGroups/edit.ctp:75
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
 msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:75
-#: View/SharingGroups/edit.ctp:83
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
 msgid "Submit and create sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:95
+#: View/SharingGroups/add.ctp:135
 msgid "Local instance"
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:71
+#: View/SharingGroups/edit.ctp:111
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
 "                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
 "                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:74
+#: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
@@ -11982,23 +12670,15 @@ msgstr ""
 msgid "Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:20
-msgid "View only active sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:20
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:21
-msgid "View only passive sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:21
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:61
+#: View/SharingGroups/index.ctp:80
 msgid "Distribution List"
 msgstr ""
 
@@ -12042,6 +12722,18 @@ msgstr "ID Attributo"
 msgid "Delete sighting"
 msgstr "Elimina segnalazione"
 
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
+msgid "Add Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
+msgstr ""
+
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
 msgid "Remove Sighting"
 msgstr "Rimuovi segnalazione"
@@ -12054,6 +12746,26 @@ msgstr "Rimuovi segnalazione (%s)?"
 msgid "Remove sighting"
 msgstr "Rimuovi segnalazione"
 
+#: View/TagCollections/add.ctp:8
+msgid "Edit Tag Collection"
+msgstr ""
+
+#: View/TagCollections/add.ctp:16
+msgid "Visible to all orgs"
+msgstr ""
+
+#: View/TagCollections/import.ctp:4
+msgid "Paste tag collection data"
+msgstr ""
+
+#: View/TagCollections/import.ctp:5
+msgid "Paste a MISP tag collection JSON below to add tag collections."
+msgstr ""
+
+#: View/TagCollections/import.ctp:10
+msgid "Tag collection JSON"
+msgstr ""
+
 #: View/Tags/add.ctp:12
 #: View/Tags/edit.ctp:12
 msgid "Restrict tagging to org"
@@ -12064,6 +12776,10 @@ msgstr ""
 msgid "Restrict tagging to user"
 msgstr ""
 
+#: View/Tags/edit.ctp:31
+msgid "Unselectable Tag"
+msgstr ""
+
 #: View/Tags/index.ctp:10
 msgid "Your Favourite Tags"
 msgstr ""
@@ -12096,57 +12812,6 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:2
-msgid "Select Tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:16
-#: View/Tags/ajax/taxonomy_choice.ctp:4
-msgid "search tags…"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:25
-msgid "Attach tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Return to taxonomy selection"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Select Taxonomy"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Back to Taxonomy Selection"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:2
-msgid "Select Tag Source"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:10
-msgid "Favourite Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:14
-msgid "Custom Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:17
-msgid "All Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:21
-#: View/Taxonomies/view.ctp:2
-msgid "Taxonomy Library"
-msgstr ""
-
 #: View/Tasks/index.ctp:4
 msgid "Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks."
 msgstr ""
@@ -12184,7 +12849,8 @@ msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:41
-#: View/Taxonomies/view.ctp:29;143
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr ""
 
@@ -12194,7 +12860,8 @@ msgid "Are you sure you want to disable this taxonomy library?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:31;147
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr ""
 
@@ -12211,19 +12878,27 @@ msgstr ""
 msgid "Create and/or update selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:116
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
 msgid "Hidden"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:125
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:142
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:147
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr ""
 
@@ -12251,6 +12926,30 @@ msgstr ""
 msgid "Create / update all taxonomy entries as tags"
 msgstr ""
 
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
 #: View/TemplateElements/ajax/ajaxIndex.ctp:2
 msgid "Template Elements"
 msgstr ""
@@ -12503,6 +13202,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
 msgid "Terms accepted"
 msgstr ""
 
@@ -12569,15 +13270,19 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: View/Users/admin_email.ctp:36
+#: View/Users/admin_email.ctp:19
+msgid "All users of the same organisation"
+msgstr ""
+
+#: View/Users/admin_email.ctp:39
 msgid "Enter a custom message"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "New user registration"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "Password reset"
 msgstr "Reimposta la password"
 
@@ -12601,10 +13306,6 @@ msgstr "Applica filtri"
 msgid "Users"
 msgstr "Utenti"
 
-#: View/Users/admin_index.ctp:40
-msgid "Filter user index"
-msgstr "Filtra indice utente"
-
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr ""
@@ -12617,42 +13318,48 @@ msgstr ""
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr ""
 
-#: View/Users/admin_view.ctp:35
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
 msgid "Contactalert"
 msgstr ""
 
-#: View/Users/admin_view.ctp:46
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/admin_view.ctp:44
 msgid "Invited By"
 msgstr ""
 
-#: View/Users/admin_view.ctp:51
-msgid "Org admin"
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:74
-#: View/Users/view.ctp:67
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr ""
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:80
-#: View/Users/view.ctp:73
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
 msgid "GnuPG status"
 msgstr ""
 
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:83
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
 msgid "SMIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:95
-msgid "Nids Sid"
-msgstr ""
-
-#: View/Users/admin_view.ctp:110
-msgid "Password change"
-msgstr ""
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr ""
@@ -12685,37 +13392,37 @@ msgid "Proposals active"
 msgstr ""
 
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:34
+#: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
 msgstr ""
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:39
+#: View/Users/statistics_data.ctp:45
 msgid "Discussion posts"
 msgstr ""
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:48
+#: View/Users/statistics_data.ctp:54
 msgid "A heatmap showing user activity for each day during this month and the 4 months that preceded it. Use the buttons below to only show the heatmap of a specific organisation."
 msgstr ""
 
 #: View/Users/statistics.ctp:60
-#: View/Users/statistics_data.ctp:65
+#: View/Users/statistics_data.ctp:71
 msgid "Go left"
 msgstr ""
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:71
+#: View/Users/statistics_data.ctp:77
 msgid "Go right"
 msgstr ""
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:118
+#: View/Users/statistics_data.ctp:124
 msgid "The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings."
 msgstr ""
 
 #: View/Users/statistics.ctp:117
-#: View/Users/statistics_data.ctp:122
+#: View/Users/statistics_data.ctp:128
 msgid "The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer."
 msgstr ""
 
@@ -12723,6 +13430,18 @@ msgstr ""
 msgid "A heatmap showing the usage of ATT&CK Tactic."
 msgstr ""
 
+#: View/Users/statistics_data.ctp:32
+msgid "Users with PGP keys"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:36
+msgid "Local Organisations"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:38
+msgid "Average Users / Org"
+msgstr ""
+
 #: View/Users/statistics_orgs.ctp:17
 msgid "Organisation list"
 msgstr ""
@@ -12791,12 +13510,12 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
-#: View/Users/view.ctp:45
-msgid "Request API access"
+#: View/Users/ajax/emailConfirmTemplate.ctp:2
+msgid "Confirm sending"
 msgstr ""
 
-#: View/Users/view.ctp:50
-msgid "NIDS Start SID"
+#: View/Users/ajax/emailConfirmTemplate.ctp:4
+msgid "You are about to send a mail to %s recipient(s)?"
 msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:2
@@ -12859,7 +13578,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:29
+#: View/Warninglists/view.ctp:14;16
 msgid "Accepted attribute types"
 msgstr ""
 
@@ -12935,6 +13654,7 @@ msgstr ""
 #: Model/Attribute.php:validation for field uuid
 #: Model/Event.php:validation for field uuid;validation for field extends_uuid
 #: Model/EventBlacklist.php:validation for field event_uuid
+#: Model/MispObject.php:validation for field uuid
 #: Model/OrgBlacklist.php:validation for field org_uuid
 #: Model/Organisation.php:validation for field uuid
 #: Model/ShadowAttribute.php:validation for field uuid
@@ -12943,6 +13663,7 @@ msgid "Please provide a valid UUID"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/MispObject.php:validation for field uuid
 msgid "The UUID provided is not unique"
 msgstr ""
 
@@ -12962,6 +13683,7 @@ msgstr ""
 #: Model/ServerTag.php:validation for field server_id;validation for field tag_id
 #: Model/SharingGroup.php:validation for field name
 #: Model/Tag.php:validation for field name;validation for field colour
+#: Model/TagCollection.php:validation for field name
 #: Model/TemplateElementAttribute.php:validation for field name;validation for field description
 #: Model/ThreatLevel.php:validation for field name;validation for field description;validation for field form_description
 #: Model/User.php:validation for field org_id;validation for field authkey
@@ -13061,6 +13783,7 @@ msgid "This field is required."
 msgstr "Questo campo è obbligatorio."
 
 #: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
 #: Model/Whitelist.php:validation for field name
 msgid "A similar name already exists."
 msgstr ""
diff --git a/app/Locale/jpn/LC_MESSAGES/default.po b/app/Locale/jpn/LC_MESSAGES/default.po
index 6305399c2..7f3ebd307 100644
--- a/app/Locale/jpn/LC_MESSAGES/default.po
+++ b/app/Locale/jpn/LC_MESSAGES/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-01-22 21:25\n"
+"PO-Revision-Date: 2019-03-06 02:06\n"
 "Last-Translator: SteveClement <steve@localhost.lu>\n"
 "Language-Team: Japanese\n"
 "MIME-Version: 1.0\n"
@@ -15,272 +15,285 @@ msgstr ""
 "Language: ja_JP\n"
 
 #: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:149;153;157
+#: Controller/AttributesController.php:125;129;133
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1001;1348;1352;1356;1385;1800;1876;1880;1884;2102;2166;2248;2903;5264;5429;5433;5442
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
 #: Controller/PostsController.php:56
+#: Model/Galaxy.php:292
 msgid "Invalid event"
 msgstr "無効なイベント"
 
-#: Controller/AppController.php:607
+#: Console/Command/ServerShell.php:49
+#: Controller/ServersController.php:632
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+msgstr ""
+
+#: Console/Command/ServerShell.php:51
+msgid "ERROR: %s"
+msgstr ""
+
+#: Controller/AppController.php:383
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr ""
+
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
+msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+msgstr "この認証キーには、エクスポートに使用する権限がありません。管理者に問い合わせてください。"
+
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
+msgid "You have to be logged in to do that."
+msgstr "ログインする必要があります。"
+
+#: Controller/AppController.php:627
+msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
+msgstr ""
+
+#: Controller/AppController.php:752
 msgid "All done. attribute_count generated from scratch for "
 msgstr "すべて完了しました。attribute_count generated from scratch for "
 
-#: Controller/AppController.php:726
-#: Controller/AttributesController.php:2668
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
 #: Controller/ShadowAttributesController.php:1276
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "ジョブはキューに入れられました。アクティブなジョブビュー (管理 - >ジョブ) に移動すると、進行状況を表示できます。"
 
-#: Controller/AttributesController.php:140;1392
+#: Controller/AttributesController.php:116;1403
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "イベント ID が設定されていません。"
 
-#: Controller/AttributesController.php:143
+#: Controller/AttributesController.php:119
 msgid "You don't have permissions to create attributes"
 msgstr "アトリビュートを作成する権限がありません。"
 
-#: Controller/AttributesController.php:163;489;666
+#: Controller/AttributesController.php:139;488;668
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1684;1705;1739
-#: Controller/ObjectsController.php:442
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
 msgid "You do not have permission to do that."
 msgstr "実行する権限がありません。"
 
-#: Controller/AttributesController.php:414;864;869;873;1072;1152;2684;2698;2731;2753;2762;3309;3313;3409;3413
-#: Controller/ShadowAttributesController.php:824;1067;1091;1124;1134
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
 #: Controller/TagsController.php:491
 msgid "Invalid attribute"
 msgstr "無効なアトリビュート"
 
-#: Controller/AttributesController.php:424
-#: Controller/ShadowAttributesController.php:500
+#: Controller/AttributesController.php:421
+#: Controller/ShadowAttributesController.php:499
 msgid "You do not have the permission to view this event."
 msgstr "このイベントを表示する権限がありません。"
 
-#: Controller/AttributesController.php:472
+#: Controller/AttributesController.php:468
 msgid "Attribute not an attachment or malware-sample"
 msgstr "アトリビュートは添付ファイルまたはマルウェアサンプルではありません"
 
-#: Controller/AttributesController.php:504;677
-#: Controller/ShadowAttributesController.php:548
-msgid "PHP says file was not uploaded. Are you attacking me?"
-msgstr "PHP曰く、ファイルがアップロードされていない。攻撃じゃないよね？"
-
-#: Controller/AttributesController.php:680
-#: Controller/ShadowAttributesController.php:551;561
-msgid "There was a problem to upload the file."
-msgstr "ファイルのアップロードで問題が発生しました。"
-
-#: Controller/AttributesController.php:824
-msgid "The ThreatConnect data has been imported."
-msgstr "ThreatConnect データがインポートされました。"
-
-#: Controller/AttributesController.php:827
-msgid "%s entries imported."
-msgstr "%s エントリーがインポートされました。"
-
-#: Controller/AttributesController.php:831
-msgid "%s entries could not be imported."
-msgstr "%s エントリーがインポートされませんでした。"
-
-#: Controller/AttributesController.php:881;924;926
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "無効なアトリビュート"
-
-#: Controller/AttributesController.php:920
-msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
-msgstr "アトリビュートが保存されませんでした: リクエストされたアトリビュートがローカルコピーより新しくありません。"
-
-#: Controller/AttributesController.php:936;1401
-#: Controller/EventsController.php:4635;4648;5213;5227
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
 msgid "Invalid Event."
 msgstr "無効なイベントです。"
 
-#: Controller/AttributesController.php:953
+#: Controller/AttributesController.php:503;679
+#: Controller/ShadowAttributesController.php:546
+msgid "PHP says file was not uploaded. Are you attacking me?"
+msgstr "PHP曰く、ファイルがアップロードされていない。攻撃じゃないよね？"
+
+#: Controller/AttributesController.php:682
+#: Controller/ShadowAttributesController.php:549;559
+msgid "There was a problem to upload the file."
+msgstr "ファイルのアップロードで問題が発生しました。"
+
+#: Controller/AttributesController.php:826
+msgid "The ThreatConnect data has been imported."
+msgstr "ThreatConnect データがインポートされました。"
+
+#: Controller/AttributesController.php:829
+msgid "%s entries imported."
+msgstr "%s エントリーがインポートされました。"
+
+#: Controller/AttributesController.php:833
+msgid "%s entries could not be imported."
+msgstr "%s エントリーがインポートされませんでした。"
+
+#: Controller/AttributesController.php:883;931;933
+#: Controller/ShadowAttributesController.php:829
+msgid "Invalid attribute."
+msgstr "無効なアトリビュート"
+
+#: Controller/AttributesController.php:927
+msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
+msgstr "アトリビュートが保存されませんでした: リクエストされたアトリビュートがローカルコピーより新しくありません。"
+
+#: Controller/AttributesController.php:960
 msgid "The attribute has been saved"
 msgstr "アトリビュートが保存されました"
 
-#: Controller/AttributesController.php:985
+#: Controller/AttributesController.php:995
 msgid "The attribute could not be saved. Please, try again."
 msgstr "アトリビュートを保存できませんでした。もう一度試してください"
 
-#: Controller/AttributesController.php:1076
+#: Controller/AttributesController.php:1087
 msgid "Invalid event id."
 msgstr "無効なイベントID"
 
-#: Controller/AttributesController.php:1106
-#: Controller/EventsController.php:2023
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
+#: Controller/ShadowAttributesController.php:729
 msgid "Invalid input."
 msgstr "無効な入力です。"
 
-#: Controller/AttributesController.php:1111
+#: Controller/AttributesController.php:1122
 msgid "Invalid field."
 msgstr "無効な項目です。"
 
-#: Controller/AttributesController.php:1156
+#: Controller/AttributesController.php:1167
 msgid "Invalid attribute id."
 msgstr "無効なアトリビュートID"
 
-#: Controller/AttributesController.php:1231;1241
+#: Controller/AttributesController.php:1242;1252
 msgid "Attribute deleted"
 msgstr "アトリビュートは削除されました"
 
-#: Controller/AttributesController.php:1236;1238
+#: Controller/AttributesController.php:1247;1249
 msgid "Attribute was not deleted"
 msgstr "アトリビュートは削除されませんでした"
 
-#: Controller/AttributesController.php:1263;3155
-#: Controller/ShadowAttributesController.php:864
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
 msgid "Invalid Attribute"
 msgstr "無効なアトリビュート"
 
-#: Controller/AttributesController.php:1290
+#: Controller/AttributesController.php:1301
 msgid "Could not restore the attribute"
 msgstr "アトリビュートを復元できませんでした"
 
-#: Controller/AttributesController.php:1311;1318;1322
+#: Controller/AttributesController.php:1322;1329;1333
 msgid "Attribute not found or not authorised."
 msgstr "アトリビュートが見つからない、または権限がありません。"
 
-#: Controller/AttributesController.php:1372
+#: Controller/AttributesController.php:1383
 msgid "This function is only accessible via POST requests."
 msgstr "このファンクションは POST リクエストからのみアクセス可能です。"
 
-#: Controller/AttributesController.php:1427
+#: Controller/AttributesController.php:1438
 msgid "No matching attributes found."
 msgstr "一致するアトリビュートが見つかりません。"
 
-#: Controller/AttributesController.php:1461
+#: Controller/AttributesController.php:1472
 msgid "This method can only be accessed via AJAX."
 msgstr "このメソッドは AJAX からのみアクセス可能です。"
 
-#: Controller/AttributesController.php:1472
+#: Controller/AttributesController.php:1482
 msgid "You are not authorized to edit this event."
 msgstr "このイベントを編集する権限がありません。"
 
-#: Controller/AttributesController.php:1537
+#: Controller/AttributesController.php:1580
 msgid "No event ID provided."
 msgstr "イベント ID が与えられていません。"
 
-#: Controller/AttributesController.php:1640
-msgid "Invalid tag"
-msgstr "無効なタグ"
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
+msgid "Synonyms: "
+msgstr ""
 
-#: Controller/AttributesController.php:2107;2282;2391;2441;2524;2610
-#: Controller/EventsController.php:2484;2600;2662;2720;3079;3301;3993;4011
-msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
-msgstr "この認証キーには、エクスポートに使用する権限がありません。管理者に問い合わせてください。"
-
-#: Controller/AttributesController.php:2112;2277;2384
-#: Controller/EventsController.php:3084
+#: Controller/AttributesController.php:1997;2104
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr "あなたには権限がありません。Authorization ヘッダーにあなたの認証キーを、Accept ヘッダーに application/xml を設定して送信してください。"
 
-#: Controller/AttributesController.php:2123
-msgid "Content type and parameter mismatch. Expecting JSON."
-msgstr "Content type とパラメーターが不一致です。JSON を期待しています。"
-
-#: Controller/AttributesController.php:2128
-msgid "Content type and parameter mismatch. Expecting XML."
-msgstr "Content type とパラメーターが不一致です。XML を期待しています。"
-
-#: Controller/AttributesController.php:2132;2290
+#: Controller/AttributesController.php:2010
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
 msgstr "url に検索用語を指定するか、json array / xmlを POST します (ルート要素は \"request\"で、正しい accept と content type ヘッダーを指定してください)。"
 
-#: Controller/AttributesController.php:2310
+#: Controller/AttributesController.php:2030
 msgid "You don't have access to that event."
 msgstr "イベントを閲覧する権限がありません。"
 
-#: Controller/AttributesController.php:2373
+#: Controller/AttributesController.php:2093
 msgid "No matches."
 msgstr "該当はありません。"
 
-#: Controller/AttributesController.php:2395;2404
+#: Controller/AttributesController.php:2115;2124
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "無効なアトリビュートか、閲覧権限がありません。"
 
-#: Controller/AttributesController.php:2445;2528;2614
-#: Controller/EventsController.php:2488;2605;2667;2724;3305;3997;4015
-msgid "You have to be logged in to do that."
-msgstr "ログインする必要があります。"
-
-#: Controller/AttributesController.php:2472
+#: Controller/AttributesController.php:2192
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
 msgstr "url に検索用語を指定するか、json array / xmlを POST します (ルート要素は \"request\"で、content type に基づいて正しいヘッダーを指定してください)。"
 
-#: Controller/AttributesController.php:2536
+#: Controller/AttributesController.php:2256
 msgid "Invalid event ID format."
 msgstr "無効なイベント ID のフォーマットです。"
 
-#: Controller/AttributesController.php:2645
+#: Controller/AttributesController.php:2365
 #: Controller/ShadowAttributesController.php:1254
 msgid "All done. "
 msgstr "すべて完了しました。 "
 
-#: Controller/AttributesController.php:2677;2724
+#: Controller/AttributesController.php:2397;2444
 #: Controller/ShadowAttributesController.php:1062
 msgid "Invalid field requested."
 msgstr "無効な項目がリクエストされました。"
 
-#: Controller/AttributesController.php:2680;2727
+#: Controller/AttributesController.php:2400;2447
 msgid "This function can only be accessed via AJAX."
 msgstr "この機能は AJAX からのみアクセス可能です。"
 
-#: Controller/AttributesController.php:2792;2800
-#: Controller/EventsController.php:3689;3967
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "イベントが見つからないか、アトリビュートを作成する権限がありません"
 
-#: Controller/AttributesController.php:2821
+#: Controller/AttributesController.php:2541
 msgid "This action can only be accessed via AJAX."
 msgstr "このアクションは AJAX からのみアクセス可能です。"
 
-#: Controller/AttributesController.php:2830;3081;3095;3106
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
 msgid "You are not authorised to do that."
 msgstr "それをする権限がありません。"
 
-#: Controller/AttributesController.php:2935
-#: Controller/EventsController.php:4431
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
 msgid "This functionality requires API key access."
 msgstr "この機能には API キーのアクセスが必要です。"
 
-#: Controller/AttributesController.php:2943
+#: Controller/AttributesController.php:2663
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr "このアクションは、API のみに適用されます。 これを使用する方法については、自動化のページを参照してください。"
 
-#: Controller/AttributesController.php:2955
+#: Controller/AttributesController.php:2675
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "ハッシュまたはイベント ID を受け取りませんでしたした。2つのうちの少なくとも1つを設定する必要があります。"
 
-#: Controller/AttributesController.php:3116
+#: Controller/AttributesController.php:2836
 msgid "Invalid script."
 msgstr "無効なスクリプトです。"
 
-#: Controller/AttributesController.php:3181
+#: Controller/AttributesController.php:2901
 msgid "No valid enrichment options found for this attribute."
 msgstr "このアトリビュートに対する有効なエンリッチメントオプションが見つかりません。"
 
-#: Controller/AttributesController.php:3245
+#: Controller/AttributesController.php:2964
 msgid "Invalid type requested."
 msgstr "無効なタイプがリクエストされました。"
 
-#: Controller/AttributesController.php:3476
-#: Controller/EventsController.php:5209
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "このインスタンスでは相関の無効化が許可されていません。"
 
-#: Controller/AttributesController.php:3480;3495
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3243;3258
+#: Controller/ShadowAttributesController.php:677
 msgid "Invalid Attribute."
 msgstr "無効なアトリビュートです。"
 
-#: Controller/AttributesController.php:3483;3498
-#: Controller/EventsController.php:5216;5230
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
 msgid "You don't have permission to do that."
 msgstr "実行する権限がありません。"
 
@@ -288,254 +301,286 @@ msgstr "実行する権限がありません。"
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "このインスタンスではイベントのブラックリスティングは現在無効です"
 
-#: Controller/EventsController.php:804
+#: Controller/EventsController.php:848
 msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
 msgstr "X509証明書またはPGP鍵が設定されていません。アトリビュートをメールで受け取る場合、いずれかをプロファイルに追加してください。"
 
-#: Controller/EventsController.php:806
+#: Controller/EventsController.php:850
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "GnuPG キーが設定されていません。アトリビュートをメールで受け取る場合、公開鍵をプロフィールに追加してください。"
 
-#: Controller/EventsController.php:812
+#: Controller/EventsController.php:856
 msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
 msgstr "X509 証明書または GnuPG キーが設定されていません。アトリビュートをメールで受け取る場合、いずれかをプロフィールに追加してください。"
 
-#: Controller/EventsController.php:814
+#: Controller/EventsController.php:858
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr "GnuPG キーがプロフィールで設定されていません。アトリビュートをメールで受け取る場合、公開鍵をプロフィールに追加してください。"
 
-#: Controller/EventsController.php:1527
+#: Controller/EventsController.php:1559
+msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
+msgstr ""
+
+#: Controller/EventsController.php:1769
 msgid "You don't have permissions to create events"
 msgstr "イベントを作成する権限がありません"
 
-#: Controller/EventsController.php:1533
+#: Controller/EventsController.php:1775
 msgid "No valid event data received."
 msgstr "有効なイベントデータを受け取っていません。"
 
-#: Controller/EventsController.php:1569
+#: Controller/EventsController.php:1811
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "無効な共有グループまたは権限がありません (同期ユーザーが共有グループに含まれていません)。"
 
-#: Controller/EventsController.php:1573;1577
+#: Controller/EventsController.php:1815;1819
 msgid "Invalid Sharing Group or not authorised."
 msgstr "無効な共有グループ、もしくは権限がありません。"
 
-#: Controller/EventsController.php:1601
+#: Controller/EventsController.php:1843
 msgid "Event blocked by local blacklist."
 msgstr "ローカルのブラックリストによりイベントがブロックされました。"
 
-#: Controller/EventsController.php:1614;1693;1955
+#: Controller/EventsController.php:1856;1933;2197
 msgid "The event has been saved"
 msgstr "イベントが保存されました"
 
-#: Controller/EventsController.php:1622
+#: Controller/EventsController.php:1864
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "イベントはすでに存在しています。編集する場合は、location ヘッダー内の url を使用してください。"
 
-#: Controller/EventsController.php:1633
+#: Controller/EventsController.php:1870
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "ブラックリストのエントリーにより、あなたはイベントを作成できません。 このインスタンスの管理チームに連絡してください"
 
-#: Controller/EventsController.php:1635;1958
+#: Controller/EventsController.php:1872;2200
 msgid "The event could not be saved. Please, try again."
 msgstr "イベントを保存できませんでした。もう一度やり直してください。"
 
-#: Controller/EventsController.php:1719
+#: Controller/EventsController.php:1912
+msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
+msgstr ""
+
+#: Controller/EventsController.php:1959
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "MISP XML または MISP JSON ファイルのみアップロードできます。"
 
-#: Controller/EventsController.php:1720
+#: Controller/EventsController.php:1960
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "ファイルのアップロードに失敗したか、ファイルの拡張子が予期されたもの (.xml / .json) ではありません。"
 
-#: Controller/EventsController.php:1768
+#: Controller/EventsController.php:2009
 msgid "STIX document imported, event's created: "
 msgstr "SITX ドキュメントがインポートされ、イベントが作成されました: "
 
-#: Controller/EventsController.php:1771
+#: Controller/EventsController.php:2012
 msgid "STIX document imported."
 msgstr "SITX ドキュメントがインポートされました。"
 
-#: Controller/EventsController.php:1774
+#: Controller/EventsController.php:2015
 msgid "Could not import STIX document: "
 msgstr "SITX ドキュメントをインポートできませんでした: "
 
-#: Controller/EventsController.php:1781
+#: Controller/EventsController.php:2022
 msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
 msgstr "ファイルのアップロードに失敗しました。アップロードする Stix ファイルが選択されていること、そのファイルの最大サイズが次より大きくないことを確認してください "
 
-#: Controller/EventsController.php:1805;1890
+#: Controller/EventsController.php:2046;2131
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "この動作を実行する権限がありません。「アトリビュートの提案」機能を使用してください。"
 
-#: Controller/EventsController.php:1813
+#: Controller/EventsController.php:2054
 msgid "Invalid event ID entered."
 msgstr "無効なイベント ID が入力されました。"
 
-#: Controller/EventsController.php:1818
+#: Controller/EventsController.php:2059
 msgid "You are not authorised to read the selected event."
 msgstr "選択したイベントを読む権限がありません。"
 
-#: Controller/EventsController.php:2109;2172
+#: Controller/EventsController.php:2349;2387;2450
 msgid "You don't have the permission to do that."
 msgstr "実行する権限がありません。"
 
-#: Controller/EventsController.php:2259
+#: Controller/EventsController.php:2358
+msgid "Event unpublished."
+msgstr ""
+
+#: Controller/EventsController.php:2537
 msgid "Email sent to the reporter."
 msgstr "報告者にメールを送信しました。"
 
-#: Controller/EventsController.php:2261
+#: Controller/EventsController.php:2539
 msgid "Sending of email failed"
 msgstr "Eメールの送信に失敗"
 
-#: Controller/EventsController.php:2397
+#: Controller/EventsController.php:2678
 msgid "This feature is currently disabled"
 msgstr "この機能は現在無効化されています"
 
-#: Controller/EventsController.php:2439;4025
+#: Controller/EventsController.php:2720;3986
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
 msgstr "url で検索用語を指定するか、xml を POST します (ルート要素は \"request\" です)。"
 
-#: Controller/EventsController.php:2475
+#: Controller/EventsController.php:2756
 msgid "Invalid Event ID."
 msgstr "無効なイベント ID です。"
 
-#: Controller/EventsController.php:2522
+#: Controller/EventsController.php:2803
 msgid "No events found that match the passed parameters."
 msgstr "渡されたパラメーターと一致するイベントは見つかりませんでした。"
 
-#: Controller/EventsController.php:2547
+#: Controller/EventsController.php:2828
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
 msgstr "Url に検索用語を指定するか、json または xml 形式でフィルターパラメーターを投稿します。有効なフィルター: id (イベント ID)、タグ (タグのリスト) 、from (YYYY-MM-DD フォーマットの日付) 、to (YYYY-MM-DD フォーマットの日付)、last (イベントの公開されたタイムスタンプが現在よりこの時間まで - 有効なフォーマットは時間 + 単位で、6d または 2w など)"
 
-#: Controller/EventsController.php:2622;2684
+#: Controller/EventsController.php:2903
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
 msgstr "url に検索用語を指定するか、フィルターパラメーター付きの json または xmlを POST します。"
 
-#: Controller/EventsController.php:2641
-#: Model/Attribute.php:1927
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
 msgid "Invalid hash type."
 msgstr "無効なハッシュのタイプです。"
 
-#: Controller/EventsController.php:2871
+#: Controller/EventsController.php:3025
 msgid "Filename not allowed."
 msgstr "許可されていないファイル名です。"
 
-#: Controller/EventsController.php:2892
+#: Controller/EventsController.php:3045
 msgid "Problem with writing the ioc file. Please report to administrator."
 msgstr "Iocファイルの作成に問題が生じました。管理者に連絡してください。"
 
-#: Controller/EventsController.php:2986
+#: Controller/EventsController.php:3139
 msgid "This is not a valid MISP XML file."
 msgstr "有効な MISP XML ファイルではありません。"
 
-#: Controller/EventsController.php:3101
-msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type)."
-msgstr "url に検索用語を指定するか、json array / xmlを POST します (ルート要素は \"request\"で、content type に基づいて正しいヘッダーを指定してください)。"
-
-#: Controller/EventsController.php:3294
+#: Controller/EventsController.php:3291
 msgid "Not yet implemented"
 msgstr "未実装"
 
-#: Controller/EventsController.php:3312;3316
+#: Controller/EventsController.php:3309;3313
 msgid "Invalid event or not authorised."
 msgstr "無効なイベント、もしくは権限がありません。"
 
-#: Controller/EventsController.php:3336;3406
+#: Controller/EventsController.php:3333;3403
 msgid "You don't have the privileges to access this."
 msgstr "アクセスする権限がありません。"
 
-#: Controller/EventsController.php:3920
-msgid "Could not add tags."
-msgstr "タグを追加できませんでした。"
+#: Controller/EventsController.php:3610
+#: Controller/TagCollectionsController.php:307
+msgid "Invalid Tag."
+msgstr ""
 
-#: Controller/EventsController.php:3971;5055
-#: Controller/ObjectsController.php:46;140;144;438
+#: Controller/EventsController.php:3626
+#: Controller/TagCollectionsController.php:323
+msgid "Tag is already attached to this event."
+msgstr ""
+
+#: Controller/EventsController.php:3637;3643
+#: Controller/TagCollectionsController.php:330
+msgid "Tag(s) added."
+msgstr ""
+
+#: Controller/EventsController.php:3639
+msgid "Tag could not be added."
+msgstr ""
+
+#: Controller/EventsController.php:3645
+#: Controller/TagCollectionsController.php:338
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
 msgid "Invalid event."
 msgstr "無効なイベントです。"
 
-#: Controller/EventsController.php:4085;4115;4131
+#: Controller/EventsController.php:3918
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
+msgstr ""
+
+#: Controller/EventsController.php:4049;4079;4095
 msgid "You do not have the permission to do that."
 msgstr "実行する権限がありません。"
 
-#: Controller/EventsController.php:4196;4334
+#: Controller/EventsController.php:4160;4300
 msgid "Invalid ID"
 msgstr "無効な ID"
 
-#: Controller/EventsController.php:4200;4338
+#: Controller/EventsController.php:4164;4304
 msgid "Event not found or you are not authorised to view it."
 msgstr "イベントが見つからない、またはイベントを表示する権限がありません。"
 
-#: Controller/EventsController.php:4434;4441
+#: Controller/EventsController.php:4405;4412
 msgid "Please POST the samples as described on the automation page."
 msgstr "オートメーションページの説明に従ってサンプルを POST してください。"
 
-#: Controller/EventsController.php:4470
+#: Controller/EventsController.php:4441
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr "サンプルを受信しなかったか、またはサンプルのフォーマットが正しくありません。自動化ページの API ドキュメントを参照してください。"
 
-#: Controller/EventsController.php:4478
+#: Controller/EventsController.php:4449
 msgid "Event not found"
 msgstr "イベントが見つかりません"
 
-#: Controller/EventsController.php:4501
+#: Controller/EventsController.php:4472
 msgid "Event not found."
 msgstr "イベントが見つかりません。"
 
-#: Controller/EventsController.php:4511
+#: Controller/EventsController.php:4482
 msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
 msgstr "イベント ID を渡さずにサンプルをアップロードする場合、ディストリビューションレベル 5 はサポートされません。ディストリビューションレベル 5 は、既存のイベントのディストリビューションレベルを引き受けることを意図しています。"
 
-#: Controller/EventsController.php:4536
+#: Controller/EventsController.php:4507
 msgid "The creation of a new event with the supplied information has failed."
 msgstr "提供された情報を元にした新しいイベントの作成に失敗しました。"
 
-#: Controller/EventsController.php:4671;4693;4722;4747;4772;4802;4823
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
 msgid "Invalid type."
 msgstr "無効なタイプです。"
 
-#: Controller/EventsController.php:4866
+#: Controller/EventsController.php:4906
 msgid "Invalid method."
 msgstr "無効なメソッドです。"
 
-#: Controller/EventsController.php:4946
+#: Controller/EventsController.php:4989
 msgid "%s services are not enabled."
 msgstr "%s サービスが有効化されていません。"
 
-#: Controller/EventsController.php:4950
+#: Controller/EventsController.php:4993
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "アトリビュートが見つからない、またはアトリビュートを表示する権限がありません。"
 
-#: Controller/EventsController.php:4956
+#: Controller/EventsController.php:4999
 msgid "No valid %s options found for this attribute."
 msgstr "このアトリビュートに対する有効な %s オプションが見つかりません。"
 
-#: Controller/EventsController.php:4973
+#: Controller/EventsController.php:5016
 msgid "no valid %s options found for this attribute."
 msgstr "このアトリビュートに対する有効な %s オプションが見つかりません。"
 
-#: Controller/EventsController.php:4995
+#: Controller/EventsController.php:5038
 msgid "%s service not reachable."
 msgstr "%s サービスにリーチできません。"
 
-#: Controller/EventsController.php:5007
+#: Controller/EventsController.php:5050
 msgid ": Enriched via the %s"
 msgstr ": %s 経由でエンリッチ"
 
-#: Controller/EventsController.php:5136
+#: Controller/EventsController.php:5184
 msgid "Import service not reachable."
 msgstr "インポートサービスにリーチできません。"
 
-#: Controller/EventsController.php:5303
+#: Controller/EventsController.php:5351
 msgid "Invalid ID."
 msgstr "無効な ID です。"
 
-#: Controller/EventsController.php:5351
-#: Controller/ShadowAttributesController.php:312;317;534
+#: Controller/EventsController.php:5399
+#: Controller/ShadowAttributesController.php:311;316;532
 msgid "Invalid Event"
 msgstr "無効なイベント"
 
-#: Controller/EventsController.php:5369
+#: Controller/EventsController.php:5420
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "エンリッチメントタスクはバックグラウンド処理用のキューに追加されました。後ほど結果を確認してください。"
 
@@ -543,122 +588,138 @@ msgstr "エンリッチメントタスクはバックグラウンド処理用の
 msgid "You don't have the required privileges to do that."
 msgstr "それを実行するために必要な権限がありません。"
 
-#: Controller/FeedsController.php:193;291
+#: Controller/FeedsController.php:205;303
 msgid "Feed added."
 msgstr "フィードが追加されました。"
 
-#: Controller/FeedsController.php:201
+#: Controller/FeedsController.php:213
 msgid "Feed could not be added. Invalid field: %s"
 msgstr "フィードを追加できませんでした。無効な項目: %s"
 
-#: Controller/FeedsController.php:226;326;348;470;502;682
+#: Controller/FeedsController.php:238;338;360;482;517;721
 msgid "Invalid feed."
 msgstr "無効なフィードです。"
 
-#: Controller/FeedsController.php:299
+#: Controller/FeedsController.php:311
 msgid "Feed could not be updated. Invalid fields: %s"
 msgstr "フィードを更新できませんでした。無効な項目: %s"
 
-#: Controller/FeedsController.php:322
+#: Controller/FeedsController.php:334
 msgid "This action requires a post request."
 msgstr "このアクションには post リクエストが必要です。"
 
-#: Controller/FeedsController.php:355;474
+#: Controller/FeedsController.php:367;486
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "フィードは現在有効になっていません。有効化してください。"
 
-#: Controller/FeedsController.php:368;434
+#: Controller/FeedsController.php:380;446
 msgid "Starting fetch from Feed."
 msgstr "フィードから取得を開始します。"
 
-#: Controller/FeedsController.php:379
+#: Controller/FeedsController.php:391
 msgid "Pull queued for background execution."
 msgstr "バックグラウンド実行のためにキューからプル"
 
-#: Controller/FeedsController.php:384;386
+#: Controller/FeedsController.php:396;398
 msgid "Fetching the feed has failed."
 msgstr "フィードの取得に失敗しました。"
 
-#: Controller/FeedsController.php:390
+#: Controller/FeedsController.php:402
 msgid "Fetching the feed has successfuly completed."
 msgstr "フィードの取得が正常に完了しました。"
 
-#: Controller/FeedsController.php:451
+#: Controller/FeedsController.php:463
 msgid "Fetching the feed has successfully completed."
 msgstr "フィードの取得が正常に完了しました。"
 
-#: Controller/FeedsController.php:481
+#: Controller/FeedsController.php:493
 msgid "Event added."
 msgstr "イベントが追加されました。"
 
-#: Controller/FeedsController.php:484
+#: Controller/FeedsController.php:496
 msgid "Event already up to date."
 msgstr "イベントは既に最新です。"
 
-#: Controller/FeedsController.php:486
+#: Controller/FeedsController.php:498
 msgid "Event updated."
 msgstr "イベントが更新されました。"
 
-#: Controller/FeedsController.php:490
+#: Controller/FeedsController.php:502
 msgid "Could not %s event."
 msgstr "イベントを %s できませんでした。"
 
-#: Controller/FeedsController.php:493
+#: Controller/FeedsController.php:505
 msgid "Download failed."
 msgstr "ダウンロードに失敗しました。"
 
-#: Controller/FeedsController.php:561
+#: Controller/FeedsController.php:597
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "フィードを取得できませんでした。返ってきた HTTP エラーコードは次のとおりです: "
 
-#: Controller/FeedsController.php:600;651
+#: Controller/FeedsController.php:636;687
 msgid "Invalid feed type."
 msgstr "無効なフィードのタイプです。"
 
-#: Controller/FeedsController.php:714
+#: Controller/FeedsController.php:753
 msgid "This event is blocked by the Feed filters."
 msgstr "このイベントはフィードのフィルターによってブロックされています。"
 
-#: Controller/FeedsController.php:716
+#: Controller/FeedsController.php:755
 msgid "Could not download the selected Event"
 msgstr "選択されたイベントをダウンロードできませんでした"
 
-#: Controller/FeedsController.php:752;756
+#: Controller/FeedsController.php:791;795
 msgid "Invalid Feed."
 msgstr "無効なフィードです。"
 
-#: Controller/FeedsController.php:777
+#: Controller/FeedsController.php:816
 msgid "Only POST requests are allowed."
 msgstr "POST リクエストのみが許可されています。"
 
-#: Controller/FeedsController.php:781
+#: Controller/FeedsController.php:820
 msgid "Feed not found."
 msgstr "フィードが見つかりません。"
 
-#: Controller/FeedsController.php:790
+#: Controller/FeedsController.php:829
 msgid "Data pulled."
 msgstr "データがプルされました。"
 
-#: Controller/FeedsController.php:792
+#: Controller/FeedsController.php:831
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "選択したデータをプルできませんでした。理由: %s"
 
-#: Controller/FeedsController.php:809
+#: Controller/FeedsController.php:848
 msgid "Starting feed caching."
 msgstr "フィードのキャッシングを開始しています。"
 
-#: Controller/FeedsController.php:824
+#: Controller/FeedsController.php:863
 msgid "Caching the feeds has failed."
 msgstr "フィードのキャッシングに失敗しました。"
 
-#: Controller/FeedsController.php:827
+#: Controller/FeedsController.php:866
 msgid "Caching the feeds has successfully completed."
 msgstr "フィードのキャッシングが正常に完了しました。"
 
-#: Controller/FeedsController.php:858
+#: Controller/FeedsController.php:900
 msgid "Invalid feed list received."
 msgstr "無効なフィードのリストを受け取りました。"
 
+#: Controller/GalaxiesController.php:92
+msgid "All clusters"
+msgstr "すべてのクラスター"
+
+#: Controller/GalaxiesController.php:135
+msgid "All namespaces"
+msgstr "すべてのネームスペース"
+
+#: Controller/GalaxiesController.php:250
+msgid "Failed to parse request."
+msgstr ""
+
+#: Controller/GalaxiesController.php:253
+msgid "No clusters picked."
+msgstr ""
+
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr "すべての完了したジョブがパージされました"
@@ -671,11 +732,23 @@ msgstr "すべてのジョブがパージされました"
 msgid "Invalid object"
 msgstr "無効なオブジェクト"
 
-#: Controller/ObjectReferencesController.php:187
+#: Controller/ObjectReferencesController.php:188
 msgid "Invalid object reference"
 msgstr "オブジェクト参照が無効です。"
 
-#: Controller/ObjectTemplatesController.php:88
+#: Controller/ObjectTemplatesController.php:31
+msgid "All Objects"
+msgstr "すべてのオブジェクト"
+
+#: Controller/ObjectTemplatesController.php:99
+msgid "Invalid object template"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:103
+msgid "Invalid object template id."
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
 msgstr "オブジェクトテンプレートが削除されました。"
 
@@ -696,23 +769,23 @@ msgstr "オブジェクトを作成する権限がありません."
 msgid "Invalid template."
 msgstr "無効なテンプレート"
 
-#: Controller/ObjectsController.php:303
+#: Controller/ObjectsController.php:311
 msgid "You don't have permissions to edit objects."
 msgstr "オブジェクトを編集する権限がありません."
 
-#: Controller/ObjectsController.php:317;328;427
+#: Controller/ObjectsController.php:325;336;439
 msgid "Invalid object."
 msgstr "無効なオブジェクトです。"
 
-#: Controller/ObjectsController.php:421
+#: Controller/ObjectsController.php:433
 msgid "You don't have permissions to delete objects."
 msgstr "オブジェクトを削除する権限がありません。"
 
-#: Controller/ObjectsController.php:531;538;542
+#: Controller/ObjectsController.php:543;550;554
 msgid "Object not found or not authorised."
 msgstr "オブジェクトが見つからない、または権限がありません。"
 
-#: Controller/ObjectsController.php:799
+#: Controller/ObjectsController.php:811
 msgid "%s objects successfully reconstructed."
 msgstr "%s オブジェクトが正常に再構成されました。"
 
@@ -776,123 +849,147 @@ msgstr "ロールを保存できませんでした。もう一度やり直して
 msgid "Role deleted"
 msgstr "ロールが削除されました"
 
-#: Controller/ServersController.php:204;394
+#: Controller/ServersController.php:226;417
 msgid "The pull filter rules must be in valid JSON format."
 msgstr "プルのフィルタールールは正しい JSON フォーマットである必要があります。"
 
-#: Controller/ServersController.php:214;404
+#: Controller/ServersController.php:236;427
 msgid "The push filter rules must be in valid JSON format."
 msgstr "プッシュのフィルタールールは正しい JSON フォーマットである必要があります。"
 
-#: Controller/ServersController.php:268;434
+#: Controller/ServersController.php:291;457
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr "uuid が既に使用されているため、組織を作成できません。"
 
-#: Controller/ServersController.php:280
+#: Controller/ServersController.php:303
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format? Also, make sure the organisation's name doesn't clash with an existing one."
 msgstr "新しい組織を保存できませんでした。正しいフォーマットの uuid ですか? また、組織の名前が既存の名前と衝突しないようにしてください。"
 
-#: Controller/ServersController.php:309;490
+#: Controller/ServersController.php:332;513
 msgid "The server has been saved"
 msgstr "サーバーが保存されました"
 
-#: Controller/ServersController.php:316;497
+#: Controller/ServersController.php:339;520
 msgid "The server could not be saved. Please, try again."
 msgstr "サーバーを保存できませんでした。もう一度やり直してください。"
 
-#: Controller/ServersController.php:369;565;590;598;659;1412
+#: Controller/ServersController.php:392;589;614;623;683;1360
 msgid "Invalid server"
 msgstr "無効なサーバー"
 
-#: Controller/ServersController.php:451
+#: Controller/ServersController.php:474
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr "新しい組織を作成できませんでした。uuid が正しいフォーマットであることを確認してください。"
 
-#: Controller/ServersController.php:572
+#: Controller/ServersController.php:596
 msgid "Server deleted"
 msgstr "サーバーが削除されました"
 
-#: Controller/ServersController.php:575
+#: Controller/ServersController.php:599
 msgid "Server was not deleted"
 msgstr "サーバーは削除されませんでした"
 
-#: Controller/ServersController.php:602
+#: Controller/ServersController.php:626
 msgid "Pull setting not enabled for this server."
 msgstr "Pull機能はこのサーバーでは無効です。"
 
-#: Controller/ServersController.php:611
-msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
-msgstr "権限がありません。認証キーが無効であるか、もしくは同期ユーザーがリモートサーバーで有効な認証権限を持っていないためです。これ以外の理由としては、同期サーバーの設定が誤っている可能性があります。"
+#: Controller/ServersController.php:659
+msgid "Pull queued for background execution. Job ID: %s"
+msgstr ""
 
-#: Controller/ServersController.php:1309
+#: Controller/ServersController.php:696
+msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
+msgstr ""
+
+#: Controller/ServersController.php:709
+msgid "Push complete. %s events pushed, %s events could not be pushed."
+msgstr ""
+
+#: Controller/ServersController.php:734
+msgid "Push queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:1257
 msgid "File not found."
 msgstr "ファイルが見つかりません"
 
-#: Controller/ServersController.php:1315
+#: Controller/ServersController.php:1263
 msgid "File could not be deleted."
 msgstr "ファイルを削除できませんでした。"
 
-#: Controller/ServersController.php:1338;1354
+#: Controller/ServersController.php:1286;1302
 msgid "Upload failed."
 msgstr "アップロードに失敗しました。"
 
-#: Controller/ServersController.php:1346
+#: Controller/ServersController.php:1294
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "ファイルは既に存在します。更新したい場合、まず古いファイルを削除してください。"
 
-#: Controller/ShadowAttributesController.php:212
+#: Controller/ServersController.php:1748
+msgid "Starting server caching."
+msgstr ""
+
+#: Controller/ServersController.php:1763
+msgid "Caching the servers has failed."
+msgstr ""
+
+#: Controller/ServersController.php:1766
+msgid "Caching the servers has successfully completed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:211
 msgid "Moving of the file that this attachment references failed."
 msgstr "この添付ファイルが参照しているファイルの移動に失敗しました。"
 
-#: Controller/ShadowAttributesController.php:280
+#: Controller/ShadowAttributesController.php:279
 msgid "Could not discard proposal."
 msgstr "提案を破棄できませんでした。"
 
-#: Controller/ShadowAttributesController.php:341
+#: Controller/ShadowAttributesController.php:340
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr "アトリビュートが追加されていません: 添付ファイルが\"添付ファイルを追加\"ボタンで追加されました"
 
-#: Controller/ShadowAttributesController.php:389;392;401
+#: Controller/ShadowAttributesController.php:388;391;400
 msgid "The lines"
 msgstr "行"
 
-#: Controller/ShadowAttributesController.php:441
+#: Controller/ShadowAttributesController.php:440
 msgid "The proposal has been saved"
 msgstr "提案が保存されました"
 
-#: Controller/ShadowAttributesController.php:453;763
+#: Controller/ShadowAttributesController.php:452;761
 msgid "Could not save the proposal. Errors: %s"
 msgstr "提案を保存できませんでした。エラー: %s"
 
-#: Controller/ShadowAttributesController.php:455
+#: Controller/ShadowAttributesController.php:454
 msgid "The proposal could not be saved. Please, try again."
 msgstr "提案を保存できませんでした。もう一度やり直してください。"
 
-#: Controller/ShadowAttributesController.php:492
+#: Controller/ShadowAttributesController.php:491
 msgid "Invalid Proposal"
 msgstr "無効な提案"
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:521
 msgid "Proposal not an attachment or malware-sample"
 msgstr "提案は添付ファイルまたはマルウェアサンプルではありません"
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:617
 msgid "The attachment has been uploaded"
 msgstr "添付ファイルがアップロードされました"
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:619
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr "添付ファイルがアップロードされましたが、いくつかの提案が作成されませんでした。失敗した提案: "
 
-#: Controller/ShadowAttributesController.php:624
+#: Controller/ShadowAttributesController.php:622
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr "添付ファイルが保存されませんでした。管理者に連絡してください。"
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:752
 msgid "The proposed Attribute has been saved"
 msgstr "提案されたアトリビュートが保存されました"
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:763
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr "シャドウアトリビュートを保存できませんでした。もう一度試してください。"
 
@@ -924,6 +1021,86 @@ msgstr "共有グループを削除しました。"
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr "共有グループを削除できませんでした。この共有グループに紐付いたイベントやアトリビュート、スレッドがないか確認してください。"
 
+#: Controller/SightingsController.php:86
+msgid "Could not add the Sighting. Reason: "
+msgstr ""
+
+#: Controller/SightingsController.php:96;99
+msgid "Sighting added"
+msgstr ""
+
+#: Controller/SightingsController.php:152
+msgid "You are not authorised to remove sightings data as you don't have permission to modify your organisation's data."
+msgstr ""
+
+#: Controller/SightingsController.php:158
+msgid "Attribute not found"
+msgstr ""
+
+#: Controller/SightingsController.php:176
+msgid "Invalid request."
+msgstr ""
+
+#: Controller/SightingsController.php:185
+msgid "Sighting added."
+msgstr ""
+
+#: Controller/SightingsController.php:187
+msgid "Sighting could not be added"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:56;177
+msgid "The tag collection has been saved"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:64;185
+msgid "The tag collection could not be added. Reason: "
+msgstr ""
+
+#: Controller/TagCollectionsController.php:85
+msgid "%s new tag collections added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:154
+msgid "Invalid Tag Collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:161
+msgid "You don't have editing rights on this Tag Collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:201;380
+msgid "Invalid tag collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:207
+msgid "Tag collection deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:215
+msgid "Tag collection could not be deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:224
+msgid "You are not allowed to delete that."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:332
+msgid "Tag(s) could not be added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:384
+msgid "Insufficient privileges to remove the tag from the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:395
+msgid "Invalid tag or tag not associated with the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:399
+msgid "Failed to remove tag from the collection."
+msgstr ""
+
 #: Controller/TagsController.php:367
 msgid "Tag deleted"
 msgstr "タグを削除しました"
@@ -932,6 +1109,27 @@ msgstr "タグを削除しました"
 msgid "Tag was not deleted"
 msgstr "タグは削除されませんでした"
 
+#: Controller/TagsController.php:580
+msgid "Favourite Tags"
+msgstr "お気に入りのタグ"
+
+#: Controller/TagsController.php:586
+msgid "Tag Collections"
+msgstr ""
+
+#: Controller/TagsController.php:591
+msgid "All Tags"
+msgstr "すべてのタグ"
+
+#: Controller/TagsController.php:601
+#: View/Taxonomies/view.ctp:2
+msgid "Taxonomy Library"
+msgstr "タクソノミーライブラリー"
+
+#: Controller/TagsController.php:756
+msgid "Includes: "
+msgstr ""
+
 #: Controller/TemplatesController.php:408
 msgid "Event populated, "
 msgstr "追加されたイベント、 "
@@ -940,15 +1138,15 @@ msgstr "追加されたイベント、 "
 msgid "Event populated, but "
 msgstr "追加されたイベント、しかし "
 
-#: Controller/UsersController.php:42;221
+#: Controller/UsersController.php:42;247
 msgid "Invalid user or not authorised."
 msgstr "無効なユーザ、もしくは権限がありません。"
 
-#: Controller/UsersController.php:54;430;657;907
+#: Controller/UsersController.php:54;456;683;929
 msgid "Invalid user"
 msgstr "無効なユーザー"
 
-#: Controller/UsersController.php:119;564;728
+#: Controller/UsersController.php:119;590;754
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr "無効なEメールドメインです。ユーザーは、次のいずれかのドメインに限定されます。 "
 
@@ -960,59 +1158,75 @@ msgstr "このプロフィールはアップデートされました"
 msgid "The profile could not be updated. Please, try again."
 msgstr "プロフィールを更新できませんでした。もう一度やり直してください。"
 
-#: Controller/UsersController.php:198
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
 msgid "Password Changed."
 msgstr "パスワードが変更されました。"
 
-#: Controller/UsersController.php:203
+#: Controller/UsersController.php:222
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "パスワードを更新できませんでした。パスワードの最小長/複雑さの要件を満たしてください。"
 
-#: Controller/UsersController.php:575
+#: Controller/UsersController.php:601
 msgid "The user could not be saved. Invalid organisation."
 msgstr "ユーザーを保存できませんでした。無効な組織です。"
 
-#: Controller/UsersController.php:597
+#: Controller/UsersController.php:623
 msgid "The user has been saved."
 msgstr "ユーザーが保存されました。"
 
-#: Controller/UsersController.php:606;843
+#: Controller/UsersController.php:632;865
 msgid "The user could not be saved. Please, try again."
 msgstr "ユーザーを保存できませんでした。もう一度やり直してください。"
 
-#: Controller/UsersController.php:835
+#: Controller/UsersController.php:857
 msgid "The user has been saved"
 msgstr "ユーザーが保存されました。"
 
-#: Controller/UsersController.php:915
+#: Controller/UsersController.php:937
 msgid "User deleted"
 msgstr "ユーザが削除されました"
 
-#: Controller/UsersController.php:919
+#: Controller/UsersController.php:941
 msgid "User was not deleted"
 msgstr "ユーザが削除されませんでした"
 
-#: Controller/UsersController.php:997
+#: Controller/UsersController.php:1019
 msgid "Invalid username or password, try again"
 msgstr "無効なユーザー名またはパスワード、もう一度やり直してください。"
 
-#: Controller/UsersController.php:1080
+#: Controller/UsersController.php:1106
 msgid "Good-Bye"
 msgstr "さようなら"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1147
 msgid "New authkey generated."
 msgstr "新しい認証キーが生成されました。"
 
-#: Controller/UsersController.php:1230
+#: Controller/UsersController.php:1256
 msgid "You accepted the Terms and Conditions."
 msgstr "あなたは利用規約に同意しました。"
 
-#: Controller/UsersController.php:1419
+#: Controller/UsersController.php:1438
+msgid "Recipient email not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1443
+msgid "Recipient organisation not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1480
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr "メールを送信しましたが、次の宛先への配信に失敗しました: "
 
-#: Controller/UsersController.php:1421
+#: Controller/UsersController.php:1482
 msgid "E-mails sent."
 msgstr "メールが送信されました。"
 
@@ -1040,972 +1254,1040 @@ msgstr "%s が削除されました"
 msgid "%s was not deleted"
 msgstr "%s は削除されませんでした"
 
-#: Controller/Component/BlackListComponent.php:72
+#: Controller/Component/BlackListComponent.php:75
 msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
 msgstr "完了しました。%d 個の新しいエントリーをブラックリストに追加しました。 %d 個のエントリーは保存できませんでした。"
 
-#: Controller/Component/BlackListComponent.php:123
+#: Controller/Component/BlackListComponent.php:126
 msgid "Blacklist item added."
 msgstr "ブラックリストにアイテムが追加されました。"
 
-#: Controller/Component/BlackListComponent.php:152
+#: Controller/Component/BlackListComponent.php:155
 msgid "Invalid blacklist entry"
 msgstr "無効なブラックリストのエントリーです。"
 
-#: Controller/Component/BlackListComponent.php:156
+#: Controller/Component/BlackListComponent.php:159
 msgid "Blacklist entry removed"
 msgstr "ブラックリストのエントリーが削除されました。"
 
-#: Controller/Component/BlackListComponent.php:158
+#: Controller/Component/BlackListComponent.php:161
 msgid "Could not remove the blacklist entry"
 msgstr "ブラックリストのエントリーを削除できませんでした。"
 
-#: Model/Attribute.php:567
+#: Model/Attribute.php:591
 msgid "Composite type, but value not explodable"
 msgstr "コンポジットタイプですが、値を分解できません"
 
-#: Model/Attribute.php:677
+#: Model/Attribute.php:703
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr "添付ファイルの削除に失敗しました。 管理者に報告してください。"
 
-#: Model/Attribute.php:802
+#: Model/Attribute.php:828
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr "入力された文字列は長すぎるため、切り捨てられます。 代わりにデータを添付ファイルとして追加することを検討してください"
 
-#: Model/Attribute.php:921
+#: Model/Attribute.php:953
 msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "チェックサムの長さまたはフォーマットが無効です (期待値: %s 16進数文字列)。 値をもう一度チェックするか、\"other\"を選択してください。"
 
-#: Model/Attribute.php:928
+#: Model/Attribute.php:960
 msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "チェックサムの長さまたはフォーマットが無効です (期待値: 35桁以上の16進数文字列)。 値をもう一度チェックするか、\"other\"を選択してください。"
 
-#: Model/Attribute.php:935
+#: Model/Attribute.php:967
 msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr "入力が予期される sha1 フォーマット (期待値: 40桁の16進数文字列) と一致しません。 MISP は現在 PE ハッシュに対して SHA1 のみをサポートしています。サポートを他のハッシュタイプに拡張したい場合は、https://github.com/MISP/MISP で github チケットを作成してください!"
 
-#: Model/Attribute.php:946
+#: Model/Attribute.php:978
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr "無効なSSDeep ハッシュ。 フォーマットは blocksize:hash:hash でなければいけません。"
 
-#: Model/Attribute.php:957
+#: Model/Attribute.php:989
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr "無効な impfuzzy フォーマット。フォーマットは imports:hash:hash でなければいけません。"
 
-#: Model/Attribute.php:972
+#: Model/Attribute.php:996
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:1011
 msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr "入力が予期される ファイル名 | sha1 フォーマット (期待値: ファイル名 | 40桁の16進数文字列) と一致しません。 MISP は現在 PE ハッシュに対して SHA1 のみをサポートしています。サポートを他のハッシュタイプに拡張したい場合は、https://github.com/MISP/MISP で github チケットを作成してください!"
 
-#: Model/Attribute.php:990
+#: Model/Attribute.php:1029
 msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "チェックサムの長さまたはフォーマットが正しくありません (期待値: ファイル名 | %s 16進数文字列)。値をもう一度チェックするか、\"other\"を選択してください。"
 
-#: Model/Attribute.php:995
+#: Model/Attribute.php:1034
 msgid "Invalid composite type. The format has to be %s."
 msgstr "無効なコンポジットタイプ。フォーマットは %s でなければいけません。"
 
-#: Model/Attribute.php:1006
+#: Model/Attribute.php:1045
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr "無効な SSDeep ハッシュ (期待されるフォーマット: blocksize:hash:hash)。"
 
-#: Model/Attribute.php:1014
+#: Model/Attribute.php:1053
 msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr "チェックサムの長さまたはフォーマットが正しくありません (期待値: ファイル名 | 35桁以上の16進数文字列)。値をもう一度チェックするか、\"other\"を選択してください。"
 
-#: Model/Attribute.php:1025
+#: Model/Attribute.php:1064
 msgid "Invalid CIDR notation value found."
 msgstr "無効な CIDR ノーテーション値が見つかりました。"
 
-#: Model/Attribute.php:1032;1083
+#: Model/Attribute.php:1071;1122
 msgid "IP address has an invalid format."
 msgstr "IP アドレスのフォーマットが無効です。"
 
-#: Model/Attribute.php:1037
+#: Model/Attribute.php:1076
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr "ポート番号は、1 から 65535 までの正の整数でなければいけません。"
 
-#: Model/Attribute.php:1066
+#: Model/Attribute.php:1105
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr " 名前のフォーマットが無効です。 値をもう一度チェックするか、\"other\"を選択してください。"
 
-#: Model/Attribute.php:1086
+#: Model/Attribute.php:1125
 msgid "Domain name has an invalid format."
 msgstr "ドメイン名のフォーマットが無効です。"
 
-#: Model/Attribute.php:1099
+#: Model/Attribute.php:1138
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr "Eメールアドレスが無効なフォーマットです。 値をもう一度チェックするか、\"other\" を選択してください。"
 
-#: Model/Attribute.php:1107
+#: Model/Attribute.php:1146
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr "無効なフォーマットです。期待されるフォーマット: CVE-xxxx-xxxx..."
 
-#: Model/Attribute.php:1118
+#: Model/Attribute.php:1157
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr "無効なフォーマットです。 フォワードまたはバックスラッシュを含まない256文字未満の値のみが許可されます。"
 
-#: Model/Attribute.php:1230
+#: Model/Attribute.php:1272
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr "Datetime は ISO 8601 フォーマットでなければなりません。"
 
-#: Model/Attribute.php:1236
+#: Model/Attribute.php:1278
 msgid "The value has to be a number greater or equal 0."
 msgstr "値は0以上の数値でなければなりません。"
 
-#: Model/Attribute.php:1243
+#: Model/Attribute.php:1285
 msgid "The value has to be a number between 0 and 10."
 msgstr "値は0から10の間の数値でなければなりません。"
 
-#: Model/Attribute.php:1923;1991
+#: Model/Attribute.php:1968;2036
 msgid "Could not read user."
 msgstr "ユーザーを読み込みできません。"
 
-#: Model/Attribute.php:2527
+#: Model/Attribute.php:2616
 msgid "This field is mandatory."
 msgstr "この項目は必須です。"
 
-#: Model/Attribute.php:2885
+#: Model/Attribute.php:3069
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr "何かが間違っています。 アップロードされたマルウェアサンプルの zip アーカイブを作成する際に、数字以外のイベント ID を受信しました。"
 
-#: Model/Event.php:4532
+#: Model/Event.php:5392
 msgid "Issues while loading the stix file. "
 msgstr "stix ファイルの読み込み中に問題が発生しました。  "
 
-#: Model/Event.php:4534
+#: Model/Event.php:5394
 msgid "Issues with the maec library. "
 msgstr "maec ライブラリの問題。 "
 
-#: Model/Event.php:4536
+#: Model/Event.php:5396
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "インジェスチョンスクリプト実行時の問題または無効な入力です。 "
 
-#: Model/Event.php:4539
+#: Model/Event.php:5399
 msgid "Please ask your administrator to "
 msgstr "Please ask your administrator to "
 
-#: Model/Event.php:4541
+#: Model/Event.php:5401
 msgid "Please "
 msgstr "Please "
 
-#: Model/Event.php:4543
+#: Model/Event.php:5403
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr "check whether the dependencies for STIX are met via the diagnostic tool."
 
-#: Model/Event.php:4575
+#: Model/Event.php:5435
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:4584
+#: Model/Event.php:5444
 msgid "%s not set"
 msgstr "%s が設定されていません"
 
-#: Model/Server.php:114
+#: Model/Event.php:5667
+msgid "Could not add tags."
+msgstr "タグを追加できませんでした。"
+
+#: Model/Galaxy.php:219;276;286;300
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
 msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
 msgstr "特定の管理タスクの API が公開されているため、自動化された方法 / 外部ツール経由で MISP を保守および設定することができます。"
 
-#: Model/Server.php:115
+#: Model/Server.php:122
 msgid "Administering MISP via the CLI"
 msgstr "CLI 経由での MISP の管理"
 
-#: Model/Server.php:125
+#: Model/Server.php:132
 msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
 msgstr "フィードのキャッシングやサーバーインスタンスからのプルなどのタスクを自動化したい場合は、次のコマンドラインツールを使用して行うことができます。 単に指定されたコマンドをコマンドラインで実行するか、 簡単な cron ジョブを作成してください。"
 
-#: Model/Server.php:126
+#: Model/Server.php:133
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr "特定のコンソールタスクの自動化"
 
-#: Model/Server.php:135
+#: Model/Server.php:142
 msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
 msgstr "アプリケーションのベース url (https://www.mymispinstance.com のフォーマット)。 いくつかの機能は、この設定が正しく機能するように設定されているかどうかに依存しています。"
 
-#: Model/Server.php:137
+#: Model/Server.php:144
 msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
 msgstr "現在の設定の baseurl は、ページにアクセスした URL と一致しません。 別の URL (たとえば IP アドレス経由など) を使用してページにアクセスしている場合は、これを無視してください。"
 
-#: Model/Server.php:143
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr "true に設定しない限り、サイト管理者のみがインスタンスにアクセスできます。"
 
-#: Model/Server.php:151
+#: Model/Server.php:166
 msgid "Select the language MISP should use. The default is english."
 msgstr "MISP で使用する言語を選択します。デフォルトは英語です。"
 
-#: Model/Server.php:161
+#: Model/Server.php:176
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr "パフォーマンスが重い相関を有効化 (現時点では CIDR の相関)"
 
-#: Model/Server.php:170
+#: Model/Server.php:185
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:195
 msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
 msgstr "場合によっては、頻繁に使用される MISP インスタンスは、サーバーにヒットするリクエストの数が多いため、不要なブラックホールエラーを生成することがあります。自動ログアウト機能を無効化すると、システムの負担を軽減できます。"
 
-#: Model/Server.php:179
+#: Model/Server.php:204
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr "2つの ssdeep ハッシュが相関していると見なすための ssdeep スコアを設定 [1-100]"
 
-#: Model/Server.php:187
+#: Model/Server.php:212
 msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
 msgstr "1つのイベントから取得できる相関の最大数を設定します。極端なエッジケースにおいて、これはメモリの問題を防ぐことができます。 デフォルト値は5kです。"
 
-#: Model/Server.php:196
+#: Model/Server.php:221
 msgid "The message that users will see if the instance is not live."
 msgstr "インスタンスが動作していない場合、ユーザーに表示されるメッセージ。"
 
-#: Model/Server.php:198
+#: Model/Server.php:223
 msgid "If this is not set the default value will be used."
 msgstr "設定されていない場合、デフォルト値が使用されます。"
 
-#: Model/Server.php:204;212;230;254;262;270;278;335;383;391;457
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
 msgid "This setting is deprecated and can be safely removed."
 msgstr "この設定は廃止されたので、安全に削除できます。"
 
-#: Model/Server.php:220
+#: Model/Server.php:245
 msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
 msgstr "キャッシュされたエクスポートはかなりの容量を占める可能性があるので、この設定を使用してインスタンス全体で無効化することができます。 キャッシュされたエクスポートを無効化することはお勧めできませんが、サーバーに空き領域の問題がある場合は、この手順を実行する意味があります。"
 
-#: Model/Server.php:238
+#: Model/Server.php:263
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr "\"Powered by MISP\" テキストの前にあるフッターのテキスト。"
 
-#: Model/Server.php:246
+#: Model/Server.php:271
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr "\"Powered by MISP\" テキストに続くフッターのテキスト。"
 
-#: Model/Server.php:286
+#: Model/Server.php:311
 msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
 msgstr "設定されている場合、この設定では、フッターの右側にロゴを表示します。 ファイル管理ツールでカスタムイメージとしてアップロードしてください。"
 
-#: Model/Server.php:294
+#: Model/Server.php:319
 msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
 msgstr "設定されている場合、この設定はロゴをホームアイコンとして表示します。 ファイル管理ツールでカスタムイメージとしてアップロードしてください。"
 
-#: Model/Server.php:302
+#: Model/Server.php:327
 msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
 msgstr "設定されている場合、ここで指定された画像はログイン画面のメイン MISP ロゴを置き換えます。 ファイル管理ツールでカスタムイメージとしてアップロードしてください。"
 
-#: Model/Server.php:310
+#: Model/Server.php:335
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr "ホスティング組織の組織タグ。 Eメールのサブジェクトで使用されます。"
 
-#: Model/Server.php:318
+#: Model/Server.php:343
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr "このインスタンスのホスティング組織。 これを選択しない限り、レプリケーションインスタンスを追加することができません。"
 
-#: Model/Server.php:327
+#: Model/Server.php:352
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr "MISP インスタンスの UUID。 UUID は、インスタンスを識別するために使用されます。"
 
-#: Model/Server.php:329
+#: Model/Server.php:354
 msgid "No valid UUID set"
 msgstr "有効な UUID が設定されていません"
 
-#: Model/Server.php:343
+#: Model/Server.php:368
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr "この設定を 'false' に設定すると、組織名 / ロゴがすべて非表示になります。"
 
-#: Model/Server.php:351
+#: Model/Server.php:376
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr "通知Eメールのサブジェクトに、イベントの脅威レベルを挿入します。"
 
-#: Model/Server.php:359
+#: Model/Server.php:384
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr "email_subject_tag が見つからない場合のEメール用の TLP 文字列です。"
 
-#: Model/Server.php:367
+#: Model/Server.php:392
 msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
 msgstr "このタグがイベントに設定されている場合、その値はEメールのサブジェクトに含まれて送信されます。 タグが設定されていない場合、email_subject_TLP_string が使用されます。"
 
-#: Model/Server.php:375
+#: Model/Server.php:400
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr "サブジェクトに email_subject_tag の名前を含めます。 false の場合、タグの値のみが使用されます。"
 
-#: Model/Server.php:399
+#: Model/Server.php:424
 msgid "Enables the use of MISP's background processing."
 msgstr "MISP のバックグラウンド処理を有効化します。"
 
-#: Model/Server.php:407
+#: Model/Server.php:432
 msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
 msgstr "添付ファイルが保存されるディレクトリ。 この設定を変更しても、MISP は既存のデータを移行しません。 config.php 内にあるこの設定を変更する唯一の安全な方法は、MISP が実行されていないとき、および既存のデータを新しい場所に移動/コピーした後です。このディレクトリは既に存在し、MISP アプリケーションによって書き込み可能であり、読み取り可能でなければなりません。"
 
-#: Model/Server.php:416
+#: Model/Server.php:441
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr "XML キャッシュにエンコードされた添付ファイルを含むことを許可します。"
 
-#: Model/Server.php:424
+#: Model/Server.php:449
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr "ユーザーがブラウザで読み込んだとき、常に添付ファイルをダウンロードする"
 
-#: Model/Server.php:432
+#: Model/Server.php:457
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr "MISP がすべての通知に使用するEメールアドレス"
 
-#: Model/Server.php:440
+#: Model/Server.php:465
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr "この設定を使用すると、すべてのEメールを無効にすることができます。 有効化すると、MISP からEメールは外部に送信されません。"
 
-#: Model/Server.php:449
+#: Model/Server.php:474
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr "MISP がインスタンスのサポートチームの連絡先アドレスとして含めるEメールアドレス。"
 
-#: Model/Server.php:465
+#: Model/Server.php:490
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr "Vulnerability タイプのアトリビュートを、提供された CVE 検索と関連づけるリンクに変換"
 
-#: Model/Server.php:473
+#: Model/Server.php:498
 msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
 msgstr "この設定は、イベントが REST インターフェイス経由で作成されたときに通知Eメールを送信するかどうかを制御します。 別のインスタンスとのリンクを最初に設定する際、最初のプルでユーザーにスパムをしないために、この設定を無効化することをお勧めします。クイックリキャップ: True = Eメールは送信されません。False = Eメールは、sync / REST を経由して公開されたイベントで送信されます。"
 
-#: Model/Server.php:481
+#: Model/Server.php:506
 msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
 msgstr "このフラグを有効化すると、アラートEメールのサブジェクトにイベントの説明が含まれて送信されます。 これは GnuPG によって暗号化されないことに注意してください。イベント説明の一部がクリアテキストで送信されることを受け入れる場合にのみ有効にしてください。"
 
-#: Model/Server.php:489
+#: Model/Server.php:514
 msgid "The default distribution setting for events (0-3)."
 msgstr "イベント用のデフォルトのディストリビューション設定 (0-3)。"
 
-#: Model/Server.php:498
+#: Model/Server.php:523
 msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
 msgstr "アトリビュートのデフォルトのディストリビューション設定、イベントのディストリビューションレベルをデフォルトにするには、'event'に設定します。(0-3 または \"event\")"
 
-#: Model/Server.php:507
+#: Model/Server.php:532
 msgid "The default threat level setting when creating events."
 msgstr "イベントを作成する際のデフォルトの脅威レベル。"
 
-#: Model/Server.php:516
+#: Model/Server.php:541
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:550
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr "MISP のタグ付け機能を有効化します。これを強くお勧めします。"
 
-#: Model/Server.php:524
+#: Model/Server.php:558
 msgid "Show the full tag names on the event index."
 msgstr "イベントインデックスですべてのタグ名を表示します。"
 
-#: Model/Server.php:533
+#: Model/Server.php:567
 msgid "Used on the login page, before the MISP logo"
 msgstr "ログインページにおいて、MISP のロゴの前に使用"
 
-#: Model/Server.php:541
+#: Model/Server.php:575
 msgid "Used on the login page, after the MISP logo"
 msgstr "ログインページにおいて、MISP のロゴの後に使用"
 
-#: Model/Server.php:549
+#: Model/Server.php:583
 msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
 msgstr "ファイル管理ツールでカスタムイメージとしてアップロードし、ログインページにおいて、MISP のロゴの左側に使用する。"
 
-#: Model/Server.php:557
+#: Model/Server.php:591
 msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
 msgstr "ファイル管理ツールでカスタムイメージとしてアップロードし、ログインページにおいて、MISP のロゴの右側に使用します。"
 
-#: Model/Server.php:565
+#: Model/Server.php:599
 msgid "Used in the page title, after the name of the page"
 msgstr "ページタイトルにおいて、ページの名前の後に使用"
 
-#: Model/Server.php:573
+#: Model/Server.php:607
 msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
 msgstr "ユーザーが、\"Add MISP XML\"ボタンを使用してアップロードしたイベントの所有権を取得できるようにします。これにより、手動でインポートされたイベントの作成者を偽装することができますが、本来意図した公開性を破る可能性もあります。同じイベントに対して異なる作成者を持つインスタンスと同期すると、望ましくない結果につながる可能性があります。"
 
-#: Model/Server.php:581
+#: Model/Server.php:615
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr "利用規約をインラインで表示するか (false) またはダウンロードして表示するか (true) を選択"
 
-#: Model/Server.php:589
+#: Model/Server.php:623
 msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
 msgstr "利用規約ファイルのファイル名。 ファイルが MISP/app/files/terms ディレクトリにあることを確認してください"
 
-#: Model/Server.php:597
+#: Model/Server.php:631
 msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
 msgstr "Trueは、組織項目のみを表示する従来の方法ではなく、イベントインデックス(ソース組織とメンバー組織) の別の組織項目を有効にします。これにより、メンバー組織が MISP インスタンス上でイベントをアップロードしたのか、または相互接続されたインスタンスからイベントがアップロードされたかをユーザーが確認できます。"
 
-#: Model/Server.php:605
+#: Model/Server.php:639
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr "True は、未公開イベントに対して、サイト管理者以外の投稿者の所属組織外のユーザーからのアクセスを拒否します。"
 
-#: Model/Server.php:614
+#: Model/Server.php:648
 msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr "アカウントの作成後にユーザーに送信されるメッセージ (管理インターフェイスから手動で送信)。改行に \\n を使用します。次の変数は自動的にテキストで置き換えられます: $password = MISPが生成した新しい一時パスワード、 $username = ユーザーの電子メール アドレス、 $misp = このインスタンスのurl、$org = このインスタンスが所属している組織、例えばMISP.org、 $contact = サポート チームに連絡するために使用する電子メール アドレス、例えばMISP.contact。例「 $username のパスワードは $passwordです」において、メール アドレス user@misp.org を持つユーザーには、「user@misp.org のパスワードは hNamJae81 です」となる。"
 
-#: Model/Server.php:623
+#: Model/Server.php:657
 msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr "パスワードリセット時にユーザーに送信されるメッセージ 。改行に \\n を使用します。次の変数は自動的にテキストで置き換えられます: $password = MISPが生成した新しい一時パスワード、 $username = ユーザーの電子メール アドレス、 $misp = このインスタンスのurl、$contact = サポート チームに連絡するために使用する電子メール アドレス、たとえばMISP.contact 。例「 $username のパスワードは $passwordです」において、メール アドレス user@misp.org を持つユーザーには、「user@misp.org のパスワードは hNamJae81です」となる。"
 
-#: Model/Server.php:631
+#: Model/Server.php:665
 msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
 msgstr "バージョン2.3.107以降では、イベントの UUID をブラックリストに登録してインスタンスにプッシュされないようにすることができます。 この機能は、イベントが削除されるたびに自動的に発生し、削除されたイベントが別のインスタンスからプッシュバックされることを防ぎます。"
 
-#: Model/Server.php:638
+#: Model/Server.php:672
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr "ブラックリスト化された組織によるイベントの作成を防ぐために、組織のUUIDをブラックリストに登録します。"
 
-#: Model/Server.php:645
+#: Model/Server.php:679
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr "有効化すると、すべてのログエントリーにユーザーの IP アドレスが含まれます。"
 
-#: Model/Server.php:654
+#: Model/Server.php:688
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr "有効化すると、MISP は API キーを使用して成功したすべての認証を記録します。 リクエストされた URL も記録されます。"
 
-#: Model/Server.php:662
+#: Model/Server.php:696
 msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
 msgstr "この機能を使用すると、ユーザーは組織のみのイベントを作成し、別の組織にイベントの所有権を持つよう要求することができます。これにより、パートナーに匿名のままイベントを公開するよう依頼することで、組織を匿名のままに保つことができます。"
 
-#: Model/Server.php:671
+#: Model/Server.php:705
 msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
 msgstr "有効化すると、現在ログインしているユーザーに表示される相関の数がイベントインデックスの UI に表示されます。 これはパフォーマンスコストを伴いますが、イベントの相関を一目で確認するのに非常に役立ちます。"
 
-#: Model/Server.php:680
+#: Model/Server.php:714
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr "有効化すると、イベントへの提案の数がインデックスに表示されます。"
 
-#: Model/Server.php:689
+#: Model/Server.php:723
 msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
 msgstr "有効化すると、イベント内のアトリビュートのサイティングの総数が、イベントインデックスの UI 上で現在ログインしているユーザーに表示されます。"
 
-#: Model/Server.php:698
+#: Model/Server.php:732
 msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
 msgstr "有効化すると、イベントのディスカッションポストの総数が、イベントインデックスの UI 上で現在ログインしているユーザーに表示されます。"
 
-#: Model/Server.php:707
+#: Model/Server.php:741
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr "有効化すると、組織とサイトの管理者のみがユーザーのプロフィールを編集することができます。"
 
-#: Model/Server.php:717
+#: Model/Server.php:751
 msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
 msgstr "この設定を有効にすると、特定のタグを持つイベントのアラートEメールがブロックされます。MISP.block_event_alert_tag にタグを定義します。"
 
-#: Model/Server.php:726
+#: Model/Server.php:760
 msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
 msgstr "MISP.block_event_alert 設定が設定されている場合、この設定で定義されたタグでタグ付けされたイベントのアラートEメールはブロックされます。"
 
-#: Model/Server.php:735
+#: Model/Server.php:769
 msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
 msgstr "この設定を有効化すると、古いイベントのアラートEメールがブロックされます。 古いイベントと見なされる正確なタイミングは、MISP.block_old_event_alert_age によって定義されます。"
 
-#: Model/Server.php:744
+#: Model/Server.php:778
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
 msgstr "MISP.block_old_event_alert 設定が設定されている場合、この設定はイベントが警告されるまでの時間を制御します。 イベントの\"日付\"項目が使用されます。 予期されるフォーマット: 日数の整数"
 
-#: Model/Server.php:753
+#: Model/Server.php:787
 msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
 msgstr "MISP の特定の機能で使用する一時ディレクトリを指定してください。 デフォルトでは、/tmp が設定され、インポート処理中にインポートから抽出された特定の一時ファイルを保存するために使用されます。"
 
-#: Model/Server.php:762
-msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/webroot/css directory and enter the name here."
-msgstr "CSS をカスタマイズしたい場合、css ファイルを /var/www/MISP/webroot/css に配置し、ここにその名前を入力してください。"
+#: Model/Server.php:796
+msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
+msgstr ""
 
-#: Model/Server.php:771
+#: Model/Server.php:805
 msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
 msgstr "この設定を有効化すると、IDS フラグを削除する、またはアトリビュートを完全に削除する提案が作成されている場合、to_ids センシティブなエクスポートからアトリビュートをブロックすることができます。これは、偽陽性に効率的に対応するための強力なツールです。"
 
-#: Model/Server.php:780
+#: Model/Server.php:814
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr "この設定を有効化すると、任意のソースから入力されたイベントを経由して同期/追加された新しいタグをデフォルトでユーザーが選択できないようになります。"
 
-#: Model/Server.php:789
+#: Model/Server.php:823
 msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
 msgstr "*警告* この設定は、このインスタンスの相関を完全に無効化し、既存の保存された相関をすべて削除します。 これを有効化すると、非常に長くコストのかかる手続きであるすべてのデータの完全な相関がトリガーされます。 これを理解している場合にのみ、有効化してください。"
 
-#: Model/Server.php:799
+#: Model/Server.php:833
 msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
 msgstr "*警告* この設定により、イベントの作成者は、作成した個々のイベント/アトリビュートの相関を無効にすることができます。"
 
-#: Model/Server.php:808
+#: Model/Server.php:842
 msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr "キャッシングなどの一般的な MISP タスクに使用される Redis サーバーを実行しているホスト。 これは、バックグラウンド処理で使用される Redis サーバーと混同されることはありません。"
 
-#: Model/Server.php:816
+#: Model/Server.php:850
 msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr "キャッシングなどの一般的な MISP タスクに使用される Redis サーバーが使用するポート。 これは、バックグラウンド処理で使用される Redis サーバーと混同されることはありません。"
 
-#: Model/Server.php:824
+#: Model/Server.php:858
 msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
 msgstr "一般的な MISP タスクに使用される Redis サーバー上のデータベース。 複数の MISP インスタンスを実行する場合は、それぞれのインスタンスで異なるデータベースを使用するようにしてください。"
 
-#: Model/Server.php:832
+#: Model/Server.php:866
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr "一般的な MISP タスクに使用する Redis サーバーのパスワード (存在する場合)。"
 
-#: Model/Server.php:841
+#: Model/Server.php:875
 msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
 msgstr "イベントビューで検索するときにフィルタリングする項目を指定します。 デフォルト値: \"id, uuid, value, comment, type, category, Tag.name\""
 
-#: Model/Server.php:849
+#: Model/Server.php:883
+msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
+msgstr ""
+
+#: Model/Server.php:891
 msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
 msgstr "同時実行数が多い、 MISP を使用するツールを持っている場合にのみ、これを有効化してください。一般的なパフォーマンスは、通常のように、より短いテーブルロックを優先して特定のトランザクションクエリーを避けるほど低くなります。"
 
-#: Model/Server.php:861
+#: Model/Server.php:903
 msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
 msgstr "GnuPG 実行ファイルの場所。 /usr/bin/gpg とは別の GnuPG 実行ファイルを使いたい場合、ここで設定することができます。 デフォルトの設定で問題ない場合、MISP が提案した設定のままにしてください。"
 
-#: Model/Server.php:869
+#: Model/Server.php:911
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr "暗号化されていないEメールを GnuPG キーを持たないユーザーに送信することを許可 (false) します。"
 
-#: Model/Server.php:877
+#: Model/Server.php:919
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr "暗号化されていないEメールの本文にイベントに関する詳細を含めることを許可 (false) します。"
 
-#: Model/Server.php:885
+#: Model/Server.php:927
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr "GnuPG Eメールの署名を有効化します。 デフォルトでは、GnuPG Eメールは署名されます"
 
-#: Model/Server.php:893
+#: Model/Server.php:935
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr "このインスタンスの GnuPG キーと紐づいているEメールアドレス。"
 
-#: Model/Server.php:901
+#: Model/Server.php:943
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr "このインスタンスの GnuPG キーのパスワード (設定されている場合)。"
 
-#: Model/Server.php:910
+#: Model/Server.php:952
 msgid "The location of the GnuPG homedir."
 msgstr "GnuPG ホームディレクトリの場所。"
 
-#: Model/Server.php:921
+#: Model/Server.php:963
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr "SMIME 暗号化を有効化。 SMIME を有効化すると、GnuPG.onlyencrypted とGnuPG.bodyonlyencrypted 設定の暗号化の状態が継承されます。"
 
-#: Model/Server.php:929
+#: Model/Server.php:971
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr "このインスタンスの SMIME キーと紐づいているEメールアドレス。"
 
-#: Model/Server.php:937
+#: Model/Server.php:979
 msgid "The location of the public half of the signing certificate."
 msgstr "署名証明書の public half の場所。"
 
-#: Model/Server.php:945
+#: Model/Server.php:987
 msgid "The location of the private half of the signing certificate."
 msgstr "署名証明書の private half の場所。"
 
-#: Model/Server.php:953
+#: Model/Server.php:995
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr "このインスタンスの SMIME キーのパスワード (設定されている場合)。"
 
-#: Model/Server.php:965
+#: Model/Server.php:1007
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr "外部の同期リクエスト用の HTTP プロキシのホスト名。 プロキシーを使用しない場合は空のままにします。"
 
-#: Model/Server.php:973
+#: Model/Server.php:1015
 msgid "The TCP port for the HTTP proxy."
 msgstr "HTTP プロキシ用の TCP ポート。"
 
-#: Model/Server.php:981
+#: Model/Server.php:1023
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr "HTTP プロキシの認証方法。 現在 Basic または Digest 認証がサポートされています。プロキシ認証がない場合は空のままにします。"
 
-#: Model/Server.php:989
+#: Model/Server.php:1031
 msgid "The authentication username for the HTTP proxy."
 msgstr "HTTP プロキシの認証ユーザー名。"
 
-#: Model/Server.php:997
+#: Model/Server.php:1039
 msgid "The authentication password for the HTTP proxy."
 msgstr "HTTP プロキシの認証パスワード。"
 
-#: Model/Server.php:1008
+#: Model/Server.php:1050
 msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
 msgstr "ハッシュされたパスワードに使用されるソルト。 これは GUI からリセットすることはできません。settings.php ファイルから手動でのみリセットすることができます。 これは、データベース内のすべてのパスワードを無効化することに注意してください。"
 
-#: Model/Server.php:1017
+#: Model/Server.php:1059
 msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
 msgstr "すべての監査ログのエントリーを直接 syslog に渡すには、この設定を有効化します。 これは冗長で、ユーザー、組織、イベントデータが含まれることに注意してください。"
 
-#: Model/Server.php:1026
+#: Model/Server.php:1068
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr "パスワードの長さの要件。 設定されていない場合、または0に設定されている場合、デフォルト値は (12) と見なされます。"
 
-#: Model/Server.php:1034
+#: Model/Server.php:1076
 msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 msgstr "パスワードの複雑さの要件。デフォルト設定 (数字または特殊文字を含み、4つの条件のうち3つを満たすもの) で空にしておくか、独自の正規表現を入力してください。長さは別のキーでチェックされることに注意してください。デフォルト (4つの条件のうち3つを満たすもの、または16文字以上): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 
-#: Model/Server.php:1042
+#: Model/Server.php:1084
 msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
 msgstr "この設定を有効化すると、ユーザーはプロフィールの編集時 (パスワードの変更を含む) に現在のパスワードを送信する必要があります。管理者は、任意のユーザーのプロフィールを変更するときに確認が必要になります。 攻撃者が、永続性を確保するために、侵害されたユーザーのパスワードを変更しようとする可能性を緩和することができますが、しかし、この機能を有効化するとユーザーにっとって非常に迷惑になります。"
 
-#: Model/Server.php:1051
+#: Model/Server.php:1093
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr "この設定を有効にすると、ソフト削除時にアトリビュートの内容がサニタイズされます"
 
-#: Model/Server.php:1060
+#: Model/Server.php:1102
 msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
 msgstr "この設定を有効化すると、現行のインスタンスのサイト管理者以外のユーザーは組織インデックスを表示できなくなります。 ユーザーは、イベント、提案、イベント履歴のログエントリーなどを経由して、データを生成した組織を引き続き見ることができることに注意してください。"
 
-#: Model/Server.php:1069
+#: Model/Server.php:1111
 msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
 msgstr "名前付きの url パラメーター\"apikey\"を経由して API キーを渡すことができます。これを有効化しないことを強くお勧めしますが、authorization ヘッダーを渡すことができない厄介なレガシーツールがある場合、これはワークアラウンドとして機能します。繰り返しになりますが、最後の手段としてこれを使用してください。"
 
-#: Model/Server.php:1071
+#: Model/Server.php:1113
 msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
 msgstr "URL パラメーターを使用した API キーの受け渡しを有効にしました。 これは非推奨です。本当にAPI キーをログ上に露出させたいですか?..."
 
-#: Model/Server.php:1081
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr "ブルートフォースの保護を開始する前に、ユーザーがログインに失敗できるトライ回数。"
 
-#: Model/Server.php:1089
+#: Model/Server.php:1149
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr "許可されたログイン試行回数を使い果たした場合に、ユーザーがロックアウトされる期間の長さ (秒)。"
 
-#: Model/Server.php:1100
+#: Model/Server.php:1160
 msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
 msgstr "x 個の要求の後でセッションを自動的に再生成するには、true に設定します。これにより、ユーザーの認証が解除され、一般的には不満を感じる可能性があります。このため、セッションを再生成する必要がある場合にのみ有効にしてください。 (非推奨)"
 
-#: Model/Server.php:1108
+#: Model/Server.php:1168
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr "true に設定すると、各リクエストのユーザーエージェント文字列をチェックします。 これにより、時たまログアウトすることがあります (非推奨)。"
 
-#: Model/Server.php:1116
+#: Model/Server.php:1176
 msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
 msgstr "MISP が使用するセッションのタイプ。 デフォルトの設定は php です。これは、セッションデータ用に php.ini で設定されたセッション設定を使用します (サポートされているオプション: php、database)。 推奨されるオプションは php であり、php.ini 経由で redis セッションを使用するように PHP を設定します。 \"session.save_handler = redis\" と \" \"session.save_path = 'tcp://localhost:6379'\" を追加してください (後者を redis コネクションに置き換えてください)。 "
 
-#: Model/Server.php:1125
-msgid "The timeout duration of sessions (in MINUTES)."
-msgstr "セッションのタイムアウト時間 (分単位)。"
+#: Model/Server.php:1185
+msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
+msgstr ""
 
-#: Model/Server.php:1133
+#: Model/Server.php:1193
 msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
 msgstr "クッキーの有効期限 (MINUTES 単位)。 セッションタイムアウトは頻繁にリフレッシュされますが、クッキーはリフレッシュされません。 一般に、timeout よりもずっと大きい cookie_timeout を持つことをお勧めします。"
 
-#: Model/Server.php:1144
+#: Model/Server.php:1204
 msgid "The default policy action for the values added to the RPZ."
 msgstr "RPZ に追加された値のデフォルトのポリシーアクション。"
 
-#: Model/Server.php:1153
+#: Model/Server.php:1213
 msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
 msgstr "walled garden 設定がエクスポート用に選択されている場合、RPZ エクスポートにはデフォルトの walled garden が使用されます。"
 
-#: Model/Server.php:1161
+#: Model/Server.php:1221
 msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
 msgstr "ゾーンファイルのSOA 部分のシリアル。 (数値で、ベストプラクティスは yyyymmddrr です。rr はファイルの2桁のサブリビジョンです。$date は現在の yyyymmdd に自動的に変換されるので、 $date00 は有効な設定になります)。"
 
-#: Model/Server.php:1169
+#: Model/Server.php:1229
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "ゾーンファイルの SOA 部分で指定された refresh。 (秒単位、または 15分 などの短期間)"
 
-#: Model/Server.php:1177
+#: Model/Server.php:1237
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "ゾーンファイルの SOA 部分で指定された retry。 (秒単位、または 15分 などの短期間)"
 
-#: Model/Server.php:1185
+#: Model/Server.php:1245
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "ゾーンファイルの SOA 部分で指定された expiry。 (秒単位、または 15分 などの短期間)"
 
-#: Model/Server.php:1193
+#: Model/Server.php:1253
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "ゾーンファイルの SOA 部分で指定された最小の TTL。 (秒単位、または 15分 などの短期間)"
 
-#: Model/Server.php:1201
+#: Model/Server.php:1261
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr "ゾーンファイルの TTL。 (秒単位、または15分などの短期間)"
 
-#: Model/Server.php:1217
+#: Model/Server.php:1277
 msgid "Alternate nameserver"
 msgstr "代替ネームサーバー"
 
-#: Model/Server.php:1225
+#: Model/Server.php:1285
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr "ゾーンファイルの SOA 部分で指定されたEメールアドレス。"
 
-#: Model/Server.php:1233
+#: Model/Server.php:1293
 msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
 msgstr "MISP の pub/sub 機能を有効化または無効化します。プラグインが動作するための要件をインストールしていることを確認してください。 詳細については、インストール手順を参照してください。"
 
-#: Model/Server.php:1242
+#: Model/Server.php:1302
 msgid "The port that the pub/sub feature will use."
 msgstr "pub/sub 機能が使用するポート。"
 
-#: Model/Server.php:1251
+#: Model/Server.php:1311
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr "MISP に使用される Redis db のロケーションと、公開するデータをキューに入れる Python PUB スクリプト。"
 
-#: Model/Server.php:1260
+#: Model/Server.php:1320
 msgid "The port that Redis is listening on."
 msgstr "Redis がリッスンしているポート。"
 
-#: Model/Server.php:1269
+#: Model/Server.php:1329
 msgid "The password, if set for Redis."
 msgstr "パスワード、Redis に設定されている場合。"
 
-#: Model/Server.php:1278
+#: Model/Server.php:1338
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr "pub/sub 機能のメッセージをキューに入れるために使用されるデータベース。"
 
-#: Model/Server.php:1287
+#: Model/Server.php:1347
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr "pub/sub 機能のメッセージをキューに入れるために使用されるネームスペース。"
 
-#: Model/Server.php:1296
+#: Model/Server.php:1356
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr "マルウェアサンプル/添付ファイルを base64 でエンコードしたペイロードを出力に含めるには、この設定を有効化します。"
 
-#: Model/Server.php:1304
+#: Model/Server.php:1364
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr "イベントの作成/編集/削除の公開を有効化または無効化します。"
 
-#: Model/Server.php:1312
+#: Model/Server.php:1372
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr "オブジェクトの作成/編集/削除の公開を有効化または無効化します。"
 
-#: Model/Server.php:1320
+#: Model/Server.php:1380
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr "オブジェクト参照の作成/削除の公開を有効化または無効化します。"
 
-#: Model/Server.php:1328
+#: Model/Server.php:1388
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr "アトリビュートの作成/編集/ソフト削除の公開を有効化または無効化します。"
 
-#: Model/Server.php:1336
+#: Model/Server.php:1396
 msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr "タグの作成/編集/削除及び、さまざまな MISP 要素にアタッチ/タグ付けされているタグの公開を有効化または無効化します。"
 
-#: Model/Server.php:1344
+#: Model/Server.php:1404
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr "新しいサイティングの ZMW pubsub フィードへの公開を有効化または無効化します。"
 
-#: Model/Server.php:1352
+#: Model/Server.php:1412
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr "新しい/変更されたユーザを ZMQ pubsub フィードに公開することを有効化または無効化します。"
 
-#: Model/Server.php:1360
+#: Model/Server.php:1420
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr "新しい/変更された組織を ZMQ pubsub フィードに公開することを有効化または無効化します。"
 
-#: Model/Server.php:1368
+#: Model/Server.php:1428
 msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr "ログエントリーを ZMQ pubsub フィードに公開することを有効化または無効化します。ロギングの設定によっては、かなり冗長になることに注意してください。"
 
-#: Model/Server.php:1376
+#: Model/Server.php:1436
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr "ElasticSearch インスタンスへのロギングを有効化"
 
-#: Model/Server.php:1384
-msgid "The URL(s) at which to access ElasticSearch - comma seperate if you want to have more than one."
-msgstr "ElasticSearch にアクセスする URL(s) - 複数の URL を持つ場合はカンマで区切ります。"
+#: Model/Server.php:1444
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
+msgstr ""
 
-#: Model/Server.php:1392
+#: Model/Server.php:1452
 msgid "The index in which to place logs"
 msgstr "ログを配置するインデックス"
 
-#: Model/Server.php:1400
+#: Model/Server.php:1460
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr "マルウェアサンプルをディスクではなく S3 にアップロードすることを有効化または無効化します (警告：まず amazon から許可を得てください)。"
 
-#: Model/Server.php:1408
+#: Model/Server.php:1468
 msgid "Bucket name to upload to"
 msgstr "アップロード先のバケット名"
 
-#: Model/Server.php:1416
+#: Model/Server.php:1476
 msgid "Region in which your S3 bucket resides"
 msgstr "S3 バケットが存在するリージョン"
 
-#: Model/Server.php:1424
+#: Model/Server.php:1484
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr "サンプルをアップロードする際に使用する AWS シークレットキー (警告: EC2 IAM のロールを可能な限り使用することを強く推奨します)"
 
-#: Model/Server.php:1432
+#: Model/Server.php:1492
 msgid "AWS secret key to use when uploading samples"
 msgstr "サンプルをアップロードする際に使用する AWS シークレットキー"
 
-#: Model/Server.php:1440
+#: Model/Server.php:1500
 msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
 msgstr "この設定は、報告されたサイティングに誰がアクセスして閲覧できるかを定義します。デフォルト設定では、イベント所有者のみです (これに加えて、誰もが自分のコントリビューションを見ることができます) 。その他のオプションとして、Sighting reporters (イベント所有者とそのイベントのサイティングデータを提供した者) と Everyone (イベント / アトリビュートにアクセス可能な者すべて) があります。"
 
-#: Model/Server.php:1449
+#: Model/Server.php:1509
 msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
 msgstr "サイティングの匿名化を有効化すると、サイティングを報告した組織を表示するのではなく、単にすべてのサイティングを集計します。 ユーザーは、自分の組織が送信したサイティング回数と他の組織のサイティング回数を知ることができます"
 
-#: Model/Server.php:1457
+#: Model/Server.php:1517
 msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
 msgstr "グラフを生成する際にサイティングを考慮する範囲を設定します。 例えば、7年前の sighted_date でのサイティングはもはや関連性がないかもしれません。 設定は日数で行われ、デフォルトは365日です。"
 
-#: Model/Server.php:1465
+#: Model/Server.php:1525
 msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
 msgstr "外部ツールを使用して認証を処理し、カスタムヘッダーを使用して MISP で認証する場合は、この機能を有効化します。"
 
-#: Model/Server.php:1475
+#: Model/Server.php:1535
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr "MISPがここで待ち受けるヘッダーを設定します。 空のままにすると、デフォルトの Authorization ヘッダーになります。"
 
-#: Model/Server.php:1484
+#: Model/Server.php:1544
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr "認証ヘッダーにヘッダーのネームスペースを使用する - デフォルト設定では有効"
 
-#: Model/Server.php:1493
+#: Model/Server.php:1553
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr "認証ヘッダーのデフォルトのネームスペース - デフォルト設定は HTTP_"
 
-#: Model/Server.php:1502
+#: Model/Server.php:1562
 msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
 msgstr "この設定が有効な場合、認証する唯一の方法はカスタムヘッダーを使用することです。 別の方法として、ミックスモードで実行することができます。ミックスモードでは、ヘッダーを経由してユーザーをログインさせます。そうでなければ、ユーザーは通常のログインページにリダイレクトされます。"
 
-#: Model/Server.php:1511
+#: Model/Server.php:1571
 msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
 msgstr "外部ツールを使用して MISP の認証を行い、ツールの url を有効なエントリーポイントとして許可したい場合は、この項目を設定します。 "
 
-#: Model/Server.php:1520
+#: Model/Server.php:1580
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr "認証メソッドの名前。これは表面的なもので、ユーザー作成ページとログに表示されます。"
 
-#: Model/Server.php:1529
+#: Model/Server.php:1589
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr "外部認証メカニズムを使用して認証するユーザー用のログアウトボタンを無効化します。"
 
-#: Model/Server.php:1537
+#: Model/Server.php:1597
 msgid "Enable/disable the enrichment services"
 msgstr "エンリッチメント サービスの有効化/無効化"
 
-#: Model/Server.php:1545
+#: Model/Server.php:1605
 msgid "Set a timeout for the enrichment services"
 msgstr "エンリッチメント サービスのタイムアウトを設定"
 
-#: Model/Server.php:1553;1665
+#: Model/Server.php:1613;1725
 msgid "Enable/disable the import services"
 msgstr "インポートサービスの有効化/無効化"
 
-#: Model/Server.php:1561;1682
+#: Model/Server.php:1621;1742
 msgid "Set a timeout for the import services"
 msgstr "インポートサービスのタイムアウトを設定"
 
-#: Model/Server.php:1569
+#: Model/Server.php:1629
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "インポートサービスへのアクセスに使用される url。デフォルトでは、 http://127.0.0.1:6666 でアクセス可能"
 
-#: Model/Server.php:1577
+#: Model/Server.php:1637
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "インポートサービスへのアクセスに使用されるポート。デフォルトでは、 127.0.0.1:6666 でアクセス可能"
 
-#: Model/Server.php:1585
+#: Model/Server.php:1645
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "エクスポート サービスへのアクセスに使用される url。デフォルトでは、http://127.0.0.1:6666 でアクセス可能"
 
-#: Model/Server.php:1593
+#: Model/Server.php:1653
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "エクスポートサービスへのアクセスに使用されるポート。デフォルトでは、127.0.0.1:6666 でアクセス可能"
 
-#: Model/Server.php:1601
+#: Model/Server.php:1661
 msgid "Enable/disable the export services"
 msgstr "エクスポート サービスの有効化/無効化"
 
-#: Model/Server.php:1609
+#: Model/Server.php:1669
 msgid "Set a timeout for the export services"
 msgstr "エクスポート サービスのタイムアウトを設定"
 
-#: Model/Server.php:1617
+#: Model/Server.php:1677
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr "エンリッチメントモジュールから取得した情報のホバーの有効化/無効化"
 
-#: Model/Server.php:1625
+#: Model/Server.php:1685
 msgid "Set a timeout for the hover services"
 msgstr "ホバー サービスのタイムアウトを設定"
 
-#: Model/Server.php:1633
+#: Model/Server.php:1693
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr "エンリッチメントサービスへのアクセスに使用される url。デフォルトでは、 http://127.0.0.1:6666 でアクセス可能"
 
-#: Model/Server.php:1641
+#: Model/Server.php:1701
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr "エンリッチメントサービスへのアクセスに使用されるポート。デフォルトでは、 127.0.0.1:6666 でアクセス可能"
 
-#: Model/Server.php:1649
+#: Model/Server.php:1709
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr "Crotex へのアクセスに使用される url。デフォルトでは、http://cortex-url でアクセス可能"
 
-#: Model/Server.php:1657
+#: Model/Server.php:1717
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr "Cortex へのアクセスに使用されるポート。デフォルトでは、9000 ポート"
 
-#: Model/Server.php:1673
+#: Model/Server.php:1733
 msgid "Set an authentication key to be passed to Cortex"
 msgstr "Cortex に受け渡される認証キーを設定"
 
-#: Model/Server.php:1690
+#: Model/Server.php:1750
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr "SSL 検証を無効にするには、false に設定します。これは推奨されません。"
 
-#: Model/Server.php:1699
+#: Model/Server.php:1759
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr "証明書の検証時にホスト名の一致エラーを無視する場合、false に設定します。"
 
-#: Model/Server.php:1708
+#: Model/Server.php:1768
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr "自己署名証明書を受け入れるには、true に設定します。 これには、Cortex_ssl_verify_peer を有効化する必要があります。"
 
-#: Model/Server.php:1717
+#: Model/Server.php:1777
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr "SSL 証明書の検証に使用する Certificate Authority ファイルの絶対パスを設定します。"
 
-#: Model/Server.php:1726
+#: Model/Server.php:1786
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr "カスタム認証ユーザーに、パスワードをリセットするための認証システムの外部 URL を提供します。"
 
-#: Model/Server.php:1735
+#: Model/Server.php:1795
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr "使用中の認証システムを使用してログアウトするカスタムログアウト URL をユーザに提供します。"
 
-#: Model/Server.php:1745
+#: Model/Server.php:1805
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr "インスタンスのデバッグレベル、プロダクションのインスタンスでは常に 0 を使用します。"
 
-#: Model/Server.php:1754
+#: Model/Server.php:1814
 msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
 msgstr "サイト管理者用のインスタンスのデバッグレベル。 この機能により、サイト管理者は、他のユーザーに公開することなく、動作中のインスタンスでデバッグモードを実行できます。 debug と site_admin_debug の最も冗長なオプションは、サイト管理者に使用されます。"
 
-#: Model/Server.php:2401
+#: Model/Server.php:1947
+msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/Server.php:2054
+msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+msgstr "権限がありません。認証キーが無効であるか、もしくは同期ユーザーがリモートサーバーで有効な認証権限を持っていないためです。これ以外の理由としては、同期サーバーの設定が誤っている可能性があります。"
+
+#: Model/Server.php:2056
+msgid "Sorry, this is not yet implemented"
+msgstr ""
+
+#: Model/Server.php:2057
+msgid "Something went wrong while trying to pull"
+msgstr ""
+
+#: Model/Server.php:2069;2071
+msgid "Unknown issue."
+msgstr ""
+
+#: Model/Server.php:2535
 msgid "Enable or disable the %s module."
 msgstr "%s モジュールを有効化または無効化"
 
-#: Model/Server.php:2404
+#: Model/Server.php:2538
 msgid "Restrict the %s module to the given organisation."
 msgstr "%s モジュールを指定された組織に制限する。"
 
-#: Model/Server.php:2412
+#: Model/Server.php:2546
 msgid "Set this required module specific setting."
 msgstr "この必須モジュールに固有の設定を設定します。"
 
-#: Model/Server.php:2527
+#: Model/Server.php:2661
 msgid "Value not set."
 msgstr "値が設定されていません。"
 
-#: Model/Server.php:3130
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
 msgid "Organisation logos"
 msgstr "組織のロゴ"
 
-#: Model/Server.php:3131
+#: Model/Server.php:3476
 msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
 msgstr "イベントインデックス、イベントビュー、ディスカッション、提案などで使用される組織のロゴ。ファイル名が org.png フォーマットであることを確認してください。org はケースセンシティブな組織名です。"
 
-#: Model/Server.php:3133
+#: Model/Server.php:3478
 msgid "48x48 pixel .png files"
 msgstr "48x48 ピクセルの .png ファイル"
 
-#: Model/Server.php:3136;3151
+#: Model/Server.php:3481;3496
 msgid "Filename must be in the following format: *.png"
 msgstr "ファイル名の形式は次のとおりです: *.png"
 
-#: Model/Server.php:3140
+#: Model/Server.php:3485
 msgid "Additional image files"
 msgstr "追加の画像ファイル"
 
-#: Model/Server.php:3141
+#: Model/Server.php:3486
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr "このディレクトリにアップロードされた画像ファイルは、ログインページのロゴなど、さまざまな用途に使用されます。"
 
-#: Model/Server.php:3148
+#: Model/Server.php:3493
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr "インラインで提供する場合は text/html、ダウンロードで提供する場合は利用規約を伝えるもの"
 
-#: Model/Server.php:3765
+#: Model/Server.php:3665
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr ""
+
+#: Model/Server.php:4115
 msgid "Removing a dead worker."
 msgstr "死亡したワーカーを削除します。"
 
-#: Model/Server.php:3766
+#: Model/Server.php:4116
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr "死亡したワーカーのデータを削除します。ワーカーのタイプは %s で、pid は %s です"
 
-#: Model/Server.php:3770
+#: Model/Server.php:4120
 msgid "Stopping a worker."
 msgstr "ワーカーを停止しています。"
 
-#: Model/Server.php:3771
+#: Model/Server.php:4121
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr "ワーカーを停止します。ワーカーのタイプは %s で、pidは %s です"
 
@@ -2029,7 +2311,7 @@ msgstr "以下のアイテムと依存関係があります。"
 
 #: View/Attributes/add.ctp:7
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "アトリビュートを追加"
@@ -2074,7 +2356,7 @@ msgstr "タイプ "
 #: View/Attributes/add.ctp:36
 #: View/Attributes/add_attachment.ctp:24
 #: View/Attributes/edit.ctp:24
-#: View/Events/add.ctp:24
+#: View/Events/add.ctp:20
 msgid "Distribution "
 msgstr "ディストリビューション "
 
@@ -2082,7 +2364,7 @@ msgstr "ディストリビューション "
 #: View/Attributes/add_attachment.ctp:33
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
-#: View/Events/add.ctp:34
+#: View/Events/add.ctp:30
 #: View/Events/edit.ctp:26
 #: View/Feeds/add.ctp:176
 #: View/Feeds/edit.ctp:172
@@ -2109,23 +2391,24 @@ msgstr "コンテクスチュアル コメント"
 msgid "for Intrusion Detection System"
 msgstr "侵入検知システム用"
 
-#: View/Attributes/add.ctp:87
+#: View/Attributes/add.ctp:91
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_mitre_attack_matrix.ctp:14;113
+#: View/Elements/view_galaxy_matrix.ctp:76;199
 #: View/Events/contact.ctp:29
 #: View/Events/edit.ctp:59
 #: View/Events/free_text_import.ctp:27
 #: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:78
+#: View/ObjectReferences/ajax/add.ctp:130
 #: View/Objects/add.ctp:147
 #: View/Objects/revise_object.ctp:85
 #: View/Organisations/admin_add.ctp:49
 #: View/Organisations/admin_edit.ctp:60
-#: View/Servers/add.ctp:126
-#: View/Servers/edit.ctp:167
-#: View/SharingGroups/add.ctp:75
+#: View/Servers/add.ctp:115
+#: View/Servers/edit.ctp:162
+#: View/SharingGroups/add.ctp:115
+#: View/TagCollections/add.ctp:21
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
 #: View/TemplateElements/ajax/template_element_add_file.ctp:67
 #: View/TemplateElements/ajax/template_element_add_text.ctp:29
@@ -2134,7 +2417,7 @@ msgstr "侵入検知システム用"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/Users/admin_add.ctp:97
 #: View/Users/admin_edit.ctp:91
-#: View/Users/admin_email.ctp:51
+#: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
 #: View/Users/change_pw.ctp:23
 #: View/Users/edit.ctp:41
@@ -2142,14 +2425,17 @@ msgstr "侵入検知システム用"
 msgid "Submit"
 msgstr "送信"
 
-#: View/Attributes/add.ctp:88
+#: View/Attributes/add.ctp:92
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:62
+#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/exportSearch.ctp:32
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Elements/eventattributecreation.ctp:89
-#: View/Elements/view_mitre_attack_matrix.ctp:114
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/view_galaxy_matrix.ctp:200
 #: View/Elements/serverRuleElements/pull.ctp:70
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2158,21 +2444,18 @@ msgstr "送信"
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/ajax/enrich_event.ctp:21
+#: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:15
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/exportChoice.ctp:51
 #: View/Events/ajax/importChoice.ctp:12
 #: View/Events/ajax/quick_edit.ctp:6
-#: View/Galaxies/ajax/cluster_choice.ctp:32
-#: View/Galaxies/ajax/galaxy_choice.ctp:22
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:15
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
-#: View/ObjectReferences/ajax/add.ctp:82
+#: View/ObjectReferences/ajax/add.ctp:134
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/ObjectTemplates/ajax/object_choice.ctp:10
 #: View/Objects/add.ctp:153
 #: View/Objects/revise_object.ctp:87
 #: View/Objects/ajax/delete.ctp:24
@@ -2187,11 +2470,12 @@ msgstr "送信"
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
 #: View/Sightings/ajax/advanced.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
-#: View/Tags/ajax/select_tag.ctp:32
-#: View/Tags/ajax/taxonomy_choice.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:6
 #: View/TemplateElements/ajax/template_element_add_file.ctp:73
@@ -2201,6 +2485,7 @@ msgstr "送信"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:35
 #: View/Templates/ajax/template_choices.ctp:15
 #: View/Users/admin_filter_user_index.ctp:107
+#: View/Users/ajax/emailConfirmTemplate.ctp:14
 #: View/Users/ajax/fetchpgpkey.ctp:24
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
@@ -2239,8 +2524,6 @@ msgstr "イベントID"
 #: View/Elements/Users/userIndexTable.ctp:4
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_view.ctp:14
-#: View/Users/view.ctp:14
 msgid "Org"
 msgstr "組織"
 
@@ -2255,7 +2538,7 @@ msgid "Event date"
 msgstr "イベント日付"
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Event graph"
 msgstr "イベント グラフ"
 
@@ -2283,12 +2566,12 @@ msgstr "全ての新しいアトリビュートを to IDS としてマークす
 
 #: View/Attributes/attribute_replace.ctp:26
 #: View/Noticelists/view.ctp:36
-#: View/Warninglists/view.ctp:54
+#: View/Warninglists/view.ctp:35
 msgid "Values"
 msgstr "値"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:75
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:46
@@ -2322,7 +2605,7 @@ msgstr "失敗したコンポジットはありません"
 msgid "disabled"
 msgstr "無効"
 
-#: View/Attributes/edit.ctp:64
+#: View/Attributes/edit.ctp:68
 #: View/ShadowAttributes/add.ctp:55
 #: View/ShadowAttributes/edit.ctp:45;54
 msgid "Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this."
@@ -2330,7 +2613,7 @@ msgstr "警告: 機密性のあるデータを共有しようとしています
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -2338,10 +2621,6 @@ msgstr "警告: 機密性のあるデータを共有しようとしています
 msgid "Attributes"
 msgstr "アトリビュート"
 
-#: View/Attributes/index.ctp:7
-msgid "Results for all attributes"
-msgstr "すべてのアトリビュートの結果"
-
 #: View/Attributes/index.ctp:8
 msgid " with the value containing "
 msgstr " 次の値を含んでいる "
@@ -2354,57 +2633,67 @@ msgstr " 次のタグ付けがされている "
 msgid " from the events "
 msgstr " 次のイベントに含まれている "
 
-#: View/Attributes/index.ctp:12
-msgid " of category "
-msgstr " 次のカテゴリー "
+#: View/Attributes/index.ctp:11
+msgid " carrying the tag(s) "
+msgstr ""
 
-#: View/Attributes/index.ctp:13
+#: View/Attributes/index.ctp:12
 msgid " of type "
 msgstr " 次のタイプ "
 
-#: View/Attributes/index.ctp:14
-msgid " created by the organisation "
-msgstr " created by the organisation "
+#: View/Attributes/index.ctp:13
+msgid " of category "
+msgstr " 次のカテゴリー "
 
-#: View/Attributes/index.ctp:28;173
-#: View/Elements/eventattribute.ctp:60;258
+#: View/Attributes/index.ctp:14
+msgid " created by organisation "
+msgstr ""
+
+#: View/Attributes/index.ctp:26
+msgid "Results for all attributes"
+msgstr "すべてのアトリビュートの結果"
+
+#: View/Attributes/index.ctp:39;132
+#: View/Elements/eventattribute.ctp:60;229
 #: View/Elements/eventdiscussion.ctp:15;126
+#: View/Elements/generic_table.ctp:16
+#: View/Elements/generic_table_row.ctp:16
 #: View/Elements/Feeds/eventattribute.ctp:20;86
 #: View/Elements/Servers/eventattribute.ctp:20;86
 #: View/EventBlacklists/index.ctp:13;54
-#: View/Events/index.ctp:12;89
+#: View/Events/index.ctp:12;115
 #: View/Events/proposal_event_index.ctp:12;95
 #: View/Events/ajax/index.ctp:13;39
 #: View/Feeds/freetext_index.ctp:22;86
-#: View/Feeds/index.ctp:20;230
-#: View/Feeds/preview_index.ctp:14;82
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
 #: View/Galaxies/index.ctp:13;53
-#: View/GalaxyClusters/ajax/index.ctp:11;96
+#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:33;162
-#: View/Logs/admin_index.ctp:37;111
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
 #: View/Logs/event_index.ctp:17;61
 #: View/News/index.ctp:39
 #: View/Noticelists/index.ctp:13;83
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
-#: View/ObjectTemplates/index.ctp:13;126
+#: View/ObjectTemplates/index.ctp:13;137
 #: View/OrgBlacklists/index.ctp:13;52
-#: View/Organisations/index.ctp:42;138
+#: View/Organisations/index.ctp:42;159
 #: View/Regexp/admin_index.ctp:13;51
 #: View/Regexp/index.ctp:13;45
 #: View/Roles/admin_index.ctp:13;82
 #: View/Roles/index.ctp:13;55
-#: View/Servers/index.ctp:13;117
-#: View/Servers/preview_index.ctp:15;164
-#: View/ShadowAttributes/index.ctp:12;108
-#: View/SharingGroups/index.ctp:13;86
+#: View/Servers/index.ctp:13;156
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;63
-#: View/Taxonomies/view.ctp:53;169
+#: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:12;56
+#: View/Users/admin_index.ctp:12;86
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -2412,45 +2701,47 @@ msgstr " created by the organisation "
 msgid "previous"
 msgstr "前へ"
 
-#: View/Attributes/index.ctp:30;175
-#: View/Elements/eventattribute.ctp:62;260
+#: View/Attributes/index.ctp:41;134
+#: View/Elements/eventattribute.ctp:62;231
 #: View/Elements/eventdiscussion.ctp:17;128
+#: View/Elements/generic_table.ctp:18
+#: View/Elements/generic_table_row.ctp:18
 #: View/Elements/Feeds/eventattribute.ctp:22;88
 #: View/Elements/Servers/eventattribute.ctp:22;88
 #: View/EventBlacklists/index.ctp:15;56
-#: View/Events/index.ctp:14;91
+#: View/Events/index.ctp:14;117
 #: View/Events/proposal_event_index.ctp:14;97
 #: View/Events/ajax/index.ctp:15;41
 #: View/Feeds/freetext_index.ctp:24;88
-#: View/Feeds/index.ctp:22;232
-#: View/Feeds/preview_index.ctp:16;84
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
 #: View/Galaxies/index.ctp:15;55
-#: View/GalaxyClusters/ajax/index.ctp:13;98
+#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:35;164
-#: View/Logs/admin_index.ctp:39;113
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
 #: View/Logs/event_index.ctp:19;63
 #: View/News/index.ctp:41
 #: View/Noticelists/index.ctp:15;85
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
-#: View/ObjectTemplates/index.ctp:15;128
+#: View/ObjectTemplates/index.ctp:15;139
 #: View/OrgBlacklists/index.ctp:15;54
-#: View/Organisations/index.ctp:44;140
+#: View/Organisations/index.ctp:44;161
 #: View/Regexp/admin_index.ctp:15;53
 #: View/Regexp/index.ctp:15;47
 #: View/Roles/admin_index.ctp:15;84
 #: View/Roles/index.ctp:15;57
-#: View/Servers/index.ctp:15;119
-#: View/Servers/preview_index.ctp:17;166
-#: View/ShadowAttributes/index.ctp:14;110
-#: View/SharingGroups/index.ctp:15;88
+#: View/Servers/index.ctp:15;158
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;65
-#: View/Taxonomies/view.ctp:55;171
+#: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:14;58
+#: View/Users/admin_index.ctp:14;88
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -2458,66 +2749,144 @@ msgstr "前へ"
 msgid "next"
 msgstr "次へ"
 
-#: View/Attributes/index.ctp:148
-msgid "Are you sure you want to delete this attribute?"
-msgstr "本当にこのアトリビュートを削除しますか?"
+#: View/Attributes/index.ctp:53
+#: View/Elements/eventattribute.ctp:152
+#: View/Elements/Events/eventIndexTable.ctp:37
+#: View/Elements/Feeds/eventattribute.ctp:45
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/view.ctp:117
+#: View/Feeds/preview_event.ctp:16
+#: View/Noticelists/view.ctp:43
+#: View/Pages/doc/using_the_system.ctp:164;207;318
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
+#: View/Tags/index.ctp:10
+#: View/Templates/add.ctp:12
+#: View/Templates/edit.ctp:12
+#: View/Templates/view.ctp:19
+msgid "Tags"
+msgstr "タグ"
 
-#: View/Attributes/index.ctp:151
-msgid "Propose an edit"
-msgstr "変更を提案する"
+#: View/Attributes/index.ctp:54
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/Galaxies/index.ctp:2
+msgid "Galaxies"
+msgstr "ギャラクシー"
 
-#: View/Attributes/index.ctp:155
-#: View/Elements/Events/eventIndexTable.ctp:82;86;229
-#: View/Elements/Users/userIndexTable.ctp:94
-#: View/Elements/dashboard/dashboard_events.ctp:4;5
-#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
-#: View/Events/proposal_event_index.ctp:45;49
-#: View/Feeds/preview_index.ctp:66
-#: View/Noticelists/index.ctp:66
-#: View/ObjectTemplates/index.ctp:104
-#: View/Organisations/index.ctp:122
-#: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/preview_index.ctp:148
-#: View/Taxonomies/index.ctp:47
-#: View/Warninglists/index.ctp:60
-msgid "View"
-msgstr "表示"
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:161
+msgid "Correlate"
+msgstr "相関"
 
-#: View/Attributes/index.ctp:166
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Events/view.ctp:314
+#: View/Feeds/preview_event.ctp:73
+#: View/Pages/doc/using_the_system.ctp:235
+#: View/Servers/preview_event.ctp:95
+msgid "Related Events"
+msgstr "関連イベント"
+
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:163
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+msgid "Feed hits"
+msgstr "フィードヒット"
+
+#: View/Attributes/index.ctp:61
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
+msgid "Sightings"
+msgstr "サイティング"
+
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
+#: View/Tags/index.ctp:73
+msgid "Activity"
+msgstr "アクティビティ"
+
+#: View/Attributes/index.ctp:63
+#: View/Elements/eventattribute.ctp:168
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/healthElements/files.ctp:33
+#: View/Elements/healthElements/workers.ctp:60
+#: View/Elements/templateElements/templateRowAttribute.ctp:94
+#: View/Elements/templateElements/templateRowFile.ctp:71
+#: View/Elements/templateElements/templateRowText.ctp:28
+#: View/EventBlacklists/index.ctp:27
+#: View/Events/export.ctp:31
+#: View/Events/resolved_attributes.ctp:53
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:51
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:66
+#: View/OrgBlacklists/index.ctp:26
+#: View/Organisations/index.ctp:102
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:25
+#: View/Roles/admin_index.ctp:35
+#: View/Servers/index.ctp:37
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:27
+#: View/Templates/index.ctp:27
+#: View/Threads/index.ctp:28
+#: View/Warninglists/index.ctp:38
+#: View/Whitelists/admin_index.ctp:24
+msgid "Actions"
+msgstr "アクション"
+
+#: View/Attributes/index.ctp:125
 #: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
 #: View/EventBlacklists/index.ctp:47
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:223
-#: View/Feeds/preview_index.ctp:74
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
 #: View/Galaxies/index.ctp:46
-#: View/GalaxyClusters/ajax/index.ctp:90
+#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:155
-#: View/Logs/admin_index.ctp:104
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
 #: View/Logs/event_index.ctp:54
 #: View/News/index.ctp:33
 #: View/Noticelists/index.ctp:76
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:66
-#: View/ObjectTemplates/index.ctp:119
+#: View/ObjectTemplates/index.ctp:130
 #: View/OrgBlacklists/index.ctp:45
-#: View/Organisations/index.ctp:131
+#: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
 #: View/Roles/admin_index.ctp:75
 #: View/Roles/index.ctp:48
-#: View/Servers/index.ctp:110
-#: View/Servers/preview_index.ctp:156
-#: View/ShadowAttributes/index.ctp:101
-#: View/SharingGroups/index.ctp:79
+#: View/Servers/index.ctp:149
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:56
-#: View/Taxonomies/view.ctp:162
+#: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:49
+#: View/Users/admin_index.ctp:79
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -2564,26 +2933,22 @@ msgid "Containing the following expressions"
 msgstr "次の表現を含む"
 
 #: View/Attributes/search.ctp:11
-msgid "Being an attribute matching the following tags"
-msgstr "次のタグに一致するアトリビュート"
+msgid "Having tag or being an attribute of an event having the tag"
+msgstr ""
 
 #: View/Attributes/search.ctp:12
 msgid "Being attributes of the following event IDs, event UUIDs or attribute UUIDs"
 msgstr "次のイベント ID、イベント UUID またはアトリビュート UUID を持つアトリビュート"
 
-#: View/Attributes/search.ctp:13
-msgid "Being an attribute of an event matching the following tags"
-msgstr "次のタグに一致するイベントのアトリビュート"
-
-#: View/Attributes/search.ctp:20
+#: View/Attributes/search.ctp:15
 msgid "From the following organisation(s)"
 msgstr "次の組織から入手"
 
-#: View/Attributes/search.ctp:36
-msgid "Only find IOCs to use in IDS"
-msgstr "IDS で使用可能な IOC のみを探す"
+#: View/Attributes/search.ctp:29
+msgid "Only find IOCs flagged as to_ids"
+msgstr ""
 
-#: View/Attributes/search.ctp:40
+#: View/Attributes/search.ctp:33
 msgid "Alternate Search Result (Events)"
 msgstr "別の検索結果 (イベント)"
 
@@ -2601,26 +2966,26 @@ msgstr "本当にアトリビュート #%s を削除しますか? アトリビ
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90
-#: View/Elements/galaxyQuickView.ctp:23
-#: View/Elements/side_menu.ctp:351
-#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/eventIndexTable.ctp:229
 #: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:30
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Roles/admin_index.ctp:67
-#: View/Servers/index.ctp:99
+#: View/Servers/index.ctp:138
 #: View/Tags/index.ctp:125
 msgid "Delete"
 msgstr "削除"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
@@ -2634,34 +2999,36 @@ msgstr "削除"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:56
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:168
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
 #: View/Events/ajax/handleSelected.ctp:17
 #: View/Events/ajax/toggle_correlation.ctp:20
 #: View/Feeds/preview_event.ctp:56
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:79
 #: View/Servers/ajax/update.ctp:11
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
 #: View/Templates/view.ctp:41
-#: View/Users/admin_view.ctp:32;37;104;114;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:27
 msgid "Yes"
 msgstr "Yes"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:21
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
@@ -2675,29 +3042,30 @@ msgstr "Yes"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:58;176
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:166
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/handleSelected.ctp:22
 #: View/Events/ajax/toggle_correlation.ctp:25
 #: View/Feeds/preview_event.ctp:61;66
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:89
 #: View/Servers/ajax/update.ctp:16
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
 #: View/Templates/view.ctp:42
-#: View/Users/admin_view.ctp:32;37;106;116;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
 msgid "No"
@@ -2706,7 +3074,6 @@ msgstr "No"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:5
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:5
 #: View/Attributes/ajax/attributeEditValueForm.ctp:6
 msgid "Accept change"
@@ -2715,7 +3082,6 @@ msgstr "変更を承認"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:6
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
 msgid "Discard change"
@@ -2732,7 +3098,7 @@ msgstr "現在の設定を変更しないでください"
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/view.ctp:143
+#: View/Events/view.ctp:145
 #: View/Feeds/add.ctp:167
 #: View/Feeds/edit.ctp:164
 #: View/Feeds/freetext_index.ctp:36
@@ -2754,6 +3120,50 @@ msgstr "侵入検知システム用"
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr "選択したアトリビュートのコメント項目を変更しない場合、この項目を空のままにします。"
 
+#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+msgid "Tags to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+msgid "Tags to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+msgid "Clusters to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+msgid "Clusters to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr "有効"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr "無効"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
 #: View/Attributes/ajax/attributeRestorationForm.ctp:5
 msgid "Attribute Restoration"
 msgstr "アトリビュートの復元"
@@ -2762,6 +3172,15 @@ msgstr "アトリビュートの復元"
 msgid "Are you sure you want to undelete Attribute #%s?"
 msgstr "本当にアトリビュート #%s を復旧させますか?"
 
+#: View/Attributes/ajax/exportSearch.ctp:2
+msgid "Choose the format that you wish to download the search results in"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:10;23
+#: View/Events/ajax/exportChoice.ctp:17;18;27;28
+msgid "Export as %s"
+msgstr "%s としてエクスポート"
+
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
 msgid "Remove Tag"
 msgstr "タグを削除"
@@ -2782,16 +3201,6 @@ msgstr "削除"
 msgid "Toggle Correlation %s "
 msgstr "相関 %s に切り替え "
 
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "on"
-msgstr "有効"
-
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "off"
-msgstr "無効"
-
 #: View/Attributes/ajax/toggle_correlation.ctp:11
 msgid "Re-enable the correlation for this attribute."
 msgstr "このアトリビュート用の相関を再度有効化"
@@ -2804,13 +3213,21 @@ msgstr "これにより、このアトリビュートに既に存在するすべ
 msgid "Toggle correlation for attribute"
 msgstr "アトリビュート用の相関に切り替え"
 
-#: View/Elements/ajaxAttributeTags.ctp:25
+#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Elements/ajaxTagCollectionTags.ctp:16
 #: View/Elements/ajaxTags.ctp:14
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr "タグを削除"
 
+#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Pages/doc/using_the_system.ctp:303
+#: View/Templates/add.ctp:17
+#: View/Templates/edit.ctp:17
+msgid "Add tag"
+msgstr "タグを追加"
+
 #: View/Elements/ajaxTags.ctp:17
 msgid "Remove tag %s"
 msgstr "タグを削除 %s"
@@ -2821,215 +3238,33 @@ msgstr "タグを削除 %s"
 msgid "Add a tag"
 msgstr "タグを追加"
 
-#: View/Elements/eventattribute.ctp:71;269
+#: View/Elements/eventattribute.ctp:71;240
 #: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
 #: View/Elements/Servers/eventattribute.ctp:28;31;94;97
 msgid "view all"
 msgstr "すべて表示"
 
-#: View/Elements/eventattribute.ctp:117
-#: View/Pages/doc/using_the_system.ctp:86
-msgid "Add attribute"
-msgstr "アトリビュートを追加"
-
-#: View/Elements/eventattribute.ctp:118
-msgid "Edit selected Attributes"
-msgstr "選択したアトリビュートを編集"
-
-#: View/Elements/eventattribute.ctp:119
-msgid "Tag selected Attributes"
-msgstr "選択したアトリビュートにタグ付け"
-
-#: View/Elements/eventattribute.ctp:120
-msgid "Delete selected Attributes"
-msgstr "選択したアトリビュートを削除"
-
-#: View/Elements/eventattribute.ctp:121
-msgid "Accept selected Proposals"
-msgstr "選択した提案を承認"
-
-#: View/Elements/eventattribute.ctp:122
-msgid "Discard selected Proposals"
-msgstr "選択した提案を破棄"
-
-#: View/Elements/eventattribute.ctp:123
-msgid "Sightings display for selected attributes"
-msgstr "選択したアトリビュート用のサイティング表示"
-
-#: View/Elements/eventattribute.ctp:127
-msgid "Populate using a template"
-msgstr "テンプレートを使用して追加"
-
-#: View/Elements/eventattribute.ctp:129
-msgid "Populate using the freetext import tool"
-msgstr "フリーテキストインポートツールを使用して追加"
-
-#: View/Elements/eventattribute.ctp:131
-msgid "Replace all attributes of a category/type combination within the event"
-msgstr "イベント内のカテゴリー/タイプの組み合わせのすべてのアトリビュートを置換"
-
-#: View/Elements/eventattribute.ctp:140;159
-msgid "Show all attributes"
-msgstr "すべてのアトリビュートを表示"
-
-#: View/Elements/eventattribute.ctp:144
-msgid "Only show %s related attributes"
-msgstr "%s に関連するアトリビュートのみを表示"
-
-#: View/Elements/eventattribute.ctp:148
-msgid "Only show proposals"
-msgstr "提案のみを表示"
-
-#: View/Elements/eventattribute.ctp:148
-#: View/Logs/event_index.ctp:44
-msgid "Proposal"
-msgstr "提案"
-
-#: View/Elements/eventattribute.ctp:149
-msgid "Only show correlating attributes"
-msgstr "相関するアトリビュートのみを表示"
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Only show potentially false positive attributes"
-msgstr "偽陽性の可能性があるアトリビュートのみを表示"
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Warnings"
-msgstr "警告"
-
-#: View/Elements/eventattribute.ctp:152
-msgid "Include deleted attributes"
-msgstr "削除されたアトリビュートを含める"
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show attribute context fields"
-msgstr "アトリビュートのコンテキスト項目を表示"
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show context fields"
-msgstr "コンテキスト項目を表示"
-
-#: View/Elements/eventattribute.ctp:157
-msgid "Filter on attributes value"
-msgstr "アトリビュート値をフィルター"
-
-#: View/Elements/eventattribute.ctp:159
-#: View/Events/index.ctp:41
-#: View/Servers/preview_index.ctp:42
-#: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:37
-msgid "Remove filters"
-msgstr "フィルターを削除"
-
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all"
 msgstr "すべて選択"
 
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 msgid "Select all attributes/proposals on current page"
 msgstr "現在のページ上のすべてのアトリビュート/提案を選択"
 
-#: View/Elements/eventattribute.ctp:188
-#: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/view.ctp:121
-#: View/Feeds/preview_event.ctp:16
-#: View/Noticelists/view.ctp:43
-#: View/Pages/doc/using_the_system.ctp:164;207;318
-#: View/Servers/preview_event.ctp:27
-#: View/Servers/preview_index.ctp:68
-#: View/Tags/index.ctp:10
-#: View/Templates/add.ctp:12
-#: View/Templates/edit.ctp:12
-#: View/Templates/view.ctp:19
-msgid "Tags"
-msgstr "タグ"
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
+msgstr ""
 
-#: View/Elements/eventattribute.ctp:189
-#: View/Elements/global_menu.ctp:56
-#: View/Events/view.ctp:387
-#: View/Galaxies/index.ctp:2
-msgid "Galaxies"
-msgstr "ギャラクシー"
-
-#: View/Elements/eventattribute.ctp:191
-msgid "Correlate"
-msgstr "相関"
-
-#: View/Elements/eventattribute.ctp:192
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:263
-#: View/Feeds/preview_event.ctp:73
-#: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:95
-msgid "Related Events"
-msgstr "関連イベント"
-
-#: View/Elements/eventattribute.ctp:193
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
-msgid "Feed hits"
-msgstr "フィードヒット"
-
-#: View/Elements/eventattribute.ctp:196
-#: View/Events/view.ctp:198
-msgid "Sightings"
-msgstr "サイティング"
-
-#: View/Elements/eventattribute.ctp:197
-#: View/Events/view.ctp:205
-#: View/Tags/index.ctp:73
-msgid "Activity"
-msgstr "アクティビティ"
-
-#: View/Elements/eventattribute.ctp:198
-#: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/healthElements/files.ctp:33
-#: View/Elements/healthElements/workers.ctp:55
-#: View/Elements/templateElements/templateRowAttribute.ctp:94
-#: View/Elements/templateElements/templateRowFile.ctp:71
-#: View/Elements/templateElements/templateRowText.ctp:28
-#: View/EventBlacklists/index.ctp:27
-#: View/Events/export.ctp:31
-#: View/Events/resolved_attributes.ctp:53
-#: View/Feeds/index.ctp:61
-#: View/Feeds/preview_index.ctp:38
-#: View/GalaxyClusters/ajax/index.ctp:51
-#: View/Noticelists/index.ctp:37
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:55
-#: View/OrgBlacklists/index.ctp:26
-#: View/Organisations/index.ctp:81
-#: View/Pages/doc/using_the_system.ctp:187;238;286;382
-#: View/Regexp/admin_index.ctp:25
-#: View/Roles/admin_index.ctp:35
-#: View/Servers/index.ctp:36
-#: View/Servers/preview_index.ctp:80
-#: View/SharingGroups/add.ctp:34;54
-#: View/SharingGroups/edit.ctp:34;62
-#: View/SharingGroups/index.ctp:30
-#: View/Sightings/ajax/list_sightings.ctp:11
-#: View/Tags/index.ctp:76
-#: View/Taxonomies/index.ctp:27
-#: View/Templates/index.ctp:27
-#: View/Threads/index.ctp:28
-#: View/Warninglists/index.ctp:38
-#: View/Whitelists/admin_index.ctp:24
-msgid "Actions"
-msgstr "アクション"
-
-#: View/Elements/eventattribute.ctp:238
+#: View/Elements/eventattribute.ctp:209
 msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
 "a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
 "attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
 msgstr "アトリビュートの警告: このイベントは、あなたが見えるアトリビュートを持っていません。イベントの所有者は、アトリビュートごとに特定のディストリビューションスキーマを持つことを決定し、かつ通知またはそのような制限がないアトリビューションへの潜在的なコントリビューションのためにイベントを単体で配布しました。または、所有者がアトリビュートまたは適切なディストリビューションレベルを追加するのを忘れています。間違いがあると思われる場合や、イベントのメタ情報に基づいてアトリビュートを提供できる場合は、自由に提案してください"
 
-#: View/Elements/eventattribute.ctp:242
+#: View/Elements/eventattribute.ctp:213
 msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
 msgstr "アトリビュートの警告: このイベントにアトリビュートが含まれていません。 意味のあるイベントを提供するためにイベントにアトリビュート (インジケータ、オブザーバブルまたは情報) を設定することを強くお勧めします"
 
@@ -3037,6 +3272,140 @@ msgstr "アトリビュートの警告: このイベントにアトリビュー
 msgid "Create multiple attributes one per line"
 msgstr "1行ごとに複数のアトリビュートを作成"
 
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr "すべてのアトリビュートを表示"
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr "すべて"
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr "%s に関連するアトリビュートのみを表示"
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr "提案のみを表示"
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr "提案"
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr "相関するアトリビュートのみを表示"
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr "相関"
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr "偽陽性の可能性があるアトリビュートのみを表示"
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr "警告"
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr "アトリビュートを追加"
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr "選択したアトリビュートを編集"
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr "選択したアトリビュートにタグ付け"
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr "選択したアトリビュートを削除"
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr "選択した提案を承認"
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr "選択した提案を破棄"
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr "選択したアトリビュート用のサイティング表示"
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr "テンプレートを使用して追加"
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr "フリーテキストインポートツールを使用して追加"
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr "イベント内のカテゴリー/タイプの組み合わせのすべてのアトリビュートを置換"
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr "削除されたアトリビュートを含める"
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr "アトリビュートのコンテキスト項目を表示"
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr "フィルターを削除"
+
 #: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr "日付: "
@@ -3046,14 +3415,14 @@ msgid "Deactivated user"
 msgstr "無効化されたユーザー"
 
 #: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:223
-#: View/Elements/Events/View/row_attribute.ctp:299
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/View/row_attribute.ctp:380
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/Feeds/edit.ctp:193
 #: View/OrgBlacklists/edit.ctp:22
 #: View/Pages/doc/using_the_system.ctp:191
-#: View/Servers/index.ctp:98
-#: View/Tags/edit.ctp:35
+#: View/Servers/index.ctp:137
+#: View/Tags/edit.ctp:36
 #: View/Templates/edit.ctp:49
 msgid "Edit"
 msgstr "編集"
@@ -3081,12 +3450,12 @@ msgid "Insert a link to an event - just enter the event ID between the [event][/
 msgstr "イベントへのリンクを挿入 - [event][/event] タグの間にイベント ID を入力します。"
 
 #: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:180;191
+#: View/Events/view.ctp:196;207
 #: View/Objects/orphaned_object_diagnostics.ctp:21
 #: View/Pages/doc/administration.ctp:167
 #: View/Pages/doc/using_the_system.ctp:200;279
 #: View/Posts/add.ctp:33
-#: View/ShadowAttributes/index.ctp:31
+#: View/ShadowAttributes/index.ctp:41
 msgid "Event"
 msgstr "イベント"
 
@@ -3121,9 +3490,19 @@ msgid "Code"
 msgstr "コード"
 
 #: View/Elements/eventdiscussion.ctp:156
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr "送信"
 
+#: View/Elements/flashErrorMessage.ctp:2
+msgid "Errors"
+msgstr ""
+
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Jobs/ajax/error.ctp:34
+msgid "Close"
+msgstr "閉じる"
+
 #: View/Elements/footer.ctp:5
 msgid "Keyboard shortcuts for this page"
 msgstr "このページ用のキーボードショートカット"
@@ -3135,8 +3514,8 @@ msgstr "無し"
 #: View/Elements/footer.ctp:15
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:60
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
 msgid "GnuPG key"
 msgstr "GnuPGキー"
 
@@ -3152,32 +3531,36 @@ msgstr "SMIME 証明書を見つけることができませんでした。"
 msgid "View details about this galaxy"
 msgstr "このギャラクシーの詳細を表示"
 
-#: View/Elements/galaxyQuickView.ctp:17
+#: View/Elements/galaxyQuickView.ctp:19
 #: View/Elements/galaxyQuickViewMini.ctp:69
 msgid "View details about this cluster"
 msgstr "このクラスターの詳細を表示"
 
-#: View/Elements/galaxyQuickView.ctp:18
+#: View/Elements/galaxyQuickView.ctp:20
 #: View/Elements/galaxyQuickViewMini.ctp:70
 msgid "View all events containing this cluster."
 msgstr "このクラスターを含むすべてのイベントを表示します。"
 
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
 #: View/Elements/galaxyQuickView.ctp:24
 msgid "Are you sure you want to detach %s from this event?"
 msgstr "本当にこのイベントから %s を切り離しますか?"
 
-#: View/Elements/galaxyQuickViewMini.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:74
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr "本当に %s を %s から切り離しましすか?"
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 msgid "Add new cluster"
 msgstr "新しいクラスターを追加"
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 #: View/EventBlacklists/add.ctp:35
 #: View/EventBlacklists/edit.ctp:29
-#: View/Events/add.ctp:72
+#: View/Events/add.ctp:68
 #: View/Events/filter_event_index.ctp:125
 #: View/Feeds/add.ctp:198
 #: View/Feeds/import_feeds.ctp:19
@@ -3187,113 +3570,139 @@ msgstr "新しいクラスターを追加"
 #: View/Roles/admin_add.ctp:44
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 #: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:19
 #: View/Tags/add.ctp:35
 #: View/Users/admin_filter_user_index.ctp:62
 #: View/Whitelists/admin_add.ctp:13
 msgid "Add"
 msgstr "追加"
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/side_menu.ctp:174;188
+#: View/Elements/generic_picker.ctp:205
+msgid "Due to the large number of options, no contextual information is provided."
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:273
+msgid "Nothing to pick"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:11
+#: View/Pages/doc/general.ctp:20
+msgid "Event Actions"
+msgstr "イベントアクション"
+
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr "イベントの一覧"
 
-#: View/Elements/global_menu.ctp:26
-#: View/Elements/side_menu.ctp:179;194
-#: View/Events/add.ctp:8
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
+#: View/Events/add.ctp:4
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
 msgstr "イベントを追加"
 
-#: View/Elements/global_menu.ctp:28
-#: View/Elements/side_menu.ctp:213
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr "アトリビュートの一覧"
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/side_menu.ctp:218
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr "アトリビュートを検索"
 
-#: View/Elements/global_menu.ctp:30
-#: View/Elements/side_menu.ctp:206
-#: View/Servers/rest.ctp:4
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
+#: View/Servers/rest.ctp:20
 msgid "REST client"
 msgstr "REST クライアント"
 
-#: View/Elements/global_menu.ctp:32
-#: View/Elements/side_menu.ctp:238
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "提案を表示"
 
-#: View/Elements/global_menu.ctp:35
-#: View/Elements/side_menu.ctp:446
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
+#: View/Pages/doc/general.ctp:39
+msgid "Events with proposals"
+msgstr "提案のあるイベント"
+
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "タグの一覧"
 
-#: View/Elements/global_menu.ctp:37
-#: View/Elements/side_menu.ctp:450
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
+msgid "List Tag Collections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 #: View/Tags/edit.ctp:4
 msgid "Add Tag"
 msgstr "タグを追加"
 
-#: View/Elements/global_menu.ctp:39
-#: View/Elements/side_menu.ctp:471
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 msgid "List Taxonomies"
 msgstr "タクソノミーの一覧"
 
-#: View/Elements/global_menu.ctp:41
-#: View/Elements/side_menu.ctp:485
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "テンプレートの一覧"
 
-#: View/Elements/global_menu.ctp:43
-#: View/Elements/side_menu.ctp:487
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "テンプレートを追加"
 
-#: View/Elements/global_menu.ctp:46
-#: View/Elements/side_menu.ctp:247
+#: View/Elements/global_menu.ctp:78
 #: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
 msgstr "エクスポート"
 
-#: View/Elements/global_menu.ctp:48
-#: View/Elements/side_menu.ctp:253
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
+#: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
 #: View/Pages/doc/using_the_system.ctp:15;361
 msgid "Automation"
 msgstr "自動化"
 
-#: View/Elements/global_menu.ctp:60
-#: View/Elements/side_menu.ctp:529
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 msgid "List Galaxies"
 msgstr "ギャラクシーの一覧"
 
-#: View/Elements/global_menu.ctp:67
+#: View/Elements/global_menu.ctp:101
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr "入力フィルター"
 
-#: View/Elements/global_menu.ctp:72;76
+#: View/Elements/global_menu.ctp:104;109
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -3302,7 +3711,7 @@ msgstr "入力フィルター"
 msgid "Import Regexp"
 msgstr "正規表現をインポート"
 
-#: View/Elements/global_menu.ctp:73;77
+#: View/Elements/global_menu.ctp:114;119
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -3311,82 +3720,88 @@ msgstr "正規表現をインポート"
 msgid "Signature Whitelist"
 msgstr "シグネチャーホワイトリスト"
 
-#: View/Elements/global_menu.ctp:79
-#: View/Elements/side_menu.ctp:274
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 msgid "List Warninglists"
 msgstr "警告リストの一覧"
 
-#: View/Elements/global_menu.ctp:80
-#: View/Elements/side_menu.ctp:283
+#: View/Elements/global_menu.ctp:128
 msgid "List Noticelists"
 msgstr "通告リストの一覧"
 
-#: View/Elements/global_menu.ctp:90
+#: View/Elements/global_menu.ctp:135
+#: View/Pages/doc/general.ctp:22;54
+msgid "Global Actions"
+msgstr "グローバルアクション"
+
+#: View/Elements/global_menu.ctp:139
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
 msgstr "ニュース"
 
-#: View/Elements/global_menu.ctp:91
-#: View/Elements/side_menu.ctp:311
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "マイプロフィール"
 
-#: View/Elements/global_menu.ctp:92;203
-#: View/Elements/side_menu.ctp:312
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "ダッシュボード"
 
-#: View/Elements/global_menu.ctp:96
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
-#: View/Users/statistics_data.ctp:32
+#: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr "組織"
 
-#: View/Elements/global_menu.ctp:100
-#: View/Elements/side_menu.ctp:325
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "ロールの権限"
 
-#: View/Elements/global_menu.ctp:102
-#: View/Elements/side_menu.ctp:552
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "List Object Templates"
 msgstr "オブジェクトテンプレートの一覧"
 
-#: View/Elements/global_menu.ctp:104
-#: View/Elements/side_menu.ctp:331
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Sharing Groups"
 msgstr "共有グループの一覧"
 
-#: View/Elements/global_menu.ctp:106
-#: View/Elements/side_menu.ctp:332
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
 msgid "Add Sharing Group"
 msgstr "共有グループを追加"
 
-#: View/Elements/global_menu.ctp:109
-#: View/Elements/side_menu.ctp:334
-#: View/Events/automation.ctp:42
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
+#: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
 msgstr "ユーザーガイド"
 
-#: View/Elements/global_menu.ctp:110
-#: View/Elements/side_menu.ctp:335
-#: View/Pages/doc/general.ctp:61
-#: View/Pages/doc/user_management.ctp:54
-msgid "Terms &amp; Conditions"
-msgstr "利用規約"
+#: View/Elements/global_menu.ctp:186
+msgid "Categories & Types"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:111
-#: View/Elements/side_menu.ctp:336
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -3399,30 +3814,34 @@ msgstr "利用規約"
 msgid "Statistics"
 msgstr "統計"
 
-#: View/Elements/global_menu.ctp:113
+#: View/Elements/global_menu.ctp:201
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr "ディスカッションの一覧"
 
-#: View/Elements/global_menu.ctp:114
+#: View/Elements/global_menu.ctp:205
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr "ディスカッションを開始"
 
-#: View/Elements/global_menu.ctp:125
-#: View/Elements/side_menu.ctp:354
+#: View/Elements/global_menu.ctp:212
+#: View/Pages/doc/general.ctp:23;66
+msgid "Sync Actions"
+msgstr "同期アクション"
+
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "サーバーの一覧"
 
-#: View/Elements/global_menu.ctp:127
-#: View/Elements/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
 msgid "List Feeds"
 msgstr "フィードの一覧"
 
-#: View/Elements/global_menu.ctp:136
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/administration.ctp:8
-#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
 #: View/Pages/doc/quickstart.ctp:8
@@ -3431,95 +3850,100 @@ msgstr "フィードの一覧"
 msgid "Administration"
 msgstr "管理"
 
-#: View/Elements/global_menu.ctp:140
-#: View/Elements/side_menu.ctp:376
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "ユーザーの一覧"
 
-#: View/Elements/global_menu.ctp:141
-#: View/Elements/side_menu.ctp:375
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
 msgid "Add User"
 msgstr "ユーザーを追加"
 
-#: View/Elements/global_menu.ctp:142
-#: View/Elements/side_menu.ctp:379
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr "ユーザーに連絡"
 
-#: View/Elements/global_menu.ctp:144
-#: View/Elements/side_menu.ctp:316;391
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
 msgid "List Organisations"
 msgstr "組織の一覧"
 
-#: View/Elements/global_menu.ctp:146
-#: View/Elements/side_menu.ctp:383
-msgid "Add Organisation"
-msgstr "組織を追加"
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:149
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr "ロールの一覧"
 
-#: View/Elements/global_menu.ctp:151
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
-msgstr "ロールを追加"
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-msgid "Maintenance"
-msgstr "メンテナンス"
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
+msgstr "サーバーの設定・保守"
 
-#: View/Elements/global_menu.ctp:158
-#: View/Elements/side_menu.ctp:401
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "ジョブ"
 
-#: View/Elements/global_menu.ctp:160
-#: View/Elements/side_menu.ctp:403
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
 msgstr "スケジュールされたタスク"
 
-#: View/Elements/global_menu.ctp:165
-#: View/Elements/side_menu.ctp:407
+#: View/Elements/global_menu.ctp:300
+msgid "Blacklist Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
 msgid "Manage Event Blacklists"
 msgstr "イベントのブラック リストを管理"
 
-#: View/Elements/global_menu.ctp:169
+#: View/Elements/global_menu.ctp:314
 msgid "Blacklist Organisation"
 msgstr "組織のブラックリスト"
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/side_menu.ctp:411
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
 msgid "Manage Org Blacklists"
 msgstr "組織のブラックリストの管理"
 
-#: View/Elements/global_menu.ctp:180
+#: View/Elements/global_menu.ctp:327
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr "監査"
 
-#: View/Elements/global_menu.ctp:184
-#: View/Elements/side_menu.ctp:417
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "ログの一覧"
 
-#: View/Elements/global_menu.ctp:185
-#: View/Elements/side_menu.ctp:418
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "ログを検索"
 
-#: View/Elements/global_menu.ctp:207;209
+#: View/Elements/global_menu.ctp:362;367
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr "ログアウト"
@@ -3540,407 +3964,8 @@ msgstr "ヒストグラムをトグル"
 msgid "Attributes per organization"
 msgstr "組織ごとのアトリビュート"
 
-#: View/Elements/side_menu.ctp:17;78
-msgid "Populate From Template"
-msgstr "テンプレートから追加"
-
-#: View/Elements/side_menu.ctp:24
-msgid "Freetext Import Result"
-msgstr "フリーテキスト インポートの結果"
-
-#: View/Elements/side_menu.ctp:31
-msgid "View Event"
-msgstr "イベントを表示"
-
-#: View/Elements/side_menu.ctp:36;465;540
-msgid "View Correlation Graph"
-msgstr "相関グラフを表示"
-
-#: View/Elements/side_menu.ctp:41
-msgid "View Event History"
-msgstr "イベント履歴を表示"
-
-#: View/Elements/side_menu.ctp:48
-#: View/Events/edit.ctp:8
-msgid "Edit Event"
-msgstr "イベントを編集"
-
-#: View/Elements/side_menu.ctp:50
-msgid "Delete Event"
-msgstr "イベントを削除"
-
-#: View/Elements/side_menu.ctp:50;267;298;351;371
-#: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Servers/index.ctp:99
-msgid "Are you sure you want to delete # %s?"
-msgstr "本当に # %s を削除しますか?"
-
-#: View/Elements/side_menu.ctp:61
-msgid "Add Object"
-msgstr "オブジェクトを追加"
-
-#: View/Elements/side_menu.ctp:66
-msgid "Add Attachment"
-msgstr "添付ファイルを追加"
-
-#: View/Elements/side_menu.ctp:73
-msgid "Populate from..."
-msgstr "... から追加"
-
-#: View/Elements/side_menu.ctp:86
-#: View/Events/ajax/enrich_event.ctp:2
-msgid "Enrich Event"
-msgstr "イベントをエンリッチ"
-
-#: View/Elements/side_menu.ctp:91
-msgid "Merge attributes from..."
-msgstr "... からアトリビュートを結合"
-
-#: View/Elements/side_menu.ctp:98
-msgid "Propose Attribute"
-msgstr "アトリビュートを提案"
-
-#: View/Elements/side_menu.ctp:103
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr "添付ファイルを提案"
-
-#: View/Elements/side_menu.ctp:115
-#: View/Elements/Events/eventIndexTable.ctp:218
-msgid "Publish Event"
-msgstr "イベントを公開"
-
-#: View/Elements/side_menu.ctp:123
-msgid "Publish (no email)"
-msgstr "公開 (Eメールなし)"
-
-#: View/Elements/side_menu.ctp:132
-msgid "Delegate Publishing"
-msgstr "公開を委任"
-
-#: View/Elements/side_menu.ctp:143
-#: View/EventDelegations/ajax/accept_delegation.ctp:2
-msgid "Accept Delegation Request"
-msgstr "委譲リクエストを承認"
-
-#: View/Elements/side_menu.ctp:151
-msgid "Discard Delegation Request"
-msgstr "委譲リクエストを破棄"
-
-#: View/Elements/side_menu.ctp:157
-msgid "Publish event to ZMQ"
-msgstr "ZeroMQにイベントを発行"
-
-#: View/Elements/side_menu.ctp:162
-msgid "Contact Reporter"
-msgstr "レポーターに連絡"
-
-#: View/Elements/side_menu.ctp:169
-msgid "Download as..."
-msgstr "... としてダウンロード"
-
-#: View/Elements/side_menu.ctp:201
-msgid "Import from…"
-msgstr "Import from..."
-
-#: View/Elements/side_menu.ctp:224
-msgid "Download results as JSON"
-msgstr "JSONとして結果をダウンロード"
-
-#: View/Elements/side_menu.ctp:228
-msgid "Download results as XML"
-msgstr "XMLとして結果をダウンロード"
-
-#: View/Elements/side_menu.ctp:232
-msgid "Download results as CSV"
-msgstr "CSVとして結果をダウンロード"
-
-#: View/Elements/side_menu.ctp:242
-#: View/Pages/doc/general.ctp:39
-msgid "Events with proposals"
-msgstr "提案のあるイベント"
-
-#: View/Elements/side_menu.ctp:259
-msgid "List Regexp"
-msgstr "正規表現の一覧"
-
-#: View/Elements/side_menu.ctp:261
-msgid "New Regexp"
-msgstr "新しい正規表現"
-
-#: View/Elements/side_menu.ctp:262
-msgid "Perform on existing"
-msgstr "存在するものを実行"
-
-#: View/Elements/side_menu.ctp:266
-msgid "Edit Regexp"
-msgstr "正規表現を編集"
-
-#: View/Elements/side_menu.ctp:267
-msgid "Delete Regexp"
-msgstr "正規表現を削除"
-
-#: View/Elements/side_menu.ctp:273
-msgid "View Warninglist"
-msgstr "警告リストを表示"
-
-#: View/Elements/side_menu.ctp:276
-msgid "Update Warninglists"
-msgstr "警告リストの更新"
-
-#: View/Elements/side_menu.ctp:282
-msgid "View Noticelist"
-msgstr "通告リストを表示"
-
-#: View/Elements/side_menu.ctp:285
-msgid "Update Noticelists"
-msgstr "通告リストを更新"
-
-#: View/Elements/side_menu.ctp:291
-msgid "List Whitelist"
-msgstr "ホワイトリストの一覧"
-
-#: View/Elements/side_menu.ctp:293
-msgid "New Whitelist"
-msgstr "新しいホワイトリスト"
-
-#: View/Elements/side_menu.ctp:297
-msgid "Edit Whitelist"
-msgstr "ホワイトリストを編集"
-
-#: View/Elements/side_menu.ctp:298
-msgid "Delete Whitelist"
-msgstr "ホワイトリストを削除"
-
-#: View/Elements/side_menu.ctp:305
-#: View/Users/edit.ctp:4
-msgid "Edit My Profile"
-msgstr "マイプロフィールを編集"
-
-#: View/Elements/side_menu.ctp:306
-#: View/Pages/doc/administration.ctp:126
-#: View/Users/admin_edit.ctp:70
-#: View/Users/change_pw.ctp:4
-msgid "Change Password"
-msgstr "パスワードの変更"
-
-#: View/Elements/side_menu.ctp:321;389
-msgid "View Organisation"
-msgstr "組織を表示"
-
-#: View/Elements/side_menu.ctp:328
-#: View/SharingGroups/edit.ctp:3
-msgid "Edit Sharing Group"
-msgstr "共有グループを編集"
-
-#: View/Elements/side_menu.ctp:329
-msgid "View Sharing Group"
-msgstr "共有グループを表示"
-
-#: View/Elements/side_menu.ctp:342
-msgid "Explore Remote Event"
-msgstr "リモートイベントを探索"
-
-#: View/Elements/side_menu.ctp:343
-msgid "Fetch This Event"
-msgstr "イベントの取得"
-
-#: View/Elements/side_menu.ctp:343
-#: View/Feeds/preview_index.ctp:65
-#: View/Servers/preview_index.ctp:147
-msgid "Are you sure you want to fetch and save this event on your instance?"
-msgstr "本当にあなたのインスタンス上でこのイベントの取得と保存を行いますか?"
-
-#: View/Elements/side_menu.ctp:344;347
-msgid "Explore Remote Server"
-msgstr "リモートサーバーを探索"
-
-#: View/Elements/side_menu.ctp:350
-#: View/Servers/edit.ctp:4
-msgid "Edit Server"
-msgstr "サーバーを編集"
-
-#: View/Elements/side_menu.ctp:356
-msgid "New Server"
-msgstr "新しいサーバー"
-
-#: View/Elements/side_menu.ctp:363
-msgid "View User"
-msgstr "ユーザーを表示"
-
-#: View/Elements/side_menu.ctp:364
-msgid "Reset Password"
-msgstr "パスワードをリセット"
-
-#: View/Elements/side_menu.ctp:365
-msgid "Edit User"
-msgstr "ユーザーを編集"
-
-#: View/Elements/side_menu.ctp:366
-msgid "Delete User"
-msgstr "ユーザーを削除"
-
-#: View/Elements/side_menu.ctp:366
-#: View/Elements/Users/userIndexTable.ctp:91
-msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
-msgstr "本当に # %s を削除しますか? 「削除」の代わりに「無効化」することを強くお勧めします。"
-
-#: View/Elements/side_menu.ctp:370
-#: View/Roles/admin_edit.ctp:4
-msgid "Edit Role"
-msgstr "ロールを編集"
-
-#: View/Elements/side_menu.ctp:371
-msgid "Delete Role"
-msgstr "ロールを削除"
-
-#: View/Elements/side_menu.ctp:385
-#: View/Organisations/admin_edit.ctp:4
-msgid "Edit Organisation"
-msgstr "組織を編集"
-
-#: View/Elements/side_menu.ctp:386
-#: View/Organisations/ajax/merge.ctp:5
-msgid "Merge Organisation"
-msgstr "組織を統合"
-
-#: View/Elements/side_menu.ctp:398
-#: View/Servers/server_settings.ctp:5
-msgid "Server Settings & Maintenance"
-msgstr "サーバーの設定・保守"
-
-#: View/Elements/side_menu.ctp:406
-msgid "Blacklists Event"
-msgstr "イベントをブラックリスト"
-
-#: View/Elements/side_menu.ctp:410
-msgid "Blacklists Organisation"
-msgstr "組織のブラックリスト"
-
-#: View/Elements/side_menu.ctp:426;433
-msgid "View Thread"
-msgstr "スレッドを表示"
-
-#: View/Elements/side_menu.ctp:427
-#: View/Posts/add.ctp:4
-msgid "Add Post"
-msgstr "ポストを追加"
-
-#: View/Elements/side_menu.ctp:434
-#: View/Posts/edit.ctp:4
-msgid "Edit Post"
-msgstr "ポストを編集"
-
-#: View/Elements/side_menu.ctp:439
-msgid "List Threads"
-msgstr "スレッドの一覧"
-
-#: View/Elements/side_menu.ctp:440
-msgid "New Thread"
-msgstr "新しいスレッド"
-
-#: View/Elements/side_menu.ctp:445
-msgid "List Favourite Tags"
-msgstr "お気に入りのタグの一覧"
-
-#: View/Elements/side_menu.ctp:455
-msgid "Edit Tag"
-msgstr "タグを編集"
-
-#: View/Elements/side_menu.ctp:461;473
-msgid "View Taxonomy"
-msgstr "タキソノミーを表示"
-
-#: View/Elements/side_menu.ctp:474
-msgid "Delete Taxonomy"
-msgstr "タクソノミーを削除"
-
-#: View/Elements/side_menu.ctp:492
-msgid "View Template"
-msgstr "テンプレートを表示"
-
-#: View/Elements/side_menu.ctp:494
-#: View/Templates/edit.ctp:6
-msgid "Edit Template"
-msgstr "テンプレートの編集"
-
-#: View/Elements/side_menu.ctp:502
-msgid "Add Feed"
-msgstr "フィードの追加"
-
-#: View/Elements/side_menu.ctp:503
-msgid "Import Feeds from JSON"
-msgstr "JSONからフィードをインポート"
-
-#: View/Elements/side_menu.ctp:504
-#: View/Feeds/compare_feeds.ctp:7
-msgid "Feed overlap analysis matrix"
-msgstr "フィード オーバーラップ 解析マトリックス"
-
-#: View/Elements/side_menu.ctp:505
-msgid "Export Feed settings"
-msgstr "フィード設定のエクスポート"
-
-#: View/Elements/side_menu.ctp:507
-msgid "Edit Feed"
-msgstr "フィードを編集"
-
-#: View/Elements/side_menu.ctp:509
-msgid "PreviewIndex"
-msgstr "プレビューインデックス"
-
-#: View/Elements/side_menu.ctp:511
-msgid "PreviewEvent"
-msgstr "プレビューイベント"
-
-#: View/Elements/side_menu.ctp:516
-msgid "View News"
-msgstr "ニュースを表示"
-
-#: View/Elements/side_menu.ctp:520
-#: View/News/add.ctp:6
-msgid "Add News Item"
-msgstr "ニュース項目を追加"
-
-#: View/Elements/side_menu.ctp:522
-#: View/News/edit.ctp:6
-msgid "Edit News Item"
-msgstr "ニュース項目を編集"
-
-#: View/Elements/side_menu.ctp:533
-msgid "Update Galaxies"
-msgstr "ギャラクシーを更新"
-
-#: View/Elements/side_menu.ctp:533
-msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr "本当にすべてのギャラクシーをサブモジュールから再インポートしますか?"
-
-#: View/Elements/side_menu.ctp:534
-msgid "Force Update Galaxies"
-msgstr "ギャラクシーを強制的に更新"
-
-#: View/Elements/side_menu.ctp:534
-msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr "本当にすべてのギャラクシーをドロップし、サブモジュールから再インポートしますか?"
-
-#: View/Elements/side_menu.ctp:538;546
-msgid "View Galaxy"
-msgstr "ギャラクシーを表示"
-
-#: View/Elements/side_menu.ctp:539
-msgid "View Cluster"
-msgstr "クラスターを表示"
-
-#: View/Elements/side_menu.ctp:556
-msgid "Update Objects"
-msgstr "オブジェクトの更新"
-
-#: View/Elements/side_menu.ctp:561
-msgid "View Object Template"
-msgstr "オブジェクトテンプレートを表示"
-
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:84
+#: View/Layouts/default.ctp:87
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr "ロード中"
@@ -3975,8 +4000,11 @@ msgid "Display"
 msgstr "ディスプレイ"
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Jobs/index.ctp:62
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
 #: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr "フィルター"
 
@@ -3989,12 +4017,12 @@ msgstr "履歴"
 msgid "Toggle fullscreen"
 msgstr "全画面表示に切り替え"
 
-#: View/Elements/view_mitre_attack_matrix.ctp:27
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
 msgstr "すべてを表示"
 
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all events on current page"
 msgstr "現在のページの全てのイベントを選択"
 
@@ -4034,35 +4062,58 @@ msgstr "ポスト数"
 msgid "#Posts"
 msgstr "ポスト数"
 
-#: View/Elements/Events/eventIndexTable.ctp:167
-msgid " correlation(s)"
-msgstr " 相関"
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/dashboard/dashboard_events.ctp:4;5
+#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
+#: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/preview_index.ctp:174
+#: View/Taxonomies/index.ctp:47
+#: View/Warninglists/index.ctp:60
+msgid "View"
+msgstr "表示"
 
-#: View/Elements/Events/eventIndexTable.ctp:177;182
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
 msgid " proposal(s)"
 msgstr " 提案"
 
-#: View/Elements/Events/eventIndexTable.ctp:187
+#: View/Elements/Events/eventIndexTable.ctp:190
 msgid "NEW"
 msgstr "新しい"
 
-#: View/Elements/Events/eventIndexTable.ctp:207
-#: View/Jobs/index.ctp:15;63
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-msgid "All"
-msgstr "すべて"
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
+msgstr "イベントを公開"
 
-#: View/Elements/Events/eventIndexTable.ctp:218
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:12
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
 msgid "Are you sure this event is complete and everyone should be informed?"
 msgstr "このイベントは完了しており、誰もが通知を受けるべきですか?"
 
-#: View/Elements/Events/eventIndexTable.ctp:219
+#: View/Elements/Events/eventIndexTable.ctp:222
 msgid "Not published"
 msgstr "非公開"
 
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr "本当に # %s を削除しますか?"
+
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid "Show "
 msgstr "表示 "
@@ -4072,51 +4123,66 @@ msgid " more..."
 msgstr " more..."
 
 #: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:295
+#: View/Events/view.ctp:346
 msgid "Collapse…"
 msgstr "折りたたみ..."
 
-#: View/Elements/Events/View/row_attribute.ctp:262
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr "- 所属組織のみに制限。"
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr "高度なサイティング"
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:343
 msgid "Restore attribute"
 msgstr "アトリビュートを復旧"
 
-#: View/Elements/Events/View/row_attribute.ctp:263;303
+#: View/Elements/Events/View/row_attribute.ctp:344;384
 msgid "Permanently delete attribute"
 msgstr "アトリビュートを完全に削除"
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Query enrichment"
 msgstr "エンリッチメントに問い合わせ"
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Propose enrichment"
 msgstr "エンリッチメントを提案"
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Query Cortex"
 msgstr "Cortex に問い合わせ"
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Propose enrichment through Cortex"
 msgstr "Cortex 経由でのエンリッチメントを提案"
 
-#: View/Elements/Events/View/row_attribute.ctp:279
+#: View/Elements/Events/View/row_attribute.ctp:360
 msgid "Propose Edit"
 msgstr "編集を提案"
 
-#: View/Elements/Events/View/row_attribute.ctp:280
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Propose Deletion"
 msgstr "削除を提案"
 
-#: View/Elements/Events/View/row_attribute.ctp:290;295
+#: View/Elements/Events/View/row_attribute.ctp:371;376
 msgid "Add enrichment"
 msgstr "エンリッチメントを追加"
 
-#: View/Elements/Events/View/row_attribute.ctp:295
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Add enrichment via Cortex"
 msgstr "Cortex 経由でエンリッチメントを追加"
 
-#: View/Elements/Events/View/row_attribute.ctp:307
+#: View/Elements/Events/View/row_attribute.ctp:388
 msgid "Soft-delete attribute"
 msgstr "アトリビュートをソフト削除"
 
@@ -4138,24 +4204,36 @@ msgid "Expand or Collapse"
 msgstr "展開または折り畳み"
 
 #: View/Elements/Events/View/row_object.ctp:69
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
+msgstr "UUID"
+
+#: View/Elements/Events/View/row_object.ctp:70
 msgid "Meta-category: "
 msgstr "メタカテゴリー: "
 
-#: View/Elements/Events/View/row_object.ctp:70
+#: View/Elements/Events/View/row_object.ctp:71
 #: View/Elements/Feeds/View/row_object.ctp:21
 msgid "Description: "
 msgstr "説明： "
 
-#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Events/View/row_object.ctp:72
 #: View/Elements/Feeds/View/row_object.ctp:22
 msgid "Template: "
 msgstr "テンプレート: "
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Permanently delete object"
 msgstr "オブジェクトを完全削除"
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Soft delete object"
 msgstr "オブジェクトをソフト削除"
 
@@ -4196,6 +4274,7 @@ msgstr "提案を破棄"
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
 #: View/Sightings/ajax/advanced.ctp:10
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 msgid "Add sighting"
 msgstr "サイティングを追加"
 
@@ -4204,7 +4283,6 @@ msgid "Mark as false-positive"
 msgstr "偽陽性としてマーク"
 
 #: View/Elements/Events/View/sighting_field.ctp:14
-#: View/Events/view.ctp:203
 msgid "Advanced sightings"
 msgstr "高度なサイティング"
 
@@ -4232,7 +4310,7 @@ msgstr " 値"
 
 #: View/Elements/Feeds/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object.ctp:20
-#: View/ObjectTemplates/view.ctp:19
+#: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:23
 msgid "Meta-category"
 msgstr "メタカテゴリー"
@@ -4247,7 +4325,7 @@ msgid "all"
 msgstr "すべて"
 
 #: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/view.ctp:126
+#: View/Events/view.ctp:131
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
 #: View/Servers/preview_event.ctp:36
 #: View/Sightings/ajax/list_sightings.ctp:5
@@ -4273,12 +4351,13 @@ msgstr "ステータス"
 #: View/Elements/Servers/View/row_attribute.ctp:93
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/healthElements/files.ctp:61
-#: View/Elements/healthElements/workers.ctp:61;62;63
-#: View/Events/automation.ctp:403;410;417;438;445
+#: View/Elements/healthElements/workers.ctp:66;67;68
+#: View/Events/automation.ctp:234;241;248;269;276
 #: View/Events/export.ctp:68;88
-#: View/Taxonomies/view.ctp:96;107;152
-#: View/Users/admin_view.ctp:83;92;122
-#: View/Users/view.ctp:62
+#: View/Events/legacy_automation.ctp:403;410;417;438;445
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
 msgid "N/A"
 msgstr "N/A"
 
@@ -4287,23 +4366,24 @@ msgstr "N/A"
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
 #: View/Galaxies/view.ctp:14
-#: View/ObjectTemplates/view.ctp:11
+#: View/ObjectTemplates/view.ctp:4
 #: View/Objects/revise_object.ctp:19
 #: View/Organisations/ajax/merge.ctp:57;64
 #: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/view.ctp:9
-#: View/SharingGroups/add.ctp:11;31;51
-#: View/SharingGroups/edit.ctp:11;31;59
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
 #: View/SharingGroups/view.ctp:42;67
 #: View/Templates/view.ctp:9
 #: View/Users/statistics_orgs.ctp:31
-#: View/Warninglists/view.ctp:9
+#: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr "名前"
 
 #: View/Elements/Servers/View/row_object.ctp:21
 #: View/Elements/healthElements/files.ctp:8
-#: View/Elements/healthElements/settings_tab.ctp:16
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:10
 #: View/Elements/templateElements/populateTemplateDescription.ctp:12
 #: View/Elements/templateElements/populateTemplateFile.ctp:10
@@ -4311,19 +4391,19 @@ msgstr "名前"
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:27
 #: View/Galaxies/view.ctp:20
-#: View/ObjectTemplates/view.ctp:21
+#: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:16;94
-#: View/Organisations/view.ctp:32;89;90
+#: View/Organisations/view.ctp:15;58;59
 #: View/Pages/doc/administration.ctp:48;241
-#: View/Pages/doc/categories_and_types.ctp:50;67
+#: View/Pages/doc/categories_and_types.ctp:44;61
 #: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
 #: View/Servers/preview_event.ctp:65
-#: View/SharingGroups/add.ctp:15
-#: View/SharingGroups/edit.ctp:15
-#: View/SharingGroups/index.ctp:28
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
 #: View/Taxonomies/view.ctp:14
 #: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:14
+#: View/Warninglists/view.ctp:11
 msgid "Description"
 msgstr "説明"
 
@@ -4342,11 +4422,17 @@ msgstr "参照"
 msgid "Referenced by"
 msgstr "参照元"
 
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr "本当に \"%s\" を削除しますか?"
+
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:2
+#: View/Roles/view.ctp:24
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_view.ctp:19
-#: View/Users/view.ctp:19
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
 msgstr "ロール"
 
@@ -4357,7 +4443,7 @@ msgstr "最終ログイン"
 #: View/Elements/Users/userIndexTable.ctp:17
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:54
+#: View/ShadowAttributes/index.ctp:64
 msgid "Created"
 msgstr "作成日時"
 
@@ -4369,6 +4455,11 @@ msgstr "パスワード更新を開始"
 msgid "Create new credentials and inform user"
 msgstr "新しいクレデンシャルを作成し、ユーザーに通知"
 
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr "本当に # %s を削除しますか? 「削除」の代わりに「無効化」することを強くお勧めします。"
+
 #: View/Elements/dashboard/dashboard_events.ctp:2
 msgid "Changes since last visit"
 msgstr "前回からの変更点"
@@ -4397,6 +4488,417 @@ msgstr "提案のあるイベント: "
 msgid "Delegation requests: "
 msgstr "委譲リクエスト: "
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr "テンプレートから追加"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr "フリーテキスト インポートの結果"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr "イベントを表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr "相関グラフを表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr "イベント履歴を表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr "イベントを編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr "イベントを削除"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr "オブジェクトを追加"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr "添付ファイルを追加"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr "... から追加"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr "イベントをエンリッチ"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr "... からアトリビュートを結合"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr "アトリビュートを提案"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr "添付ファイルを提案"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr "公開 (Eメールなし)"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr "公開を委任"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr "委譲リクエストを承認"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr "委譲リクエストを破棄"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr "ZeroMQにイベントを発行"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr "レポーターに連絡"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr "... としてダウンロード"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr "Import from..."
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr "正規表現の一覧"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr "新しい正規表現"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr "存在するものを実行"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr "正規表現を編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr "正規表現を削除"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr "警告リストを表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr "警告リストの更新"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr "通告リストを表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr "通告リストを更新"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr "ホワイトリストの一覧"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr "新しいホワイトリスト"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr "ホワイトリストを編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr "ホワイトリストを削除"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr "マイプロフィールを編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr "パスワードの変更"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr "パスワードをリセット"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr "組織を表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr "共有グループを編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr "共有グループを表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr "リモートサーバーを探索"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr "リモートイベントを探索"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr "イベントの取得"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr "本当にあなたのインスタンス上でこのイベントの取得と保存を行いますか?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr "サーバーを編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr "ユーザーを表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr "ユーザーを編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr "ユーザーを削除"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr "ロールを編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr "ロールを削除"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr "組織を追加"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr "組織を編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr "組織を統合"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr "ロールを追加"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr "イベントをブラックリスト"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr "組織のブラックリスト"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr "スレッドを表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr "ポストを追加"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr "ポストを編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr "スレッドの一覧"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr "新しいスレッド"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr "お気に入りのタグの一覧"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr "タグを編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr "タキソノミーを表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr "タクソノミーを削除"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr "テンプレートを表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr "テンプレートの編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr "フィードの追加"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr "JSONからフィードをインポート"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr "フィード オーバーラップ 解析マトリックス"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr "フィード設定のエクスポート"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr "フィードを編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr "プレビューインデックス"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr "プレビューイベント"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr "ニュースを表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr "ニュース項目を追加"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr "ニュース項目を編集"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr "ギャラクシーを更新"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr "本当にすべてのギャラクシーをサブモジュールから再インポートしますか?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr "ギャラクシーを強制的に更新"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr "本当にすべてのギャラクシーをドロップし、サブモジュールから再インポートしますか?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr "ギャラクシーを表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr "クラスターを表示"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr "オブジェクトの更新"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr "オブジェクトテンプレートを表示"
+
 #: View/Elements/healthElements/diagnostics.ctp:5
 msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
 msgstr "不正なデータベースエンコーディング設定: データベースコネクションは現在 UTF-8 に設定されていません。Please make sure to uncomment the 'encoding' => 'utf8' line in "
@@ -4421,11 +4923,10 @@ msgstr "次期開発バージョン"
 msgid "Outdated version"
 msgstr "古いバージョン"
 
-#: View/Elements/healthElements/diagnostics.ctp:26;156;170;195
-#: View/Elements/healthElements/workers.ctp:18;71
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
+#: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
-#: View/Users/admin_view.ctp:81
 msgid "OK"
 msgstr "OK"
 
@@ -4445,131 +4946,135 @@ msgstr "ステータス..."
 msgid "Current branch…"
 msgstr "現在のブランチ..."
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Pull the latest MISP version from github"
 msgstr "github から最新の MISP のバージョンを取得する"
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Update MISP"
 msgstr "MISPを更新"
 
-#: View/Elements/healthElements/diagnostics.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "Writeable Directories and files"
 msgstr "書込み可能なディレクトリーとファイル"
 
-#: View/Elements/healthElements/diagnostics.ctp:67
+#: View/Elements/healthElements/diagnostics.ctp:65
 msgid "The following directories and files have to be writeable for MISP to function properly. Make sure that the apache user has write privileges for the directories below."
 msgstr "次のディレクトリとファイルは、MISP が正常に機能するために、書き込み可能でなければなりません。Apache ユーザーが以下のディレクトリへの書き込み権限を持っていることを確認してください。"
 
-#: View/Elements/healthElements/diagnostics.ctp:68
+#: View/Elements/healthElements/diagnostics.ctp:66
 msgid "Directories"
 msgstr "ディレクトリー"
 
-#: View/Elements/healthElements/diagnostics.ctp:75
+#: View/Elements/healthElements/diagnostics.ctp:73
 msgid "Directory "
 msgstr "ディレクトリ "
 
-#: View/Elements/healthElements/diagnostics.ctp:83
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Writeable Files"
 msgstr "書き込めるファイル"
 
-#: View/Elements/healthElements/diagnostics.ctp:90;104
+#: View/Elements/healthElements/diagnostics.ctp:88;102
 msgid "File "
 msgstr "ファイル "
 
-#: View/Elements/healthElements/diagnostics.ctp:97
+#: View/Elements/healthElements/diagnostics.ctp:95
 msgid "Readable Files"
 msgstr "読み込めるファイル"
 
-#: View/Elements/healthElements/diagnostics.ctp:112
+#: View/Elements/healthElements/diagnostics.ctp:110
 msgid "PHP Settings"
 msgstr "PHPの設定"
 
-#: View/Elements/healthElements/diagnostics.ctp:115;127
+#: View/Elements/healthElements/diagnostics.ctp:113;125
 msgid "Up to date"
 msgstr "最新"
 
-#: View/Elements/healthElements/diagnostics.ctp:121
-#: View/Elements/healthElements/workers.ctp:78;80
-#: View/Organisations/view.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:119
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
 msgid "Unknown"
 msgstr "不明"
 
-#: View/Elements/healthElements/diagnostics.ctp:123
+#: View/Elements/healthElements/diagnostics.ctp:121
 msgid "Issues determining version"
 msgstr "バージョン確認の問題"
 
-#: View/Elements/healthElements/diagnostics.ctp:130;139
+#: View/Elements/healthElements/diagnostics.ctp:128;137
 msgid "Update highly recommended"
 msgstr "アップデートを強く推奨します"
 
-#: View/Elements/healthElements/diagnostics.ctp:133;142
+#: View/Elements/healthElements/diagnostics.ctp:131;140
 msgid "Version unsupported, update ASAP"
 msgstr "このバージョンはサポートされていません、至急アップデートしてください"
 
-#: View/Elements/healthElements/diagnostics.ctp:146
+#: View/Elements/healthElements/diagnostics.ctp:144
 msgid "PHP ini path"
 msgstr "php.iniのパス"
 
-#: View/Elements/healthElements/diagnostics.ctp:147
+#: View/Elements/healthElements/diagnostics.ctp:145
 msgid "PHP Version"
 msgstr "PHP バージョン"
 
-#: View/Elements/healthElements/diagnostics.ctp:147;148
+#: View/Elements/healthElements/diagnostics.ctp:145;146
 msgid "recommended"
 msgstr "おすすめ"
 
-#: View/Elements/healthElements/diagnostics.ctp:148
+#: View/Elements/healthElements/diagnostics.ctp:146
 msgid "PHP CLI Version"
 msgstr "PHPのCLIバージョン"
 
-#: View/Elements/healthElements/diagnostics.ctp:149
+#: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
 msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
 msgstr "次の設定は、 現在の推奨される最小設定では MISP の特定の機能に悪影響を与える可能性があります。これらは php.ini で調整することができます。推奨事項は必須要件ではないことに留意してください。使用状況に応じて、推奨値を超えた方がいいかもしれません。"
 
-#: View/Elements/healthElements/diagnostics.ctp:156
+#: View/Elements/healthElements/diagnostics.ctp:155
 #: View/Events/filter_event_index.ctp:32;190
 #: View/Pages/doc/using_the_system.ctp:66;171
 msgid "Low"
 msgstr "低"
 
-#: View/Elements/healthElements/diagnostics.ctp:160
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP Extensions"
 msgstr "PHP Extensions"
 
-#: View/Elements/healthElements/diagnostics.ctp:170
+#: View/Elements/healthElements/diagnostics.ctp:169
 msgid "Not loaded"
 msgstr "読み込まれていません"
 
-#: View/Elements/healthElements/diagnostics.ctp:175
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr "PHP の設定は読み込み中に問題がありました。テスト・スクリプトが読み込めない可能性もあります。"
 
-#: View/Elements/healthElements/diagnostics.ctp:183
+#: View/Elements/healthElements/diagnostics.ctp:182
 msgid "Advanced attachment handler"
 msgstr "高度な添付ファイルハンドラー"
 
-#: View/Elements/healthElements/diagnostics.ctp:184
+#: View/Elements/healthElements/diagnostics.ctp:183
 msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
 msgstr "高度な添付ファイルツールは、添付ファイルを追加する機能によってアップロードされたサンプルに関する追加情報を抽出するために使用されます。"
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PyMISP"
 msgstr "PyMISP"
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "Not installed or version outdated."
 msgstr "インストールされていない、もしくは古いバージョンです。"
 
-#: View/Elements/healthElements/diagnostics.ctp:201
+#: View/Elements/healthElements/diagnostics.ctp:200
 msgid "STIX and Cybox libraries"
 msgstr "STIX と Cybox のライブラリー"
 
-#: View/Elements/healthElements/diagnostics.ctp:202
+#: View/Elements/healthElements/diagnostics.ctp:201
 msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
 msgstr "MISP の STIX エクスポートが機能するためには Mitre の STIX と Cybox の python ライブラリがインストールされていなければいけません。もし下記のエラーが表示された場合、それらが (MISP のインストール手順で説明されたように)インストールされているか確かめてください。"
 
-#: View/Elements/healthElements/diagnostics.ctp:203
+#: View/Elements/healthElements/diagnostics.ctp:202
 msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
 msgstr "ここで問題が起こった場合は、INSTALL.txt ファイルで説明されているように、STIX と CyBox の両方が、インストーされていることを確認してください。必要なバージョン"
 
@@ -4806,72 +5311,35 @@ msgid "Permissions"
 msgstr "権限"
 
 #: View/Elements/healthElements/files.ctp:73
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
 #: View/Roles/admin_index.ctp:67
-#: View/SharingGroups/index.ctp:68
+#: View/SharingGroups/index.ctp:87
 msgid "Are you sure you want to delete %s?"
 msgstr "本当に %s を削除しますか?"
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
 msgstr "緊急、MISP インスタンスは早急な対応を必要としています。"
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
 msgstr "問題が見つかりました。解決することをお勧めします。"
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:5
 msgid "Good, but there are some optional settings that are incorrect / not set."
 msgstr "いくつかのオプションの設定が、間違っているか、設定されていません。"
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:6
 msgid "In perfect health."
 msgstr "全て正常"
 
 #: View/Elements/healthElements/overview.ctp:15
-msgid "Overall health"
-msgstr "サーバー設定状況全般"
+msgid "Test"
+msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:17
-msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr "サーバーの設定状況全般は解決されていない最も重大な問題に依存します。"
-
-#: View/Elements/healthElements/overview.ctp:26
-msgid " settings incorrectly or not set"
-msgstr " 設定が間違っているか、設定されていません"
-
-#: View/Elements/healthElements/overview.ctp:27
-msgid " incorrect settings."
-msgstr " 誤設定"
-
-#: View/Elements/healthElements/overview.ctp:33
-msgid "Critical issues revealed by the diagnostics"
-msgstr "診断によって明らかになった重大な問題"
-
-#: View/Elements/healthElements/overview.ctp:34
-msgid " issues detected."
-msgstr " 問題が検知されました。"
-
-#: View/Elements/healthElements/overview.ctp:35
-msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
-msgstr "ここで明らかになった問題は、正しくないディレクトリ権限または依存関係が正しくインストールされていないことが原因である可能性があります。"
-
-#: View/Elements/healthElements/settings_tab.ctp:9
-msgid "Toggle subgroup"
-msgstr "サブグループの切り替え"
-
-#: View/Elements/healthElements/settings_tab.ctp:13
-#: View/Pages/doc/administration.ctp:45
-msgid "Priority"
-msgstr "優先順位"
-
-#: View/Elements/healthElements/settings_tab.ctp:14
-#: View/Pages/doc/administration.ctp:46
-msgid "Setting"
-msgstr "設定"
-
-#: View/Elements/healthElements/settings_tab.ctp:15
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
 #: View/Events/filter_event_index.ctp:134
 #: View/Events/resolved_attributes.ctp:45
 #: View/Events/show_i_o_c_results.ctp:13
@@ -4886,128 +5354,166 @@ msgstr "設定"
 msgid "Value"
 msgstr "値"
 
-#: View/Elements/healthElements/settings_tab.ctp:17
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr "サーバー設定状況全般"
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr "サーバーの設定状況全般は解決されていない最も重大な問題に依存します。"
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr " 設定が間違っているか、設定されていません"
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr "診断によって明らかになった重大な問題"
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr "ここで明らかになった問題は、正しくないディレクトリ権限または依存関係が正しくインストールされていないことが原因である可能性があります。"
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr "優先順位"
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr "設定"
+
+#: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
 msgstr "エラーメッセージ"
 
-#: View/Elements/healthElements/tabs.ctp:3;15;27;36
-#: View/Events/index.ctp:30;58
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
-#: View/Users/admin_index.ctp:28
-msgid "Modify filters"
-msgstr "フィルターを変更"
-
-#: View/Elements/healthElements/tabs.ctp:3
+#: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
 msgstr "概要"
 
-#: View/Elements/healthElements/tabs.ctp:28
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:34
 #: View/Pages/doc/administration.ctp:38
 msgid "Diagnostics"
 msgstr "診断"
 
-#: View/Elements/healthElements/tabs.ctp:37
-#: View/Pages/doc/administration.ctp:39
-msgid "Workers"
-msgstr "ワーカー"
-
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
 msgstr "ファイルの管理"
 
-#: View/Elements/healthElements/tabs.ctp:48
+#: View/Elements/healthElements/tabs.ctp:50;65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
 msgstr "レポートをダウンロード"
 
-#: View/Elements/healthElements/workers.ctp:5
-msgid "Warning"
-msgstr "警告"
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
+msgstr "ワーカー"
 
 #: View/Elements/healthElements/workers.ctp:5
 msgid "MISP cannot access your /proc directory to check the status of the worker processes, which means that dead workers will not be detected by the diagnostic tool. If you would like to regain this functionality, make sure that the open_basedir directive is not set, or that /proc is included in it."
 msgstr "MISP は、/proc ディレクトリにアクセスできないため、ワーカープロセスの状態を確認できません。これにより、診断ツールは死亡したワーカーを検出できません。この機能を回復させたい場合、open_basedir ディレクティブを設定しないか、またはこのディレクティブに /proc を追加します。"
 
 #: View/Elements/healthElements/workers.ctp:10
+msgid "Note:"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "You have set the \"manage_workers\" variable to \"false\", therefore worker controls have been disabled."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:15
 msgid "Issues prevent jobs from being processed. Please resolve them below."
 msgstr "問題が、ジョブの処理を妨害しています。先に、問題を解決してください。"
 
-#: View/Elements/healthElements/workers.ctp:15
+#: View/Elements/healthElements/workers.ctp:20
 msgid "Worker started with the correct user, but the current status is unknown."
 msgstr "ワーカーが正しいユーザーで起動されましたが、現在の状態は不明です。"
 
-#: View/Elements/healthElements/workers.ctp:24
+#: View/Elements/healthElements/workers.ctp:29
 msgid "There are issues with the worker(s), but at least one healthy worker is monitoring the queue."
 msgstr "ワーカーに関する問題がありますが、少なくとも 1 つの正常なワーカーがキューの監視をしてします。"
 
-#: View/Elements/healthElements/workers.ctp:30
+#: View/Elements/healthElements/workers.ctp:35
 msgid "Worker type: "
 msgstr "ワーカーのタイプ: "
 
-#: View/Elements/healthElements/workers.ctp:32
+#: View/Elements/healthElements/workers.ctp:37
 msgid "Jobs in the queue: "
 msgstr "キューに入っているジョブ: "
 
-#: View/Elements/healthElements/workers.ctp:40
+#: View/Elements/healthElements/workers.ctp:45
 msgid "Queue status: "
 msgstr "キューのステータス: "
 
-#: View/Elements/healthElements/workers.ctp:51
+#: View/Elements/healthElements/workers.ctp:56
 msgid "Worker PID"
 msgstr "ワーカーのPID"
 
-#: View/Elements/healthElements/workers.ctp:52
+#: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
-#: View/Users/admin_view.ctp:7
-#: View/Users/view.ctp:2
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
 msgid "User"
 msgstr "ユーザー"
 
-#: View/Elements/healthElements/workers.ctp:53
+#: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr "ワーカーのプロセス"
 
-#: View/Elements/healthElements/workers.ctp:54
+#: View/Elements/healthElements/workers.ctp:59
 msgid "Information"
 msgstr "情報"
 
-#: View/Elements/healthElements/workers.ctp:64
+#: View/Elements/healthElements/workers.ctp:69
 msgid "Worker not running!"
 msgstr "ワーカーが動作していません!"
 
-#: View/Elements/healthElements/workers.ctp:72
+#: View/Elements/healthElements/workers.ctp:77
 msgid "The worker appears to be healthy."
 msgstr "ワーカーは正常のようです。"
 
-#: View/Elements/healthElements/workers.ctp:75
+#: View/Elements/healthElements/workers.ctp:80
 msgid "The worker was started with a user other than the apache user. MISP cannot check whether the worker is alive or not."
 msgstr "ワーカーは、apache ユーザー以外のユーザーで起動されました。MISP では、ワーカーが動作しているかどうかをチェックできません。"
 
-#: View/Elements/healthElements/workers.ctp:81
+#: View/Elements/healthElements/workers.ctp:86
 msgid "Cannot check whether the worker is alive or dead."
 msgstr "ワーカーの状態チェックできません"
 
-#: View/Elements/healthElements/workers.ctp:85
+#: View/Elements/healthElements/workers.ctp:90
 msgid "Dead"
 msgstr "停止"
 
-#: View/Elements/healthElements/workers.ctp:86
+#: View/Elements/healthElements/workers.ctp:91
 msgid "The Worker appears to be dead."
 msgstr "ワーカーは死んでいるようです。"
 
-#: View/Elements/healthElements/workers.ctp:100
+#: View/Elements/healthElements/workers.ctp:106
 msgid "Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it."
 msgstr "このワーカーを、停止 (実行中の場合) し、削除します。このワーカーによって実行されているジョブは、ただちに中断されます。"
 
-#: View/Elements/healthElements/workers.ctp:111
+#: View/Elements/healthElements/workers.ctp:119
 msgid "Start a worker"
 msgstr "ワーカーを起動"
 
-#: View/Elements/healthElements/workers.ctp:119
+#: View/Elements/healthElements/workers.ctp:130
 msgid "Restart all workers"
 msgstr "すべてのワーカーを再起動"
 
@@ -5138,16 +5644,16 @@ msgstr "項目"
 #: View/Objects/revise_object.ctp:45
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
-#: View/Pages/doc/categories_and_types.ctp:66
+#: View/Pages/doc/categories_and_types.ctp:60
 #: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
-#: View/ShadowAttributes/index.ctp:36;51
-#: View/SharingGroups/add.ctp:30
-#: View/SharingGroups/edit.ctp:30
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
 #: View/Sightings/ajax/list_sightings.ctp:7
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:35
-#: View/Warninglists/view.ctp:24
+#: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr "タイプ"
 
@@ -5186,7 +5692,7 @@ msgid "Template Name"
 msgstr "テンプレート名"
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:60
+#: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr "作成者"
@@ -5206,7 +5712,7 @@ msgid "s"
 msgstr "秒"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
-#: View/ObjectReferences/ajax/add.ctp:60
+#: View/ObjectReferences/ajax/add.ctp:86
 #: View/Objects/revise_object.ctp:43
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
@@ -5220,9 +5726,9 @@ msgstr "アトリビュート"
 #: View/Feeds/freetext_index.ctp:31
 #: View/Objects/add.ctp:95
 #: View/Objects/revise_object.ctp:44
-#: View/Pages/doc/categories_and_types.ctp:17;23;37;43;49
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
 #: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
-#: View/ShadowAttributes/index.ctp:48
+#: View/ShadowAttributes/index.ctp:58
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_add_file.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
@@ -5232,7 +5738,7 @@ msgid "Category"
 msgstr "カテゴリー"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
-#: View/Pages/doc/categories_and_types.ctp:63
+#: View/Pages/doc/categories_and_types.ctp:57
 #: View/Pages/doc/using_the_system.ctp:109
 #: View/Pages/doc/md/categories_and_types.ctp:33
 msgid "Types"
@@ -5461,45 +5967,33 @@ msgstr "イベントグラフの削除"
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr "イベントグラフ #%s を本当に削除しますか? イベントグラフは完全に削除され、回復不能になります。"
 
-#: View/Events/add.ctp:3
-msgid "The event created %s, but not synchronised to other MISP instances until it is published."
-msgstr "イベントが作成されました %s。しかし、公開されるまで他の MISP インスタンスには同期されません。"
-
-#: View/Events/add.ctp:3
-msgid "will be restricted to your organisation"
-msgstr "所蔵組織のみに制限されます。"
-
-#: View/Events/add.ctp:3
-msgid "will be visible to the organisations having an account on this platform"
-msgstr "このプラットフォーム上にアカウントを持つ組織に表示されます。"
-
-#: View/Events/add.ctp:48
+#: View/Events/add.ctp:44
 #: View/Events/edit.ctp:35
 msgid "Threat Level "
 msgstr "脅威レベル "
 
-#: View/Events/add.ctp:52
+#: View/Events/add.ctp:48
 #: View/Events/edit.ctp:38
 msgid "Analysis "
 msgstr "分析 "
 
-#: View/Events/add.ctp:56
+#: View/Events/add.ctp:52
 #: View/Events/edit.ctp:43
-#: View/ShadowAttributes/index.ctp:42
+#: View/ShadowAttributes/index.ctp:52
 msgid "Event Info"
 msgstr "イベント情報"
 
-#: View/Events/add.ctp:60
+#: View/Events/add.ctp:56
 #: View/Events/edit.ctp:47
 msgid "Quick Event Description or Tracking Info"
 msgstr "簡単なイベントの説明またはトラッキング情報"
 
-#: View/Events/add.ctp:63
+#: View/Events/add.ctp:59
 #: View/Events/edit.ctp:50
 msgid "Extends event"
 msgstr "イベントを継承"
 
-#: View/Events/add.ctp:66
+#: View/Events/add.ctp:62
 #: View/Events/edit.ctp:53
 msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr "イベントの UUID または ID。該当しない場合は空白のままにしてください。"
@@ -5510,7 +6004,8 @@ msgstr "OpenIOCのインポート"
 
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
-#: View/Events/upload_stix.ctp:22
+#: View/Events/upload_analysis_file.ctp:22
+#: View/Events/upload_stix.ctp:29
 msgid "Upload"
 msgstr "アップロード"
 
@@ -5548,7 +6043,7 @@ msgid "Details"
 msgstr "詳細"
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:89
+#: View/Jobs/index.ctp:124
 msgid "Failed"
 msgstr "失敗"
 
@@ -5561,370 +6056,268 @@ msgid "Event with this UUID already exists."
 msgstr "このUUIDのイベントは既に存在しています。"
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr "イベント "
 
 #: View/Events/automation.ctp:3
-msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
-"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
-"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
-msgstr "自動化機能は、侵入検知システムのシグネチャーを自動的に生成するように設計されています。特定のアトリビュートのシグネチャー生成を有効にするには、このアトリビュートのシグネチャー項目を Yes に設定する必要があります。すべてのアトリビュートタイプがシグネチャー生成に適用できるわけではないことに注意してください。現在、IP、ドメイン、ホスト名、ユーザエージェントなどの NIDS シグネチャー生成と、ファイルアーティファクトの MD5/SHA1 値のハッシュリスト生成のみがサポートされています。より多くのアトリビュートタイプのサポートが計画されています。この機能を自動化ツールで利用できるようにするために、認証キーが使用されます。これにより、フォームベースの認証を行わなくても、ツールがデータに簡単にアクセスできるようになります。"
+msgid "Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.\n"
+"    To to make this functionality available for automated tools an authentication key is used."
+msgstr ""
 
 #: View/Events/automation.ctp:6
-msgid "Make sure you keep that key secret as it gives access to the entire database !"
-msgstr "そのキーでデータベース全体にアクセスできてしまうので、秘密にしておいてください!"
+msgid "Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP."
+msgstr ""
 
-#: View/Events/automation.ctp:7
+#: View/Events/automation.ctp:9
+#: View/Events/legacy_automation.ctp:7
 msgid "Your current key is: <code>%s</code>.\n"
 "    You can %s this key."
 msgstr "あなたの現在のキーは: <code>%s</code> です。\n"
 "あなたはこのキーを %s できます。"
 
-#: View/Events/automation.ctp:8
+#: View/Events/automation.ctp:10
+#: View/Events/legacy_automation.ctp:8
 msgid "reset"
 msgstr "リセット"
 
-#: View/Events/automation.ctp:10
-msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
-msgstr "バージョン 2.2 から、URL に認証鍵を含める方法は、推奨されません。今後は、リクエストの Authorization ヘッダに、認証鍵を指定します。URL に認証鍵を含める従来の方法は、一時的にサポートされていますが、推奨しません。"
-
-#: View/Events/automation.ctp:11
-msgid "Please use the use the following header"
-msgstr "以下のHTTPヘッダを使用してください"
-
-#: View/Events/automation.ctp:12
-msgid "Authorization"
-msgstr "Authorization"
-
-#: View/Events/automation.ctp:13
-msgid "XML Export"
-msgstr "XMLエクスポート"
-
 #: View/Events/automation.ctp:14
-msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
-msgstr "すべてのイベントとアトリビュート <small>(添付ファイルを除く)</small> の自動エクスポートは、カスタムXMLフォーマットでのみ利用可能です。"
+#: View/Logs/admin_index.ctp:20;21
+msgid "Search"
+msgstr "検索"
 
-#: View/Events/automation.ctp:15;47;76
-msgid "You can configure your tools to automatically download the following file"
-msgstr "以下のファイルを自動的にダウンロードするようにツールを設定することができます"
+#: View/Events/automation.ctp:16
+#: View/Events/legacy_automation.ctp:264
+msgid "It is possible to search the database for attributes based on a list of criteria."
+msgstr "いくつかの条件に基づいて、データベースからアトリビュートを検索することが可能です。"
 
 #: View/Events/automation.ctp:17
-msgid "If you only want to fetch a specific event append the eventid number"
-msgstr "特定のイベントのみを取得したい場合 eventid 番号を追加"
+#: View/Events/legacy_automation.ctp:265
+msgid "To return an event or a list of events in a desired format, use the following syntax"
+msgstr "イベントまたはイベントの一覧を希望するフォーマットで返すには、次のシンタックスを使用します"
 
-#: View/Events/automation.ctp:19;144
-msgid "You can post an XML or JSON object containing additional parameters in the following formats"
-msgstr "追加パラメーターを含む XML または JSON オブジェクトを次のフォーマットでポストできます"
+#: View/Events/automation.ctp:18
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
+msgstr ""
 
-#: View/Events/automation.ctp:26
-msgid "The xml download also accepts two additional the following optional parameters in the URL"
-msgstr "xml のダウンロードでは、 URL に次の2つのオプションパラメーターを追加できます"
+#: View/Events/automation.ctp:21
+msgid "Set the return format of the search (Currently supported: json, xml, openioc, suricata, snort - more formats are being moved to restSearch with the goal being that all searches happen through this API). Can be passed as the first parameter after restSearch or via the JSON payload."
+msgstr ""
 
-#: View/Events/automation.ctp:29;52;85
-msgid "Restrict the download to a single event"
-msgstr "ダウンロードを1つのイベントに制限"
+#: View/Events/automation.ctp:22
+msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
+msgstr ""
 
-#: View/Events/automation.ctp:30
-msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
-msgstr "添付ファイルをエンコードするかどうかを決定する真偽値項目と適切なタグを制御する第2パラーメーター。"
+#: View/Events/automation.ctp:23
+msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
+msgstr ""
 
-#: View/Events/automation.ctp:31;54;87;112;134
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
-msgstr "結果にタグを含めるには、このパラメーターにその名前を書き込んでください。タグを除外するには、先頭に'!'を追加してください。\n"
-"また、いくつかのタグコマンドを '&amp;&amp;' オペレーターでまとめることができます。タグ検索ではコロン (:) が使えないことに注意してください。\n"
-"代わりにセミコロンを使用してください (検索ではコロンが自動的に検索されます)。例えば、tag1 と tag2 のタグが付いているが、tag3 のタグが付いているものは除外したい場合"
+#: View/Events/automation.ctp:24
+#: View/Events/legacy_automation.ctp:268;297
+msgid "Search for the given value in the attributes' value field."
+msgstr "指定されたアトリビュート値の項目で検索をします。"
 
-#: View/Events/automation.ctp:37;64;91;117;140;203;254;279
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
-msgstr "from 項目で指定された日付より後の日付のイベント (フォーマット: 2015-02-15)。このフィルターは、イベントの日付を使用します。"
-
-#: View/Events/automation.ctp:38;65;92;118;141;204;255;280
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
-msgstr "to 項目で指定された日付より前の日付のイベント (フォーマット: 2015-02-15)。このフィルターは、イベントの日付を使用します。"
-
-#: View/Events/automation.ctp:39;119;142;205;256;281;306
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr "直近のある時間内に公開されたイベント (例えば、5d (日) や 12h (時間)、30m (分)) 。このフィルターはイベントの公開時間に対し有効です。"
-
-#: View/Events/automation.ctp:41;70;97;122;259;290
-msgid "The keywords false or null should be used for optional empty parameters in the URL."
-msgstr "URL中のオプションの空パラメーターには、キーワード false または null を使用してください。"
-
-#: View/Events/automation.ctp:43
-msgid "Also check out the %s to read about the REST API."
-msgstr "また REST API を読んで知るために %s をチェックしてください。"
-
-#: View/Events/automation.ctp:45
-msgid "CSV Export"
-msgstr "CSVエクスポート"
-
-#: View/Events/automation.ctp:46
-msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
-msgstr "アトリビュートの自動エクスポートは CSV に対応しています。 \"to_ids\" というフラグが立てられたアトリビュートだけがエクスポートされます。"
-
-#: View/Events/automation.ctp:49
-msgid "You can specify additional flags for CSV exports as follows"
-msgstr "CSV エクスポート用に追加するフラグを下記のように指定することができます"
-
-#: View/Events/automation.ctp:53
-msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
-msgstr "このフラグを true に設定すると、\"to_ids\"とマークされていないアトリビュートが含まれます。"
-
-#: View/Events/automation.ctp:58
-msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
-msgstr "\"tag1\"または\"tag2\"がタグ付けされ、かつ \"tag3\"がタグ付けされていないイベントに制限し、かつ IDS フラグが立った\"domain\"タイプと\"Network activity\"カテゴリーのアトリビュートを csv でダウンロードするためには、次のシンタックスを使用します"
-
-#: View/Events/automation.ctp:61;270;299
-msgid "The attribute category, any valid MISP attribute category is accepted."
-msgstr "アトリビュートのカテゴリー、任意の有効な MISP アトリビュートのカテゴリーが受け入れられます。"
-
-#: View/Events/automation.ctp:62;199;269;298
+#: View/Events/automation.ctp:25
+#: View/Events/legacy_automation.ctp:62;199;269;298
 msgid "The attribute type, any valid MISP attribute type is accepted."
 msgstr "アトリビュートのタイプ、任意の有効な MISP アトリビュートのタイプが受け入れられます。"
 
-#: View/Events/automation.ctp:63
-msgid "Include the event data with each attribute."
-msgstr "各アトリビュートを持つイベントデータが含まれます。"
+#: View/Events/automation.ctp:26
+#: View/Events/legacy_automation.ctp:61;270;299
+msgid "The attribute category, any valid MISP attribute category is accepted."
+msgstr "アトリビュートのカテゴリー、任意の有効な MISP アトリビュートのカテゴリーが受け入れられます。"
 
-#: View/Events/automation.ctp:66
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
-msgstr "最後の x 時間内に発行されたイベント。x は日、時、分(たとえば5dまたは12hまたは30m)で定義できます。このフィルターにはイベントの公開タイムスタンプが使用されます。"
+#: View/Events/automation.ctp:27
+#: View/Events/legacy_automation.ctp:271;300
+msgid "Search by the creator organisation by supplying the organisation identifier."
+msgstr "組織の識別子を指定し、作成者組織を検索します。"
 
-#: View/Events/automation.ctp:67
-msgid "The CSV created when this setting is set to true will not contain the header row.\n"
-"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
-msgstr "この設定を true にした際に作成される CSV には、ヘッダー行は含まれません。\n"
-"<b>enforceWarninglist</b>: 警告リストに該当したすべてのアトリビュートは除外されます。"
-
-#: View/Events/automation.ctp:71
-msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
-msgstr "すべてのイベントから\"domain\"タイプのアトリビュートをエクスポートするには、次のシンタックスを使用します"
-
-#: View/Events/automation.ctp:74
-msgid "NIDS rules export"
-msgstr "NIDSルール エクスポート"
-
-#: View/Events/automation.ctp:75
-msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr "ネットワーク関連のすべてのアトリビュートの自動エクスポートは Snort ルールのフォーマットで利用できます。<em>公開された</em>イベントと <em>IDS シグネチャー</em>としてマークされたアトリビュートのみがエクスポートされます。"
-
-#: View/Events/automation.ctp:81
-msgid "The full API syntax is as follows"
-msgstr "API の完全なシンタックスは以下の通り"
-
-#: View/Events/automation.ctp:84
-msgid "The export format, can be \"suricata\" or \"snort\""
-msgstr "エクスポートのフォーマット、\"suricata\" または \"snort\""
-
-#: View/Events/automation.ctp:86
-msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
-msgstr "データのフレーミングを行う、いくつかのコメントアウトされた説明。様々な選択したイベントからエクスポートのリストを連結する場合に、コメントの重複を避けるためにはこれを無効化してください。"
-
-#: View/Events/automation.ctp:93
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr "直近の x 時間内に公開されたイベント、x は日、時間、分で定義することができます。(例えば、6d や 12h、30m) 。このフィルターはイベントの公開タイムスタンプに対して有効です。"
-
-#: View/Events/automation.ctp:94
-msgid "Restrict the export to only use the given types."
-msgstr "与えられたタイプのみエクスポートするように制限します。"
-
-#: View/Events/automation.ctp:95;120;174;206;257
-msgid "All attributes that have a hit on a warninglist will be excluded."
-msgstr "警告リストにヒットしたすべてのアトリビュートが除外されます。"
-
-#: View/Events/automation.ctp:96
-msgid "All tags will be included even if not exportable."
-msgstr "エクスポート不可能なものも含み、すべてのタグが含まれます。"
-
-#: View/Events/automation.ctp:98
-msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
-msgstr "コメントのすべての情報をファイルの先頭に含めず、tag1 とタグ付けされていないすべてのイベントを suricata エクスポートする例はこの様になります:"
-
-#: View/Events/automation.ctp:100
-msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
-msgstr "管理者は、ホスト、ドメイン名、および IP アドレスを含むホワイトリストを管理し、 NIDS エクスポートから除外することができます。"
-
-#: View/Events/automation.ctp:102
-msgid "Hash database export"
-msgstr "ハッシュデーターベースをエクスポート"
-
-#: View/Events/automation.ctp:103
-msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr "ファイル関連のアトリビュートに含まれるMD5 / SHA1チェックサムの自動エクスポート。 このリストは、疑わしいファイルを検索するときにフォレンジックソフトウェアへフィードするために使用できます。 <em>公開</em> と <em>IDS シグネチャー</em>してマークされたイベントおよびアトリビュートのみがエクスポートされます。"
-
-#: View/Events/automation.ctp:104;188
-msgid "You can configure your tools to automatically download the following files"
-msgstr "以下のファイルを自動的にダウンロードするようにツールを設定することができます"
-
-#: View/Events/automation.ctp:109
-msgid "The API's full format is as follows"
-msgstr "API の完全なフォーマットは次のとおり"
-
-#: View/Events/automation.ctp:111
-msgid "The export format, can be \"md5\" or \"sha1\""
-msgstr "エクスポートのフォーマット、\"md5\" または \"sha1\""
-
-#: View/Events/automation.ctp:123
-msgid "For example, to only show sha1 values from events tagged tag1, use"
-msgstr "例えば、 tag1 とタグ付けされたイベントから sha1 値のみを表示するには、"
-
-#: View/Events/automation.ctp:126
-msgid "STIX export"
-msgstr "STIXエクスポート"
-
-#: View/Events/automation.ctp:127
-msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
-msgstr "MISP のイベントを、MITRE の STIX フォーマットでエクスポートすることができます。(STIX については、 <a href=\"https://stix.mitre.org/\">こちら</a>を参照してください) 現時点では、STIX XML でのエクスポートには、大変時間がかかり、大規模なイベントや複数のイベントの場合、タイムアウトすることがあります。JSON フォーマットの場合は、この問題は起こりません。使用方法"
-
-#: View/Events/automation.ctp:129
-msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
-msgstr "検索パラメーターを、URLパラメーターを使用して機能に渡すことや、(戻り値のタイプに応じて) XML または JSON オブジェクトでPOSTすることができます。次のパラメーターを STIX エクスポートツールに渡すことができます。<code>id</code>、<code>withAttachments</code>、<code>tags</code>。<code>id</code>と<code>tags</code>の両方はクエリーを組み立てるために <code>&amp;&amp;</code> (and) と <code>!</code> (not) 演算子を使用することができます。URL パラメーターを使用する場合、シンタックスは次のとおりです"
-
-#: View/Events/automation.ctp:132;171
-msgid "The event's ID"
-msgstr "イベントのID"
-
-#: View/Events/automation.ctp:133
-msgid "Encode attachments where applicable"
-msgstr "該当する場合、添付ファイルをエンコードします"
-
-#: View/Events/automation.ctp:151
-msgid "Various ways to narrow down the search results of the STIX export"
-msgstr "STIX エクスポートの検索結果を絞り込むための様々な方法"
-
-#: View/Events/automation.ctp:152
-msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
-msgstr "例えば、\"APT1\"とタグ付けされたイベントから、\"OSINT\"とタグ付けされたイベントと #51 と #62 のイベントを除外し、添付ファイル無しで取得する場合"
-
-#: View/Events/automation.ctp:154
-msgid "To export the same events using a POST request use"
-msgstr "同様のイベントを POST リクエストを使ってエクスポートする場合は、"
-
-#: View/Events/automation.ctp:156
-msgid "Together with this JSON object in the POST message"
-msgstr "POST メッセージに、この JSON オブジェクトも含める"
-
-#: View/Events/automation.ctp:158
-msgid "XML is automagically assumed when using the stix export"
-msgstr "Stix エクスポートが使用される場合、自動的に XML と見なされます。"
-
-#: View/Events/automation.ctp:160
-msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
-msgstr "同様の検索は、以下の XML オブジェクトを含んだ POST でも可能です (注意として、＆をエスケープするか、id と tag の分離が必要です)。"
-
-#: View/Events/automation.ctp:163
-msgid "RPZ export"
-msgstr "RPZエクスポート"
-
-#: View/Events/automation.ctp:164
-msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
-msgstr ">MISPの RPZ エクスポート機能により、DNS レベルでのファイアウォールで使用できる RPZ ファイルをエクスポートできます。作成されたファイルは、あなたがアクセス可能で IDS フラグが指定されている全てのドメイン、ホスト名、IP-src、IP-dst のアトリビュートを含みます。"
-
-#: View/Events/automation.ctp:165
-msgid "It is possible to further restrict the exported values using the following filters"
-msgstr "次のフィルターを使用して、エクスポートされた値をさらに制限することができます"
-
-#: View/Events/automation.ctp:167
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
-"        "
-msgstr "結果にタグを含めるには、このパラメーターにその名前を書き込んでください。タグを除外するには、先頭に'!'を追加してください。\n"
-"また、いくつかのタグコマンドを '&amp;&amp;' オペレーターでまとめることができます。url 経由で渡す場合、タグ検索ではコロン (:) が使えないことに注意してください。        "
-
-#: View/Events/automation.ctp:170
-msgid "Use semicolons instead (the search will automatically search for colons instead)"
-msgstr "代わりにセミコロンを使用してください (検索ではコロンが自動的に検索されます)"
-
-#: View/Events/automation.ctp:172
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
-msgstr "from 項目で指定された日付より後の日付のイベント (フォーマット: 2015-02-03)"
-
-#: View/Events/automation.ctp:173
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
-msgstr "to 項目に指定された日付より前の日付のイベント (フォーマット: 2015-02-03)"
-
-#: View/Events/automation.ctp:176
-msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
-msgstr "MISP はヘッダー値をゾーンファイルに挿入するだけでなく、オーバーライド可能なすべての値に対して実行するアクションを定義します。デフォルトでは、これらの値は、アプリケーションのデフォルト値か、サイト管理者によって上書きされた値です。値は次のとおりです"
-
-#: View/Events/automation.ctp:180
-msgid "To override the above values, either use the url parameters as described below"
-msgstr "上記の値を上書きするには、下記の url パラメーターを使用するか"
-
-#: View/Events/automation.ctp:182
-msgid "or POST an XML or JSON object with the above listed options"
-msgstr "もしくは 上記のオプションを使用してXML もしくは JSON オブジェクトをPOSTします。"
-
-#: View/Events/automation.ctp:186
-msgid "Text export"
-msgstr "Textエクスポート"
-
-#: View/Events/automation.ctp:187
-msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
-msgstr "> 特定のタイプの全アトリビュートを、プレーンテキストファイルにエクスポート。デフォルトでは、公開され IDS として指定されたアトリビュートのみがエクスポートされます。"
-
-#: View/Events/automation.ctp:194
-msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
-msgstr "結果をタグで制限するには、通常のシンタックスを使用します。タグ検索ではコロン (;) を使用できないことに注意してください。代わりにセミコロンを使用してください (検索ではコロンが自動的に検索されます)。 tag1 のタグが付いており、かつ tag2 のタグが付いていないイベントから ip-src 値を取得するには"
-
-#: View/Events/automation.ctp:197
-msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
-msgstr "バージョン 2.3.38では、2つの追加フラグでテキストのエクスポートを制限することができます。1つ目では、イベント ID に基づいて制限することができます。2つ目は非 IDS フラグのアトリビュートをエクスポートできる真偽値スイッチです。さらに、タイプ項目で\"all\"を選択すると、すべての適格なアトリビュートが返されます。"
-
-#: View/Events/automation.ctp:200
+#: View/Events/automation.ctp:28
+#: View/Events/legacy_automation.ctp:200
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'."
 msgstr "結果にタグを含めるには、このパラメーターにその名前を書き込んでください。タグを除外するには、先頭に'!'を追加してください。"
 
-#: View/Events/automation.ctp:201
-msgid "Only export the attributes of the given event ID"
-msgstr "与えられたイベント ID のアトリビュートのみをエクスポート"
+#: View/Events/automation.ctp:29
+#: View/Events/legacy_automation.ctp:278
+msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
+msgstr "(\"1\"を引数として渡し) これを有効にすると、認証キーと value 以外のすべての他の引数は無視されます。MISP は イベント情報、イベント組織、アトリビュート value1 / value2 項目のいずれか、またはアトリビュートのコメントの値に一致するサブストリングがあるすべてのイベントを xml / json で (送られたヘッダーに応じて) 返します。"
 
-#: View/Events/automation.ctp:202
-msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
-msgstr "通常は除外されていても、to_ids とマークされていないアトリビュートも含みます。また、ホワイトリストの機能をオーバーライドします。"
+#: View/Events/automation.ctp:30;151
+#: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
+msgstr "from 項目で指定された日付より後の日付のイベント (フォーマット: 2015-02-15)。このフィルターは、イベントの日付を使用します。"
 
-#: View/Events/automation.ctp:207
-msgid "Include not published Events."
-msgstr "公開されないイベントも含む"
+#: View/Events/automation.ctp:31;152
+#: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
+msgstr "to 項目で指定された日付より前の日付のイベント (フォーマット: 2015-02-15)。このフィルターは、イベントの日付を使用します。"
 
-#: View/Events/automation.ctp:208;275
-msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
-msgstr "また、いくつかのタグコマンドを '&amp;&amp;' オペレーターでまとめることができます。タグ検索ではコロン (:) が使えないことに注意してください。\n"
-"代わりにセミコロンを使用してください (検索ではコロンが自動的に検索されます)。例えば、tag1 と tag2 のタグが付いているが、tag3 のタグが付いているものは除外したい場合"
+#: View/Events/automation.ctp:32
+#: View/Events/legacy_automation.ctp:282;307
+msgid "The events that should be included / excluded from the search"
+msgstr "検索に含める / 除外するイベント"
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:33
+#: View/Events/legacy_automation.ctp:283;308
+msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
+msgstr "設定されている場合、各アトリビュート内のデータ項目に添付ファイル / zip形式のマルウェアサンプルを base64 でエンコードします。"
+
+#: View/Events/automation.ctp:34
+#: View/Events/legacy_automation.ctp:284
+msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
+msgstr "メタデータ (イベント、タグ、関係) のみが返され、アトリビュートと提案は省略されます。"
+
+#: View/Events/automation.ctp:35
+#: View/Events/legacy_automation.ctp:285;309
+msgid "Restrict the results by uuid."
+msgstr "UUIDに基づいて結果を制限"
+
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:37
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:38
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:39
+#: View/Events/legacy_automation.ctp:288;311
+msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
+msgstr "公開イベントまたは非公開イベントを返すかどうかを設定します。両方が必要な場合、パラメーターを設定しないでください。"
+
+#: View/Events/automation.ctp:40
+#: View/Events/legacy_automation.ctp:289;313
+msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
+msgstr "結果から、警告リストのエントリーに該当するアトリビュートを削除します。"
+
+#: View/Events/automation.ctp:41
+#: View/Events/legacy_automation.ctp:314
+msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
+msgstr "デフォルトの (0) では、to_ids の設定に関係なく、他のフィルターのパラメーターと一致するすべてのアトリビュートが返されます。返されるデータを to_ids が設定されたアトリビュートのみに制限するには、このパラメータを 1 に設定します。特殊な \"exclude\" 設定を使用すると、to_ids フラグが無効なアトリビュートのみを返すことができます。"
+
+#: View/Events/automation.ctp:42
+#: View/Events/legacy_automation.ctp:315
+msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
+msgstr "このパラメーターを 1 に設定すると、ソフト削除されたアトリビュートがアクティなアトリビュートと共に返されます。\"only\"をパラメーターとして使用すると、返されるデータはソフト削除されたデータのみに制限されます。"
+
+#: View/Events/automation.ctp:43
+#: View/Events/legacy_automation.ctp:316
+msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
+msgstr "イベントIDだけではなく、それぞれのアトリビュートにイベント UUID を含めます。"
+
+#: View/Events/automation.ctp:44
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:45
+msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
+msgstr ""
+
+#: View/Events/automation.ctp:46
+msgid "Filter on the event's info field."
+msgstr ""
+
+#: View/Events/automation.ctp:47
+msgid "Search for a full or a substring (delimited by % for substrings) in the event info, event tags, attribute tags, attribute values or attribute comment fields."
+msgstr ""
+
+#: View/Events/automation.ctp:48
+msgid "CSV only, select the fields that you wish to include in the CSV export. By setting event level fields additionally, includeContext is not required to get event metadata."
+msgstr ""
+
+#: View/Events/automation.ctp:49
+msgid "CSV only, add additional event level data to the export. The additional fields can be added via requested_attributes too with more granularity."
+msgstr ""
+
+#: View/Events/automation.ctp:79
+msgid "CSV specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:81
+msgid "Limit the list of fields to be returned in the CSV."
+msgstr ""
+
+#: View/Events/automation.ctp:82
+msgid "Include the event level meta-data with each attribute."
+msgstr ""
+
+#: View/Events/automation.ctp:83
+msgid "The CSV created when this setting is set to true will not contain the header row."
+msgstr ""
+
+#: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
+msgid "RPZ specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:95
+#: View/Events/legacy_automation.ctp:164
+msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
+msgstr ">MISPの RPZ エクスポート機能により、DNS レベルでのファイアウォールで使用できる RPZ ファイルをエクスポートできます。作成されたファイルは、あなたがアクセス可能で IDS フラグが指定されている全てのドメイン、ホスト名、IP-src、IP-dst のアトリビュートを含みます。"
+
+#: View/Events/automation.ctp:98
+#: View/Events/legacy_automation.ctp:176
+msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
+msgstr "MISP はヘッダー値をゾーンファイルに挿入するだけでなく、オーバーライド可能なすべての値に対して実行するアクションを定義します。デフォルトでは、これらの値は、アプリケーションのデフォルト値か、サイト管理者によって上書きされた値です。値は次のとおりです"
+
+#: View/Events/automation.ctp:102
+#: View/Events/legacy_automation.ctp:180
+msgid "To override the above values, either use the url parameters as described below"
+msgstr "上記の値を上書きするには、下記の url パラメーターを使用するか"
+
+#: View/Events/automation.ctp:104
+#: View/Events/legacy_automation.ctp:182
+msgid "or POST an XML or JSON object with the above listed options"
+msgstr "もしくは 上記のオプションを使用してXML もしくは JSON オブジェクトをPOSTします。"
+
+#: View/Events/automation.ctp:108
+#: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr "Bro IDSエクスポート"
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:109
+#: View/Events/legacy_automation.ctp:212
 msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
 msgstr "特定の bro タイプの全アトリビュートを、書式化したテキストファイルにエクスポート。デフォルトでは、公開され IDS として指定されたアトリビュートのみがエクスポートされます。"
 
-#: View/Events/automation.ctp:213
+#: View/Events/automation.ctp:110
+#: View/Events/legacy_automation.ctp:213
 msgid "You can configure your tools to automatically download a file one of the Bro types."
 msgstr "特定のタイプの Bro ファイルを自動的にダウンロードするようにツールを設定することができます。"
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:116
+#: View/Events/legacy_automation.ctp:219
 msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
 msgstr "Tag による絞り込みには、通常のシンタックスを使います。tag にはコロン (:) は使えないので、代わりにセミコロン (;) を使ってください (検索時に自動的にコロン (:) に置き換えて検索します)。tag1 が付き、tag2 が付いてないイベントから Ip を取得するには、"
 
-#: View/Events/automation.ctp:222
+#: View/Events/automation.ctp:119
+#: View/Events/legacy_automation.ctp:222
 msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
 msgstr "一連のフィルターに基づいて Bro のエクスポートを制限することができます。 Bro API に JSON オブジェクトまたは XML を POST し、結果をフィルタリングします。"
 
-#: View/Events/automation.ctp:240
+#: View/Events/automation.ctp:137
+#: View/Events/legacy_automation.ctp:240
 msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
 msgstr "URLのパラメーターを介してフィルターを渡すこともできますが、その代りに、POST リクエストと JSON オブジェクトを使用することを強くお勧めします。フォーマットは以下の通りです"
 
-#: View/Events/automation.ctp:242
+#: View/Events/automation.ctp:139
+#: View/Events/legacy_automation.ctp:242
 msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
 msgstr "Bro タイプ、任意の有効な Bro タイプが受け入れられます。Bro タイプと MISP のタイプのマッピングは次のとおりです"
 
-#: View/Events/automation.ctp:249;301
+#: View/Events/automation.ctp:146
+#: View/Events/legacy_automation.ctp:249;301
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
 "    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
 "    Use semicolons instead (the search will automatically search for colons instead)."
@@ -5932,422 +6325,413 @@ msgstr "結果にタグを含めるには、このパラメーターにその名
 "また、いくつかのタグコマンドを '&amp;&amp;' オペレーターでまとめることができます。タグ検索ではコロン (:) が使えないことに注意してください。\n"
 "代わりにセミコロンを使用してください (検索ではコロンが自動的に検索されます)。"
 
-#: View/Events/automation.ctp:252
+#: View/Events/automation.ctp:149
+#: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr "結果を与えられたイベント IDs のみに限定する。"
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:150
+#: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr "\"to_ids\"としてマークされていないアトリビュートのエクスポートを許可する。"
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr "直近のある時間内に公開されたイベント (例えば、5d (日) や 12h (時間)、30m (分)) 。このフィルターはイベントの公開時間に対し有効です。"
+
+#: View/Events/automation.ctp:154
+#: View/Events/legacy_automation.ctp:95;120;174;206;257
+msgid "All attributes that have a hit on a warninglist will be excluded."
+msgstr "警告リストにヒットしたすべてのアトリビュートが除外されます。"
+
+#: View/Events/automation.ctp:156
+#: View/Events/legacy_automation.ctp:41;70;97;122;259;290
+msgid "The keywords false or null should be used for optional empty parameters in the URL."
+msgstr "URL中のオプションの空パラメーターには、キーワード false または null を使用してください。"
+
+#: View/Events/automation.ctp:157
+#: View/Events/legacy_automation.ctp:260
 msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
 msgstr "例えば、IDS としてマークされていないものを含め、イベント #5 のすべてのアトリビュートを取得するには、次を使用します"
 
-#: View/Events/automation.ctp:263
-msgid "Searches with JSON/XML/OpenIOC results"
-msgstr "JSON/XML/OpenIOC での検索結果"
-
-#: View/Events/automation.ctp:264
-msgid "It is possible to search the database for attributes based on a list of criteria."
-msgstr "いくつかの条件に基づいて、データベースからアトリビュートを検索することが可能です。"
-
-#: View/Events/automation.ctp:265
-msgid "To return an event or a list of events in a desired format, use the following syntax"
-msgstr "イベントまたはイベントの一覧を希望するフォーマットで返すには、次のシンタックスを使用します"
-
-#: View/Events/automation.ctp:267
-msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
-msgstr "検索結果のフォーマットを設定します (現時点でのサポート: json, xml, openioc - 今後フォーマットが追加されます)。"
-
-#: View/Events/automation.ctp:268;297
-msgid "Search for the given value in the attributes' value field."
-msgstr "指定されたアトリビュート値の項目で検索をします。"
-
-#: View/Events/automation.ctp:271;300
-msgid "Search by the creator organisation by supplying the organisation identifier."
-msgstr "組織の識別子を指定し、作成者組織を検索します。"
-
-#: View/Events/automation.ctp:272
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
-msgstr "タグを結果に含めるためには、その名前をパラメーターに書き込みます。タグを除外するためには '!' を追加します。\n"
-"同じパラメーターの複数の値をフィルターするためには、次の例のように配列を使用します"
-
-#: View/Events/automation.ctp:278
-msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
-msgstr "(\"1\"を引数として渡し) これを有効にすると、認証キーと value 以外のすべての他の引数は無視されます。MISP は イベント情報、イベント組織、アトリビュート value1 / value2 項目のいずれか、またはアトリビュートのコメントの値に一致するサブストリングがあるすべてのイベントを xml / json で (送られたヘッダーに応じて) 返します。"
-
-#: View/Events/automation.ctp:282;307
-msgid "The events that should be included / excluded from the search"
-msgstr "検索に含める / 除外するイベント"
-
-#: View/Events/automation.ctp:283;308
-msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
-msgstr "設定されている場合、各アトリビュート内のデータ項目に添付ファイル / zip形式のマルウェアサンプルを base64 でエンコードします。"
-
-#: View/Events/automation.ctp:284
-msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
-msgstr "メタデータ (イベント、タグ、関係) のみが返され、アトリビュートと提案は省略されます。"
-
-#: View/Events/automation.ctp:285;309
-msgid "Restrict the results by uuid."
-msgstr "UUIDに基づいて結果を制限"
-
-#: View/Events/automation.ctp:286;310
-msgid "Restrict the results by the last publish timestamp (newer than)."
-msgstr "最新の公開タイムスタンプ(より新しいもののみ)に結果を制限します。"
-
-#: View/Events/automation.ctp:287
-msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
-msgstr "結果を (最終編集の) タイムスタンプ で制限します。指定されたタイムスタンプより新しいタイムスタンプのイベントが返されます。スコープとして /attributes を扱っている場合、アトリビュートのタイムスタンプがルックアップに使用されます。"
-
-#: View/Events/automation.ctp:288;311
-msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
-msgstr "公開イベントまたは非公開イベントを返すかどうかを設定します。両方が必要な場合、パラメーターを設定しないでください。"
-
-#: View/Events/automation.ctp:289;313
-msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
-msgstr "結果から、警告リストのエントリーに該当するアトリビュートを削除します。"
-
-#: View/Events/automation.ctp:291
-msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
-msgstr "例えば、\"red october\" に言及しているイベントを見つけるためには、次のシンタックスを使用します (この例は、GET の代わりに POST リクエストを使用します。これが推奨されます。GET リクエストは問題があり、非推奨です。)"
-
-#: View/Events/automation.ctp:294;320;349
-msgid "POST message payload (json)"
-msgstr "POST メッセージのペイロード (json)"
-
-#: View/Events/automation.ctp:296
-msgid "To just return a list of attributes, use the following syntax"
-msgstr "アトリビュートのリストを返すには、次のシンタックスを使用します"
-
-#: View/Events/automation.ctp:304
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
-msgstr "from 項目で指定された日付より後の日付のイベント (フォーマット: 2015-02-15)"
-
-#: View/Events/automation.ctp:305
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
-msgstr "to 項目に指定された日付より前の日付のイベント (フォーマット: 2015-02-15)"
-
-#: View/Events/automation.ctp:312
-msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
-msgstr "結果を(アトリビュートの)タイムスタンプで制限します。 指定したタイムスタンプより新しいタイムスタンプを持つアトリビュートが返されます。"
-
-#: View/Events/automation.ctp:314
-msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
-msgstr "デフォルトの (0) では、to_ids の設定に関係なく、他のフィルターのパラメーターと一致するすべてのアトリビュートが返されます。返されるデータを to_ids が設定されたアトリビュートのみに制限するには、このパラメータを 1 に設定します。特殊な \"exclude\" 設定を使用すると、to_ids フラグが無効なアトリビュートのみを返すことができます。"
-
-#: View/Events/automation.ctp:315
-msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
-msgstr "このパラメーターを 1 に設定すると、ソフト削除されたアトリビュートがアクティなアトリビュートと共に返されます。\"only\"をパラメーターとして使用すると、返されるデータはソフト削除されたデータのみに制限されます。"
-
-#: View/Events/automation.ctp:316
-msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
-msgstr "イベントIDだけではなく、それぞれのアトリビュートにイベント UUID を含めます。"
-
-#: View/Events/automation.ctp:317
-msgid "Only return attributes from events that have received a modification after the given timestamp."
-msgstr "指定されたタイムスタンプより後に変更を受けたイベントのアトリビュートのみを返します。"
-
-#: View/Events/automation.ctp:322
-msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
-msgstr "false または null キーワードは、URL 中のオプションの空パラメーターに使用する必要があります。非推奨のURLパラーメーターを使用する場合にのみ必要であることに留意してください。"
-
-#: View/Events/automation.ctp:324
-msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
-"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
-msgstr "value、type、category と org はオプションです。各カテゴリーのいくつかの用語を、'&amp;&amp;'演算子でまとめて検索することができます。'!'演算子で否定することもできます。タグ検索ではコロン (:) が使えないことに注意してください。\n"
-"代わりにセミコロンを使用してください (検索ではコロンが自動的に検索されます)。例えば、所属組織で作られたすべてのアトリビュートで、ip-src タイプに 192.168 と 127.0 を持っており、かつ tag1 とタグ付けされたイベントを除外したものを検索したい場合、次を使用します"
-
-#: View/Events/automation.ctp:327
-msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
-msgstr "CIDR を使用して IP アドレスの検索もできます。 ' |'(パイプ) の代わりに '/' (スラッシュ) を使うこともできます。タグ検索ではコロン (:) は使用できません。代わりにセミコロンを使用します。 (コロンを使って検索した場合、自動的にセミコロンとして検索されます)。以下に例を示します。"
-
-#: View/Events/automation.ctp:329
+#: View/Events/automation.ctp:160
+#: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr "指定されたタイプのイベントのアトリビュートを XML としてエクスポートする"
 
-#: View/Events/automation.ctp:330
+#: View/Events/automation.ctp:161
+#: View/Events/legacy_automation.ctp:330
 msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
 msgstr "イベントに属する事前定義されたタイプのすべてのアトリビュートをエクスポートする場合は、次のシンタックスを使用します"
 
-#: View/Events/automation.ctp:332
+#: View/Events/automation.ctp:163
+#: View/Events/legacy_automation.ctp:332
 msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
 "    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
 "    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
 msgstr "sigOnly は IDS フラグがオンになっていないすべてのアトリビュートがエクスポートされるのをブロックするオプションのフラグです。'&amp;&amp;' 演算子でいくつかのタイプを検索し、'!' 演算子で値を除外することができます。\n"
 "例えば、イベント25から、すべての md5 と sha256 タイプの IDS シグネチャーのアトリビュートで、しかし filename | md5 and filename | sha256 ではないものを取得するには、次を使用します"
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:168
+#: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr "添付ファイル or マルウェアサンプルのダウンロード"
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:169
+#: View/Events/legacy_automation.ctp:338
 msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
 msgstr "マルウェアサンプルまたは添付ファイルのアトリビュート ID を知っている場合、以下のシンタックスでそれをダウンロードすることができます"
 
-#: View/Events/automation.ctp:340
+#: View/Events/automation.ctp:171
+#: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr "ハッシュによるマルウェアサンプルのダウンロード"
 
-#: View/Events/automation.ctp:341
+#: View/Events/automation.ctp:172
+#: View/Events/legacy_automation.ctp:341
 msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
 msgstr "既知の MD5 ハッシュを用いてサンプルをダウンロードすることもできます。 ハッシュを JSON/XML オブジェクトまたは URL (渡されたオブジェクトをオーバーライドした URL)に渡すだけで、いくつかのコンテキスト情報と共に zip で圧縮した base64 エンコードされたサンプルの JSON/XML オブジェクトを受け取ることができます。"
 
-#: View/Events/automation.ctp:342
+#: View/Events/automation.ctp:173
+#: View/Events/legacy_automation.ctp:342
 msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
 msgstr "このAPIを使用して、渡されたハッシュを含むイベントからすべてのサンプルを取得することもできます。 この機能を利用するには、allSamples フラグを渡してください。 一致するイベントからすべてのサンプルを取得する場合、ルックアップ用にサポートされているすべてのハッシュタイプ (%s) を使用できます。</p>"
 
-#: View/Events/automation.ctp:343
+#: View/Events/automation.ctp:174
+#: View/Events/legacy_automation.ctp:343
 msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
 msgstr "イベント ID パラメーターを渡すことで、そのイベント ID を持つイベントからすべてのサンプルを取得することもできます。 イベント ID またはハッシュのどちらかが渡されていることを確認してください。それ以外の場合、エラーメッセージが返されます。 また、ハッシュが設定されていない場合、allSamples フラグが自動的に設定されます。"
 
-#: View/Events/automation.ctp:345
+#: View/Events/automation.ctp:176
+#: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr "POST メッセージのペイロード (XML)"
 
-#: View/Events/automation.ctp:353
+#: View/Events/automation.ctp:180
+#: View/Events/legacy_automation.ctp:294;320;349
+msgid "POST message payload (json)"
+msgstr "POST メッセージのペイロード (json)"
+
+#: View/Events/automation.ctp:184
+#: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr "渡されたオブジェクトのすべてのパラメーターの簡単な説明"
 
-#: View/Events/automation.ctp:354
+#: View/Events/automation.ctp:185
+#: View/Events/legacy_automation.ctp:354
 msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
 msgstr "MD5 フォーマットのハッシュ。allSamples が設定されている場合、次の内のいずれかになります: %s"
 
-#: View/Events/automation.ctp:355
+#: View/Events/automation.ctp:186
+#: View/Events/legacy_automation.ctp:355
 msgid "If set, it will return all samples from events that have a match for the hash provided above."
 msgstr "設定されている場合、上記のハッシュと一致するイベントのすべてのサンプルが返されます。"
 
-#: View/Events/automation.ctp:356
+#: View/Events/automation.ctp:187
+#: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr "セットされている場合、与えられたイベント ID からのみデータを取得します。"
 
-#: View/Events/automation.ctp:357
+#: View/Events/automation.ctp:188
+#: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr "\"サンプルのアップロード\" API を使用してマルウェアサンプルをアップロードする"
 
-#: View/Events/automation.ctp:359
+#: View/Events/automation.ctp:190
+#: View/Events/legacy_automation.ctp:359
 msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
 msgstr "このAPIを使用すると、あなたが変更権限をもつマルウェアのサンプル（および関連するすべてのハッシュ）にイベントを追加することができます。また、イベント ID を入力しない場合、新しいイベントが作成されます。"
 
-#: View/Events/automation.ctp:360
+#: View/Events/automation.ctp:191
+#: View/Events/legacy_automation.ctp:360
 msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
 msgstr "ファイルは、base64 でエンコードして、以下に示すように POST しなければいけません。全てのサンプルは、パスワード付きの ZIP 形式です。(パスワードは、”infected”) オリジナルファイルのハッシュは、付加アトリビュートに入ります。"
 
-#: View/Events/automation.ctp:361
+#: View/Events/automation.ctp:192
+#: View/Events/legacy_automation.ctp:361
 msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
 msgstr "イベントIDはオプションです。 MISP は、上記の URL へ POST された JSON オブジェクトまたはXMLオブジェクトを受け入れます。"
 
-#: View/Events/automation.ctp:362
+#: View/Events/automation.ctp:193
+#: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr "期待されるオブジェクトの一般的な構造は次のとおりです"
 
-#: View/Events/automation.ctp:371
+#: View/Events/automation.ctp:202
+#: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr "以下のオプションパラメーターが期待されます"
 
-#: View/Events/automation.ctp:372
+#: View/Events/automation.ctp:203
+#: View/Events/legacy_automation.ctp:372
 msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
 msgstr "イベント ID はオプションです。イベント ID は、URL もしくは POST したオブジェクトで指定します。もし両方にイベント ID が含まれていた時は、URL が優先されます。イベント ID が指定されていなければ、POST された全てのマルウェアサンプルに対して、一つの新しいイベントを作成します。あなたは、イベントのデフォルトの定義を設定できます。もしも、設定していなければ、一連のデフォルト値が設定されます。"
 
-#: View/Events/automation.ctp:373
+#: View/Events/automation.ctp:204
+#: View/Events/legacy_automation.ctp:373
 msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
 msgstr "関連する場合、アトリビュートと新しく作成されたイベント用のディストリビューション設定。 [0-3]"
 
-#: View/Events/automation.ctp:374
+#: View/Events/automation.ctp:205
+#: View/Events/legacy_automation.ctp:374
 msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
 msgstr "トランザクション中に作成されたすべてのアトリビュートを\"to_ids\"としてマークするか否かフラグを付けることができます。"
 
-#: View/Events/automation.ctp:375
+#: View/Events/automation.ctp:206
+#: View/Events/legacy_automation.ctp:375
 msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 msgstr "アップロードされたサンプルに割り当てられるカテゴリー。有効なオプション: Payload delivery, Artefacts dropped, Payload Installation, External Analysis。"
 
-#: View/Events/automation.ctp:376
+#: View/Events/automation.ctp:207
+#: View/Events/legacy_automation.ctp:376
 msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
 msgstr "イベント ID が指定されていない場合、イベント情報項目への入力に使用されます。あるいは、設定されていない場合、MISP は指定された日に生成されたマルウェアサンプルコレクションであることを示すメッセージを生成します。"
 
-#: View/Events/automation.ctp:377
+#: View/Events/automation.ctp:208
+#: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr "該当する場合、新しく作成されたイベントの解析レベル。[0-2]"
 
-#: View/Events/automation.ctp:378
+#: View/Events/automation.ctp:209
+#: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr "該当する場合、新しく作成されたイベントの脅威レベル ID。 [0-3]"
 
-#: View/Events/automation.ctp:379
+#: View/Events/automation.ctp:210
+#: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr "これは、この API を使用して作成された任意のアトリビュートのコメント項目に追加されます。"
 
-#: View/Events/automation.ctp:380
+#: View/Events/automation.ctp:211
+#: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr "イベントにタグを追加または削除"
 
-#: View/Events/automation.ctp:381
+#: View/Events/automation.ctp:212
+#: View/Events/legacy_automation.ctp:381
 msgid "You can add or remove an existing tag from an event in the following way"
 msgstr "イベントへのタグの追加または削除は以下の方法でできます"
 
-#: View/Events/automation.ctp:384
+#: View/Events/automation.ctp:215
+#: View/Events/legacy_automation.ctp:384
 msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
 msgstr "(イベントからタグを追加するか削除するかによって適切な API へ) JSON オブジェクトを次の形式で POST します"
 
-#: View/Events/automation.ctp:386
+#: View/Events/automation.ctp:217
+#: View/Events/legacy_automation.ctp:386
 msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
 msgstr "\"tag\" はタグの ID です。下記の方法でタグの名前を使用することもできます。"
 
-#: View/Events/automation.ctp:388
+#: View/Events/automation.ctp:219
+#: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr "提案及びAPI"
 
-#: View/Events/automation.ctp:389
+#: View/Events/automation.ctp:220
+#: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr "バージョン 2.3.148 以降は直接 API 経由で提案ができます。"
 
-#: View/Events/automation.ctp:393
+#: View/Events/automation.ctp:224
+#: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr "HTTP"
 
-#: View/Events/automation.ctp:394
+#: View/Events/automation.ctp:225
+#: View/Events/legacy_automation.ctp:394
 #: View/Pages/doc/using_the_system.ctp:445
-#: View/SharingGroups/add.ctp:52
-#: View/SharingGroups/edit.ctp:60
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
 msgid "URL"
 msgstr "URL"
 
-#: View/Events/automation.ctp:395
+#: View/Events/automation.ctp:226
+#: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr "説明"
 
-#: View/Events/automation.ctp:396
+#: View/Events/automation.ctp:227
+#: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr "期待されるペイロード"
 
-#: View/Events/automation.ctp:397
-#: View/Servers/rest.ctp:53
+#: View/Events/automation.ctp:228
+#: View/Events/legacy_automation.ctp:397
+#: View/Servers/rest.ctp:115
 msgid "Response"
 msgstr "応答"
 
-#: View/Events/automation.ctp:402
+#: View/Events/automation.ctp:233
+#: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr "提案を表示"
 
-#: View/Events/automation.ctp:404;424;425;431;432
+#: View/Events/automation.ctp:235;255;256;262;263
+#: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr "シャドウ アトリビュート オブジェクト"
 
-#: View/Events/automation.ctp:409
+#: View/Events/automation.ctp:240
+#: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr "所属組織のイベントへのすべての提案を表示"
 
-#: View/Events/automation.ctp:411;418
+#: View/Events/automation.ctp:242;249
+#: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr "シャドウ アトリビュート オブジェクト"
 
-#: View/Events/automation.ctp:416
+#: View/Events/automation.ctp:247
+#: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr "イベントの提案をすべて表示"
 
-#: View/Events/automation.ctp:423
+#: View/Events/automation.ctp:254
+#: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr "イベントへ新しいアトリビュートを提案"
 
-#: View/Events/automation.ctp:430
+#: View/Events/automation.ctp:261
+#: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr "アトリビュートの編集を提案"
 
-#: View/Events/automation.ctp:437
+#: View/Events/automation.ctp:268
+#: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr "提案を承認"
 
-#: View/Events/automation.ctp:439;446
+#: View/Events/automation.ctp:270;277
+#: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
 #: View/Pages/doc/using_the_system.ctp:254
 msgid "Message"
 msgstr "メッセージ"
 
-#: View/Events/automation.ctp:444
+#: View/Events/automation.ctp:275
+#: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr "提案を破棄"
 
-#: View/Events/automation.ctp:449
+#: View/Events/automation.ctp:280
+#: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr "シャドウアトリビュート オブジェクトをポストする場合、以下のフォーマットを使用してください"
 
-#: View/Events/automation.ctp:454
+#: View/Events/automation.ctp:285
+#: View/Events/legacy_automation.ctp:454
 msgid "None of the above fields are mandatory, but at least one of them has to be provided."
 msgstr "上記の項目は必須ではありませんが、少なくとも1つを提供する必要があります。"
 
-#: View/Events/automation.ctp:456
+#: View/Events/automation.ctp:287
+#: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr "イベントメタデータのフィルタリング"
 
-#: View/Events/automation.ctp:457
+#: View/Events/automation.ctp:288
+#: View/Events/legacy_automation.ctp:457
 msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
 msgstr "REST のセクションで説明したように、/events API に GET リクエストを送信することで、メタデータと共にイベントのリストを取得することができます。しかしながら、この API は特に多様です。検索パラメーターを渡すと、イベントのさまざまな項目を検索し、一致したイベントのリストを (メタデータと共に) 取得することができます。次の URL を使用してください"
 
-#: View/Events/automation.ctp:461
+#: View/Events/automation.ctp:292
+#: View/Events/legacy_automation.ctp:461
 msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
 "    An example for a valid lookup"
 msgstr "JSON で結果を受け取るために、希望する検索項目と値を含む JSON オブジェクトをPOST します。<br />\n"
 "有効な検索の例"
 
-#: View/Events/automation.ctp:472
+#: View/Events/automation.ctp:303
+#: View/Events/legacy_automation.ctp:472
 msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
 msgstr "上記は、あなたの組織内に限らず、イベントの説明に \"Locky\" を含むすべての公開イベントを返します。必要に応じて、エクスクラメーションマークを使用して値を否定することができます。"
 
-#: View/Events/automation.ctp:473
+#: View/Events/automation.ctp:304
+#: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr "有効なパラーメーターのリスト"
 
-#: View/Events/automation.ctp:474
+#: View/Events/automation.ctp:305
+#: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr "公開 or 非公開イベントのフィルター [0, 1] - 否定可能"
 
-#: View/Events/automation.ctp:475
+#: View/Events/automation.ctp:306
+#: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr "イベント情報上の文字列のフィルター - 否定可能"
 
-#: View/Events/automation.ctp:476
+#: View/Events/automation.ctp:307
+#: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr "追加されたタグ名のフィルター - 否定可能"
 
-#: View/Events/automation.ctp:477
+#: View/Events/automation.ctp:308
+#: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr "特定のイベント ID のフィルター - 否定可能"
 
-#: View/Events/automation.ctp:478
+#: View/Events/automation.ctp:309
+#: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr "イベントの脅威レベルのフィルター [1,2,3,4] - 否定可能"
 
-#: View/Events/automation.ctp:479
+#: View/Events/automation.ctp:310
+#: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr "ディストリビューション レベルのフィルター [0,1,2,3] - 否定可能"
 
-#: View/Events/automation.ctp:480
+#: View/Events/automation.ctp:311
+#: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr "イベントの解析フェーズのフィルター [0,1,2] - 否定可能"
 
-#: View/Events/automation.ctp:481
+#: View/Events/automation.ctp:312
+#: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr "含まれているアトリビュート値のフィルター - 否定可能"
 
-#: View/Events/automation.ctp:482
+#: View/Events/automation.ctp:313
+#: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr "作成者の組織のフィルター - 否定可能"
 
-#: View/Events/automation.ctp:483
+#: View/Events/automation.ctp:314
+#: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr "作成ユーザーのEメールアドレスのフィルター (管理者のみ) - 否定可能"
 
-#: View/Events/automation.ctp:484
+#: View/Events/automation.ctp:315
+#: View/Events/legacy_automation.ctp:484
 msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr "日付のフィルター、YYYY-MM-DD フォーマットで指定された日付よりも新しいものが取得される - 否定不可"
 
-#: View/Events/automation.ctp:485
+#: View/Events/automation.ctp:316
+#: View/Events/legacy_automation.ctp:485
 msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr "日付のフィルター、YYYY-MM-DD フォーマットで指定された日付よりも古いものが取得される - 否定不可"
 
+#: View/Events/automation.ctp:319
+msgid "Freetext Import API"
+msgstr ""
+
+#: View/Events/automation.ctp:321
+msgid "The freetext import tool is also exposed to the API."
+msgstr ""
+
+#: View/Events/automation.ctp:322
+msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
+msgstr ""
+
+#: View/Events/automation.ctp:323
+msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:324
+msgid "The contents of the POST body should be the text to be parsed."
+msgstr ""
+
 #: View/Events/contact.ctp:8
 msgid "Contact organization reporting event "
 msgstr "イベントを報告した組織に連絡 "
@@ -6543,7 +6927,7 @@ msgid "Ongoing"
 msgstr "実行中"
 
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:9;101
+#: View/Jobs/index.ctp:9;136
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr "完了"
@@ -6567,7 +6951,7 @@ msgid "All communities"
 msgstr "すべてのコミュニティ"
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:53
+#: View/Feeds/index.ctp:103
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr "対象"
@@ -6619,48 +7003,386 @@ msgstr "入力ファイル"
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/Organisations/view.ctp:97;98
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:33
 msgid "Events"
 msgstr "イベント"
 
-#: View/Events/index.ctp:30
-msgid "Filter events"
-msgstr "イベントをフィルター"
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
+msgstr "フィルターを変更"
 
-#: View/Events/index.ctp:31
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr "選択したイベントを削除"
 
-#: View/Events/index.ctp:44
-msgid "Quickfilter"
-msgstr "クイックフィルタ"
+#: View/Events/index.ctp:73
+msgid "My events only"
+msgstr "マイイベントのみ"
 
-#: View/Events/index.ctp:44
-#: View/Organisations/index.ctp:59
-#: View/Servers/preview_index.ctp:45
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr "マイイベント"
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr "自組織のイベントのみ"
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr "組織のイベント"
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
 msgid "Filter"
 msgstr "フィルター"
 
-#: View/Events/index.ctp:58
-msgid "My events only"
-msgstr "マイイベントのみ"
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
+msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My Events"
-msgstr "マイイベント"
+#: View/Events/legacy_automation.ctp:3
+msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
+"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgstr "自動化機能は、侵入検知システムのシグネチャーを自動的に生成するように設計されています。特定のアトリビュートのシグネチャー生成を有効にするには、このアトリビュートのシグネチャー項目を Yes に設定する必要があります。すべてのアトリビュートタイプがシグネチャー生成に適用できるわけではないことに注意してください。現在、IP、ドメイン、ホスト名、ユーザエージェントなどの NIDS シグネチャー生成と、ファイルアーティファクトの MD5/SHA1 値のハッシュリスト生成のみがサポートされています。より多くのアトリビュートタイプのサポートが計画されています。この機能を自動化ツールで利用できるようにするために、認証キーが使用されます。これにより、フォームベースの認証を行わなくても、ツールがデータに簡単にアクセスできるようになります。"
 
-#: View/Events/index.ctp:72
-msgid "My organisation's events only"
-msgstr "自組織のイベントのみ"
+#: View/Events/legacy_automation.ctp:6
+msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgstr "そのキーでデータベース全体にアクセスできてしまうので、秘密にしておいてください!"
 
-#: View/Events/index.ctp:72
-msgid "Org Events"
-msgstr "組織のイベント"
+#: View/Events/legacy_automation.ctp:10
+msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
+msgstr "バージョン 2.2 から、URL に認証鍵を含める方法は、推奨されません。今後は、リクエストの Authorization ヘッダに、認証鍵を指定します。URL に認証鍵を含める従来の方法は、一時的にサポートされていますが、推奨しません。"
+
+#: View/Events/legacy_automation.ctp:11
+msgid "Please use the use the following header"
+msgstr "以下のHTTPヘッダを使用してください"
+
+#: View/Events/legacy_automation.ctp:12
+msgid "Authorization"
+msgstr "Authorization"
+
+#: View/Events/legacy_automation.ctp:13
+msgid "XML Export"
+msgstr "XMLエクスポート"
+
+#: View/Events/legacy_automation.ctp:14
+msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+msgstr "すべてのイベントとアトリビュート <small>(添付ファイルを除く)</small> の自動エクスポートは、カスタムXMLフォーマットでのみ利用可能です。"
+
+#: View/Events/legacy_automation.ctp:15;47;76
+msgid "You can configure your tools to automatically download the following file"
+msgstr "以下のファイルを自動的にダウンロードするようにツールを設定することができます"
+
+#: View/Events/legacy_automation.ctp:17
+msgid "If you only want to fetch a specific event append the eventid number"
+msgstr "特定のイベントのみを取得したい場合 eventid 番号を追加"
+
+#: View/Events/legacy_automation.ctp:19;144
+msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+msgstr "追加パラメーターを含む XML または JSON オブジェクトを次のフォーマットでポストできます"
+
+#: View/Events/legacy_automation.ctp:26
+msgid "The xml download also accepts two additional the following optional parameters in the URL"
+msgstr "xml のダウンロードでは、 URL に次の2つのオプションパラメーターを追加できます"
+
+#: View/Events/legacy_automation.ctp:29;52;85
+msgid "Restrict the download to a single event"
+msgstr "ダウンロードを1つのイベントに制限"
+
+#: View/Events/legacy_automation.ctp:30
+msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+msgstr "添付ファイルをエンコードするかどうかを決定する真偽値項目と適切なタグを制御する第2パラーメーター。"
+
+#: View/Events/legacy_automation.ctp:31;54;87;112;134
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr "結果にタグを含めるには、このパラメーターにその名前を書き込んでください。タグを除外するには、先頭に'!'を追加してください。\n"
+"また、いくつかのタグコマンドを '&amp;&amp;' オペレーターでまとめることができます。タグ検索ではコロン (:) が使えないことに注意してください。\n"
+"代わりにセミコロンを使用してください (検索ではコロンが自動的に検索されます)。例えば、tag1 と tag2 のタグが付いているが、tag3 のタグが付いているものは除外したい場合"
+
+#: View/Events/legacy_automation.ctp:43
+msgid "Also check out the %s to read about the REST API."
+msgstr "また REST API を読んで知るために %s をチェックしてください。"
+
+#: View/Events/legacy_automation.ctp:45
+msgid "CSV Export"
+msgstr "CSVエクスポート"
+
+#: View/Events/legacy_automation.ctp:46
+msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
+msgstr "アトリビュートの自動エクスポートは CSV に対応しています。 \"to_ids\" というフラグが立てられたアトリビュートだけがエクスポートされます。"
+
+#: View/Events/legacy_automation.ctp:49
+msgid "You can specify additional flags for CSV exports as follows"
+msgstr "CSV エクスポート用に追加するフラグを下記のように指定することができます"
+
+#: View/Events/legacy_automation.ctp:53
+msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
+msgstr "このフラグを true に設定すると、\"to_ids\"とマークされていないアトリビュートが含まれます。"
+
+#: View/Events/legacy_automation.ctp:58
+msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
+msgstr "\"tag1\"または\"tag2\"がタグ付けされ、かつ \"tag3\"がタグ付けされていないイベントに制限し、かつ IDS フラグが立った\"domain\"タイプと\"Network activity\"カテゴリーのアトリビュートを csv でダウンロードするためには、次のシンタックスを使用します"
+
+#: View/Events/legacy_automation.ctp:63
+msgid "Include the event data with each attribute."
+msgstr "各アトリビュートを持つイベントデータが含まれます。"
+
+#: View/Events/legacy_automation.ctp:66
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+msgstr "最後の x 時間内に発行されたイベント。x は日、時、分(たとえば5dまたは12hまたは30m)で定義できます。このフィルターにはイベントの公開タイムスタンプが使用されます。"
+
+#: View/Events/legacy_automation.ctp:67
+msgid "The CSV created when this setting is set to true will not contain the header row.\n"
+"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
+msgstr "この設定を true にした際に作成される CSV には、ヘッダー行は含まれません。\n"
+"<b>enforceWarninglist</b>: 警告リストに該当したすべてのアトリビュートは除外されます。"
+
+#: View/Events/legacy_automation.ctp:71
+msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
+msgstr "すべてのイベントから\"domain\"タイプのアトリビュートをエクスポートするには、次のシンタックスを使用します"
+
+#: View/Events/legacy_automation.ctp:74
+msgid "NIDS rules export"
+msgstr "NIDSルール エクスポート"
+
+#: View/Events/legacy_automation.ctp:75
+msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr "ネットワーク関連のすべてのアトリビュートの自動エクスポートは Snort ルールのフォーマットで利用できます。<em>公開された</em>イベントと <em>IDS シグネチャー</em>としてマークされたアトリビュートのみがエクスポートされます。"
+
+#: View/Events/legacy_automation.ctp:81
+msgid "The full API syntax is as follows"
+msgstr "API の完全なシンタックスは以下の通り"
+
+#: View/Events/legacy_automation.ctp:84
+msgid "The export format, can be \"suricata\" or \"snort\""
+msgstr "エクスポートのフォーマット、\"suricata\" または \"snort\""
+
+#: View/Events/legacy_automation.ctp:86
+msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
+msgstr "データのフレーミングを行う、いくつかのコメントアウトされた説明。様々な選択したイベントからエクスポートのリストを連結する場合に、コメントの重複を避けるためにはこれを無効化してください。"
+
+#: View/Events/legacy_automation.ctp:93
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr "直近の x 時間内に公開されたイベント、x は日、時間、分で定義することができます。(例えば、6d や 12h、30m) 。このフィルターはイベントの公開タイムスタンプに対して有効です。"
+
+#: View/Events/legacy_automation.ctp:94
+msgid "Restrict the export to only use the given types."
+msgstr "与えられたタイプのみエクスポートするように制限します。"
+
+#: View/Events/legacy_automation.ctp:96
+msgid "All tags will be included even if not exportable."
+msgstr "エクスポート不可能なものも含み、すべてのタグが含まれます。"
+
+#: View/Events/legacy_automation.ctp:98
+msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
+msgstr "コメントのすべての情報をファイルの先頭に含めず、tag1 とタグ付けされていないすべてのイベントを suricata エクスポートする例はこの様になります:"
+
+#: View/Events/legacy_automation.ctp:100
+msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
+msgstr "管理者は、ホスト、ドメイン名、および IP アドレスを含むホワイトリストを管理し、 NIDS エクスポートから除外することができます。"
+
+#: View/Events/legacy_automation.ctp:102
+msgid "Hash database export"
+msgstr "ハッシュデーターベースをエクスポート"
+
+#: View/Events/legacy_automation.ctp:103
+msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr "ファイル関連のアトリビュートに含まれるMD5 / SHA1チェックサムの自動エクスポート。 このリストは、疑わしいファイルを検索するときにフォレンジックソフトウェアへフィードするために使用できます。 <em>公開</em> と <em>IDS シグネチャー</em>してマークされたイベントおよびアトリビュートのみがエクスポートされます。"
+
+#: View/Events/legacy_automation.ctp:104;188
+msgid "You can configure your tools to automatically download the following files"
+msgstr "以下のファイルを自動的にダウンロードするようにツールを設定することができます"
+
+#: View/Events/legacy_automation.ctp:109
+msgid "The API's full format is as follows"
+msgstr "API の完全なフォーマットは次のとおり"
+
+#: View/Events/legacy_automation.ctp:111
+msgid "The export format, can be \"md5\" or \"sha1\""
+msgstr "エクスポートのフォーマット、\"md5\" または \"sha1\""
+
+#: View/Events/legacy_automation.ctp:123
+msgid "For example, to only show sha1 values from events tagged tag1, use"
+msgstr "例えば、 tag1 とタグ付けされたイベントから sha1 値のみを表示するには、"
+
+#: View/Events/legacy_automation.ctp:126
+msgid "STIX export"
+msgstr "STIXエクスポート"
+
+#: View/Events/legacy_automation.ctp:127
+msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
+msgstr "MISP のイベントを、MITRE の STIX フォーマットでエクスポートすることができます。(STIX については、 <a href=\"https://stix.mitre.org/\">こちら</a>を参照してください) 現時点では、STIX XML でのエクスポートには、大変時間がかかり、大規模なイベントや複数のイベントの場合、タイムアウトすることがあります。JSON フォーマットの場合は、この問題は起こりません。使用方法"
+
+#: View/Events/legacy_automation.ctp:129
+msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
+msgstr "検索パラメーターを、URLパラメーターを使用して機能に渡すことや、(戻り値のタイプに応じて) XML または JSON オブジェクトでPOSTすることができます。次のパラメーターを STIX エクスポートツールに渡すことができます。<code>id</code>、<code>withAttachments</code>、<code>tags</code>。<code>id</code>と<code>tags</code>の両方はクエリーを組み立てるために <code>&amp;&amp;</code> (and) と <code>!</code> (not) 演算子を使用することができます。URL パラメーターを使用する場合、シンタックスは次のとおりです"
+
+#: View/Events/legacy_automation.ctp:132;171
+msgid "The event's ID"
+msgstr "イベントのID"
+
+#: View/Events/legacy_automation.ctp:133
+msgid "Encode attachments where applicable"
+msgstr "該当する場合、添付ファイルをエンコードします"
+
+#: View/Events/legacy_automation.ctp:151
+msgid "Various ways to narrow down the search results of the STIX export"
+msgstr "STIX エクスポートの検索結果を絞り込むための様々な方法"
+
+#: View/Events/legacy_automation.ctp:152
+msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
+msgstr "例えば、\"APT1\"とタグ付けされたイベントから、\"OSINT\"とタグ付けされたイベントと #51 と #62 のイベントを除外し、添付ファイル無しで取得する場合"
+
+#: View/Events/legacy_automation.ctp:154
+msgid "To export the same events using a POST request use"
+msgstr "同様のイベントを POST リクエストを使ってエクスポートする場合は、"
+
+#: View/Events/legacy_automation.ctp:156
+msgid "Together with this JSON object in the POST message"
+msgstr "POST メッセージに、この JSON オブジェクトも含める"
+
+#: View/Events/legacy_automation.ctp:158
+msgid "XML is automagically assumed when using the stix export"
+msgstr "Stix エクスポートが使用される場合、自動的に XML と見なされます。"
+
+#: View/Events/legacy_automation.ctp:160
+msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
+msgstr "同様の検索は、以下の XML オブジェクトを含んだ POST でも可能です (注意として、＆をエスケープするか、id と tag の分離が必要です)。"
+
+#: View/Events/legacy_automation.ctp:163
+msgid "RPZ export"
+msgstr "RPZエクスポート"
+
+#: View/Events/legacy_automation.ctp:165
+msgid "It is possible to further restrict the exported values using the following filters"
+msgstr "次のフィルターを使用して、エクスポートされた値をさらに制限することができます"
+
+#: View/Events/legacy_automation.ctp:167
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
+"        "
+msgstr "結果にタグを含めるには、このパラメーターにその名前を書き込んでください。タグを除外するには、先頭に'!'を追加してください。\n"
+"また、いくつかのタグコマンドを '&amp;&amp;' オペレーターでまとめることができます。url 経由で渡す場合、タグ検索ではコロン (:) が使えないことに注意してください。        "
+
+#: View/Events/legacy_automation.ctp:170
+msgid "Use semicolons instead (the search will automatically search for colons instead)"
+msgstr "代わりにセミコロンを使用してください (検索ではコロンが自動的に検索されます)"
+
+#: View/Events/legacy_automation.ctp:172
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
+msgstr "from 項目で指定された日付より後の日付のイベント (フォーマット: 2015-02-03)"
+
+#: View/Events/legacy_automation.ctp:173
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
+msgstr "to 項目に指定された日付より前の日付のイベント (フォーマット: 2015-02-03)"
+
+#: View/Events/legacy_automation.ctp:186
+msgid "Text export"
+msgstr "Textエクスポート"
+
+#: View/Events/legacy_automation.ctp:187
+msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
+msgstr "> 特定のタイプの全アトリビュートを、プレーンテキストファイルにエクスポート。デフォルトでは、公開され IDS として指定されたアトリビュートのみがエクスポートされます。"
+
+#: View/Events/legacy_automation.ctp:194
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
+msgstr "結果をタグで制限するには、通常のシンタックスを使用します。タグ検索ではコロン (;) を使用できないことに注意してください。代わりにセミコロンを使用してください (検索ではコロンが自動的に検索されます)。 tag1 のタグが付いており、かつ tag2 のタグが付いていないイベントから ip-src 値を取得するには"
+
+#: View/Events/legacy_automation.ctp:197
+msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
+msgstr "バージョン 2.3.38では、2つの追加フラグでテキストのエクスポートを制限することができます。1つ目では、イベント ID に基づいて制限することができます。2つ目は非 IDS フラグのアトリビュートをエクスポートできる真偽値スイッチです。さらに、タイプ項目で\"all\"を選択すると、すべての適格なアトリビュートが返されます。"
+
+#: View/Events/legacy_automation.ctp:201
+msgid "Only export the attributes of the given event ID"
+msgstr "与えられたイベント ID のアトリビュートのみをエクスポート"
+
+#: View/Events/legacy_automation.ctp:202
+msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+msgstr "通常は除外されていても、to_ids とマークされていないアトリビュートも含みます。また、ホワイトリストの機能をオーバーライドします。"
+
+#: View/Events/legacy_automation.ctp:207
+msgid "Include not published Events."
+msgstr "公開されないイベントも含む"
+
+#: View/Events/legacy_automation.ctp:208;275
+msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr "また、いくつかのタグコマンドを '&amp;&amp;' オペレーターでまとめることができます。タグ検索ではコロン (:) が使えないことに注意してください。\n"
+"代わりにセミコロンを使用してください (検索ではコロンが自動的に検索されます)。例えば、tag1 と tag2 のタグが付いているが、tag3 のタグが付いているものは除外したい場合"
+
+#: View/Events/legacy_automation.ctp:263
+msgid "Searches with JSON/XML/OpenIOC results"
+msgstr "JSON/XML/OpenIOC での検索結果"
+
+#: View/Events/legacy_automation.ctp:267
+msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
+msgstr "検索結果のフォーマットを設定します (現時点でのサポート: json, xml, openioc - 今後フォーマットが追加されます)。"
+
+#: View/Events/legacy_automation.ctp:272
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
+msgstr "タグを結果に含めるためには、その名前をパラメーターに書き込みます。タグを除外するためには '!' を追加します。\n"
+"同じパラメーターの複数の値をフィルターするためには、次の例のように配列を使用します"
+
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr "最新の公開タイムスタンプ(より新しいもののみ)に結果を制限します。"
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr "結果を (最終編集の) タイムスタンプ で制限します。指定されたタイムスタンプより新しいタイムスタンプのイベントが返されます。スコープとして /attributes を扱っている場合、アトリビュートのタイムスタンプがルックアップに使用されます。"
+
+#: View/Events/legacy_automation.ctp:291
+msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
+msgstr "例えば、\"red october\" に言及しているイベントを見つけるためには、次のシンタックスを使用します (この例は、GET の代わりに POST リクエストを使用します。これが推奨されます。GET リクエストは問題があり、非推奨です。)"
+
+#: View/Events/legacy_automation.ctp:296
+msgid "To just return a list of attributes, use the following syntax"
+msgstr "アトリビュートのリストを返すには、次のシンタックスを使用します"
+
+#: View/Events/legacy_automation.ctp:304
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
+msgstr "from 項目で指定された日付より後の日付のイベント (フォーマット: 2015-02-15)"
+
+#: View/Events/legacy_automation.ctp:305
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
+msgstr "to 項目に指定された日付より前の日付のイベント (フォーマット: 2015-02-15)"
+
+#: View/Events/legacy_automation.ctp:312
+msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
+msgstr "結果を(アトリビュートの)タイムスタンプで制限します。 指定したタイムスタンプより新しいタイムスタンプを持つアトリビュートが返されます。"
+
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr "指定されたタイムスタンプより後に変更を受けたイベントのアトリビュートのみを返します。"
+
+#: View/Events/legacy_automation.ctp:322
+msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
+msgstr "false または null キーワードは、URL 中のオプションの空パラメーターに使用する必要があります。非推奨のURLパラーメーターを使用する場合にのみ必要であることに留意してください。"
+
+#: View/Events/legacy_automation.ctp:324
+msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
+"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
+msgstr "value、type、category と org はオプションです。各カテゴリーのいくつかの用語を、'&amp;&amp;'演算子でまとめて検索することができます。'!'演算子で否定することもできます。タグ検索ではコロン (:) が使えないことに注意してください。\n"
+"代わりにセミコロンを使用してください (検索ではコロンが自動的に検索されます)。例えば、所属組織で作られたすべてのアトリビュートで、ip-src タイプに 192.168 と 127.0 を持っており、かつ tag1 とタグ付けされたイベントを除外したものを検索したい場合、次を使用します"
+
+#: View/Events/legacy_automation.ctp:327
+msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
+msgstr "CIDR を使用して IP アドレスの検索もできます。 ' |'(パイプ) の代わりに '/' (スラッシュ) を使うこともできます。タグ検索ではコロン (:) は使用できません。代わりにセミコロンを使用します。 (コロンを使って検索した場合、自動的にセミコロンとして検索されます)。以下に例を示します。"
 
 #: View/Events/merge.ctp:4
 msgid "Merge events"
@@ -6685,19 +7407,19 @@ msgid "Proposals"
 msgstr "提案"
 
 #: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:93
+#: View/Events/view.ctp:106
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr "コントリビューター"
 
 #: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:113
-#: View/Jobs/index.ctp:65
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
 #: View/Logs/admin_search.ctp:6
 #: View/Pages/doc/administration.ctp:87;104;116;181;195
 #: View/Pages/doc/using_the_system.ctp:166
-#: View/Users/admin_view.ctp:24
-#: View/Users/view.ctp:9
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
 msgid "Email"
 msgstr "Eメール"
 
@@ -6775,11 +7497,8 @@ msgid "Successfully added attributes"
 msgstr "追加されたアトリビュート"
 
 #: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Events/view.ctp:56
 #: View/Feeds/preview_event.ctp:11
 #: View/Galaxies/view.ctp:18
-#: View/ObjectTemplates/view.ctp:15
-#: View/Organisations/view.ctp:54
 #: View/Organisations/ajax/merge.ctp:58
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
@@ -6802,6 +7521,14 @@ msgstr "コンテンツ"
 msgid "Visualisation"
 msgstr "ビジュアライゼーション"
 
+#: View/Events/upload_analysis_file.ctp:6
+msgid "Import analysis file"
+msgstr ""
+
+#: View/Events/upload_analysis_file.ctp:61
+msgid "Create Objects"
+msgstr ""
+
 #: View/Events/upload_stix.ctp:6
 msgid "Import %s file"
 msgstr "%s ファイルをインポート"
@@ -6810,193 +7537,186 @@ msgstr "%s ファイルをインポート"
 msgid "%s file"
 msgstr "%s ファイル"
 
-#: View/Events/view.ctp:49
-msgid "Extended view"
-msgstr "継承ビュー"
+#: View/Events/upload_stix.ctp:24
+msgid "Include the original imported file as attachment"
+msgstr ""
 
-#: View/Events/view.ctp:51
+#: View/Events/view.ctp:53
 #: View/Servers/preview_event.ctp:12
 #: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Event ID"
 msgstr "イベントID"
 
-#: View/Events/view.ctp:63
+#: View/Events/view.ctp:57
 msgid "Source Organisation"
 msgstr "ソース組織"
 
-#: View/Events/view.ctp:68
+#: View/Events/view.ctp:66
 msgid "Member Organisation"
 msgstr "メンバー組織"
 
-#: View/Events/view.ctp:83
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
 msgid "Owner org"
 msgstr "オーナー組織"
 
-#: View/Events/view.ctp:131
+#: View/Events/view.ctp:135
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
 #: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
 msgstr "脅威レベル"
 
-#: View/Events/view.ctp:139
+#: View/Events/view.ctp:140
 #: View/Feeds/preview_event.ctp:37
 #: View/Pages/doc/using_the_system.ctp:70;177;210
 #: View/Servers/preview_event.ctp:48
 msgid "Analysis"
 msgstr "分析"
 
-#: View/Events/view.ctp:159
+#: View/Events/view.ctp:161
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr "情報"
 
-#: View/Events/view.ctp:165;167
+#: View/Events/view.ctp:165
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
 msgstr "公開済み"
 
-#: View/Events/view.ctp:169
+#: View/Events/view.ctp:173
 msgid "#Attributes"
 msgstr "アトリビュート数"
 
-#: View/Events/view.ctp:171
+#: View/Events/view.ctp:177
+msgid "First recorded change"
+msgstr ""
+
+#: View/Events/view.ctp:181
 msgid "Last change"
 msgstr "最終変更"
 
-#: View/Events/view.ctp:176
+#: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
 msgid "Extends"
 msgstr "継承"
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:210
 msgid "Extended by"
 msgstr "継承先"
 
-#: View/Events/view.ctp:194
-msgid "Currently in "
-msgstr "現在は "
+#: View/Events/view.ctp:217
+msgid "extended"
+msgstr ""
 
-#: View/Events/view.ctp:202
-msgid "- restricted to own organisation only."
-msgstr "- 所属組織のみに制限。"
+#: View/Events/view.ctp:217
+msgid "atomic"
+msgstr ""
 
-#: View/Events/view.ctp:203
-msgid "Advanced Sightings"
-msgstr "高度なサイティング"
-
-#: View/Events/view.ctp:219
-msgid "you"
-msgstr "あなた"
-
-#: View/Events/view.ctp:220
-msgid " has"
-msgstr " は"
-
-#: View/Events/view.ctp:223
-msgid "You have"
-msgstr "あなたは"
-
-#: View/Events/view.ctp:226
+#: View/Events/view.ctp:265
 msgid "Delegation request"
 msgstr "委譲リクエスト"
 
-#: View/Events/view.ctp:227
-msgid "%s requested that %s take over this event."
-msgstr "%s は %s がこのイベントを引き継ぐように要求しました。"
-
-#: View/Events/view.ctp:227
+#: View/Events/view.ctp:277
 msgid "View request details"
 msgstr "リクエストの詳細を表示"
 
-#: View/Events/view.ctp:232
-msgid "Correlation"
-msgstr "相関"
-
-#: View/Events/view.ctp:238;247
-#: View/Users/admin_view.ctp:125
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
 msgid "Disabled"
 msgstr "無効"
 
-#: View/Events/view.ctp:238
-msgid "enable"
-msgstr "有効"
-
-#: View/Events/view.ctp:242;249
-#: View/ObjectTemplates/index.ctp:32
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
 #: View/Taxonomies/view.ctp:24
-#: View/Warninglists/view.ctp:38
 msgid "Enabled"
 msgstr "有効"
 
-#: View/Events/view.ctp:242
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr "有効"
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr "無効"
 
-#: View/Events/view.ctp:277
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr "継承ビュー"
+
+#: View/Events/view.ctp:328
 msgid "Show (%s more)"
 msgstr "表示 (%s more)"
 
-#: View/Events/view.ctp:335
+#: View/Events/view.ctp:386;415
 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."
-msgstr "さまざまなフィードに含まれるデータの相関、しかしながら多数のアトリビュートがあるため、実際のフィードの相関は表示されません。フィードが読み込まれたページを更新するためには<a href=\"%s\\/overrideLimit:1\">ここ</a>をクリックしてください。"
+#: View/Events/view.ctp:387;416
+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
+#: View/Events/view.ctp:424
 msgid "Warning: Potential false positives"
 msgstr "注意: 誤検知の可能性があります"
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Toggle pivot graph"
 msgstr "ピボットグラフに切り替え"
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Pivots"
 msgstr "ピボット"
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Toggle galaxies"
 msgstr "ギャラクシーに切り替え"
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Galaxy"
 msgstr "ギャラクシー"
 
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Toggle Event graph"
 msgstr "イベントグラフに切り替え"
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Toggle Correlation graph"
 msgstr "相関グラフに切り替え"
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Correlation graph"
 msgstr "相関グラフ"
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "Toggle ATT&CK matrix"
 msgstr "ATT&CK マトリックスに切り替え"
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "ATT&CK matrix"
 msgstr "ATT&CK マトリックス"
 
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 msgid "Toggle attributes"
 msgstr "アトリビュートに切り替え"
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Toggle discussions"
 msgstr "ディスカッションをトグル"
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Discussion"
 msgstr "ディスカッション"
 
@@ -7032,16 +7752,24 @@ msgstr "本当に削除しますか "
 msgid " Event #"
 msgstr " イベント #"
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:7
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:6
 msgid "Publish Event%s"
 msgstr "イベント %s を公開"
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:8
+msgid "Unpublish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:20
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr "公開するけれどアラートメールを送信しないのですか? 軽微な変更の場合のみにしてください!"
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
-#: View/Feeds/index.ctp:54
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Feeds/index.ctp:104
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -7051,10 +7779,6 @@ msgstr "公開"
 msgid "Choose the format that you wish to download the event in"
 msgstr "イベントのダウンロードフォーマットを選択してください"
 
-#: View/Events/ajax/exportChoice.ctp:17;18;27;28
-msgid "Export as %s"
-msgstr "%s としてエクスポート"
-
 #: View/Events/ajax/importChoice.ctp:2
 msgid "Choose the format that you would like to use for the import"
 msgstr "インポートに使用したいフォーマットを選択してください"
@@ -7225,7 +7949,7 @@ msgstr "チェックすると、このフィードからプルする際に IDS 
 
 #: View/Feeds/add.ctp:156
 #: View/Feeds/edit.ctp:153
-#: View/Feeds/index.ctp:55
+#: View/Feeds/index.ctp:105
 msgid "Delta Merge"
 msgstr "デルタマージ"
 
@@ -7266,16 +7990,16 @@ msgstr "以下の組織がブロックされたイベント"
 
 #: View/Feeds/add.ctp:196
 #: View/Feeds/edit.ctp:191
-#: View/Servers/add.ctp:113
-#: View/Servers/edit.ctp:152;158
+#: View/Servers/add.ctp:102
+#: View/Servers/edit.ctp:147;153
 msgid "Modify"
 msgstr "変更"
 
-#: View/Feeds/compare_feeds.ctp:58
+#: View/Feeds/compare_feeds.ctp:66
 msgid "None or less than 1% of the data of %s is contained in %s (%s matching values)"
 msgstr "%s のデータの 1% 以下が %s に含まれています (%s の一致数)"
 
-#: View/Feeds/compare_feeds.ctp:59
+#: View/Feeds/compare_feeds.ctp:67
 msgid "%s\\% of the data of %s is contained in %s (%s matching values)"
 msgstr "%s\\% の %s データが %s に含まれています (%s の一致数)"
 
@@ -7296,53 +8020,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr "同期したい外部サーバーのベース url。例: https://misppriv.circl.lu"
 
 #: View/Feeds/edit.ctp:207
-#: View/Servers/add.ctp:143
-#: View/Servers/edit.ctp:186
+#: View/Servers/add.ctp:132
+#: View/Servers/edit.ctp:181
 msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
 msgstr "何のインスタンスなのかユーザーに明確にするための名前。例: 組織 A のインスタンス"
 
 #: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:185
+#: View/Servers/add.ctp:133
+#: View/Servers/edit.ctp:180
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr "同期したい外部サーバーを持つ組織です。 例: BE"
 
 #: View/Feeds/edit.ctp:209
-#: View/Servers/add.ctp:145
-#: View/Servers/edit.ctp:187
+#: View/Servers/add.ctp:134
+#: View/Servers/edit.ctp:182
 msgid "You can find the authentication key on your profile on the external server."
 msgstr "外部サーバー上のプロフィールの認証キーを検索できます。"
 
 #: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:146
-#: View/Servers/edit.ctp:188
+#: View/Servers/add.ctp:135
+#: View/Servers/edit.ctp:183
 msgid "Allow the upload of events and their attributes."
 msgstr "イベントとアトリビュートのアップロードを許可します。"
 
 #: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:189
+#: View/Servers/add.ctp:136
+#: View/Servers/edit.ctp:184
 msgid "Allow the download of events and their attributes from the server."
 msgstr "サーバーからイベントとアトリビュートのダウンロードを許可します。"
 
 #: View/Feeds/edit.ctp:212
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:185
 msgid "Unpublish new event (working with Push event)."
 msgstr "新しいイベントを非公開 (プッシュイベントと連動)"
 
 #: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:191
+#: View/Servers/edit.ctp:186
 msgid "Publish new event without email (working with Pull event)."
 msgstr "新しいイベントを公開 (プルイベントと連動)"
 
 #: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:192
+#: View/Servers/edit.ctp:187
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority."
 msgstr "接続しようとしているインスタンスに独自の署名権限がある場合、証明書ファイルをアップロードすることもできます。"
 
 #: View/Feeds/edit.ctp:215
-#: View/Servers/add.ctp:151
-#: View/Servers/edit.ctp:194
+#: View/Servers/add.ctp:140
+#: View/Servers/edit.ctp:189
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr "自己署名証明書を利用しているインスタンスとの接続を許可する場合にクリック (推奨されません)。"
 
@@ -7394,130 +8118,104 @@ msgstr "MISPのフィードをキャッシュ"
 msgid "Fetch and store all feed data"
 msgstr "すべてのフィードデータを取得し保存"
 
-#: View/Feeds/index.ctp:27
+#: View/Feeds/index.ctp:33
 msgid "Enable selected"
 msgstr "選択を有効化"
 
-#: View/Feeds/index.ctp:27
-msgid "Enable Selected"
-msgstr "選択内容を有効化"
-
-#: View/Feeds/index.ctp:28
+#: View/Feeds/index.ctp:39
 msgid "Disable selected"
 msgstr "選択を無効化"
 
-#: View/Feeds/index.ctp:28
-msgid "Disable Selected"
-msgstr "選択内容を無効化"
-
-#: View/Feeds/index.ctp:29
+#: View/Feeds/index.ctp:45
 msgid "Enable caching for selected"
 msgstr "選択されたもの用のキャッシュを有効化"
 
-#: View/Feeds/index.ctp:29
-msgid "Enable Caching for Selected"
-msgstr "選択されたもの用のキャッシュを有効化"
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:51
 msgid "Disable caching for selected"
 msgstr "選択されたもの用のキャッシュを無効化"
 
-#: View/Feeds/index.ctp:30
-msgid "Disable Caching for  Selected"
-msgstr "選択されたもの用のキャッシュを無効化"
-
-#: View/Feeds/index.ctp:30
-msgid "Default feeds filter"
-msgstr "デフォルトフィードフィルター"
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:61
 msgid "Default feeds"
 msgstr "デフォルトフィード"
 
-#: View/Feeds/index.ctp:31
-msgid "Custom feeds filter"
-msgstr "カスタムフィードフィルター"
-
-#: View/Feeds/index.ctp:31
+#: View/Feeds/index.ctp:66
 msgid "Custom feeds"
 msgstr "カスタム フィード"
 
-#: View/Feeds/index.ctp:31
-msgid "Custom Feeds"
-msgstr "カスタム フィード"
-
-#: View/Feeds/index.ctp:32
+#: View/Feeds/index.ctp:71
 msgid "All feeds"
 msgstr "すべてのフィード"
 
-#: View/Feeds/index.ctp:32
-msgid "All Feeds"
-msgstr "すべてのフィード"
-
-#: View/Feeds/index.ctp:33
+#: View/Feeds/index.ctp:76
 msgid "Enabled feeds"
 msgstr "有効なフィード"
 
-#: View/Feeds/index.ctp:33
-msgid "Enabled Feeds"
-msgstr "有効なフィード"
+#: View/Feeds/index.ctp:95
+msgid "Enable pulling the feed into your MISP as events/attributes."
+msgstr ""
 
-#: View/Feeds/index.ctp:48
+#: View/Feeds/index.ctp:96
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:98
 msgid "Feed Format"
 msgstr "フィードのフォーマット"
 
-#: View/Feeds/index.ctp:50
-#: View/Jobs/index.ctp:76
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr "入力"
 
-#: View/Feeds/index.ctp:56
+#: View/Feeds/index.ctp:106
 msgid "Override IDS"
 msgstr "IDS をオーバーライド"
 
-#: View/Feeds/index.ctp:60
+#: View/Feeds/index.ctp:110
 msgid "Caching"
 msgstr "キャッシュ"
 
-#: View/Feeds/index.ctp:108
-#: View/Servers/index.ctp:73;74
+#: View/Feeds/index.ctp:158
+#: View/Servers/index.ctp:74;75
 msgid "Rules"
 msgstr "ルール"
 
-#: View/Feeds/index.ctp:135
+#: View/Feeds/index.ctp:185
 msgid "Error: Invalid event!"
 msgstr "エラー: 無効なイベントです!"
 
-#: View/Feeds/index.ctp:140
+#: View/Feeds/index.ctp:190
 msgid "Fixed event %s"
 msgstr "修正されるイベント %s"
 
-#: View/Feeds/index.ctp:143
+#: View/Feeds/index.ctp:193
 msgid "New fixed event"
 msgstr "新しい修正されるイベント"
 
-#: View/Feeds/index.ctp:195
+#: View/Feeds/index.ctp:245
+#: View/Servers/index.ctp:94
 msgid "Age: "
 msgstr "年齢: "
 
-#: View/Feeds/index.ctp:197
+#: View/Feeds/index.ctp:247
+#: View/Servers/index.ctp:102
 msgid "Not cached"
 msgstr "未キャッシュ"
 
-#: View/Feeds/index.ctp:208
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr "リモートでイベントを探索"
 
-#: View/Feeds/index.ctp:210
+#: View/Feeds/index.ctp:260
 msgid "Fetch all events"
 msgstr "すべてのイベントを取得"
 
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 msgid "Are you sure you want to permanently remove the feed (%s)?"
 msgstr "本当にフィード (%s) を完全に削除しますか?"
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:267
 msgid "Download feed metadata as JSON"
 msgstr "フィードのメタデータを JSON としてダウンロード"
 
@@ -7539,47 +8237,31 @@ msgid "Namespace"
 msgstr "ネームスペース"
 
 #: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:17
+#: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:19
+#: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr "バージョン"
 
-#: View/Galaxies/ajax/cluster_choice.ctp:2
-msgid "Select Cluster"
-msgstr "クラスターを選択"
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
+msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:11
-msgid "search clusters…"
-msgstr "クラスターを検索..."
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "Galaxy Cluster Deletion"
+msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:28
-msgid "Back to Galaxy Selection"
-msgstr "ギャラクシーの選択に戻る"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies."
+msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:2
-msgid "Select Cluster Source"
-msgstr "クラスターソースを選択"
+#: View/GalaxyClusters/ajax/index.ctp:82
+msgid "Delete galaxy cluster"
+msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All clusters"
-msgstr "すべてのクラスター"
-
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All Galaxies"
-msgstr "すべてのギャラクシー"
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:2
-msgid "Select Galaxy Namespace Source"
-msgstr "ギャラクシーのネームスペース ソースを選択"
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All namespaces"
-msgstr "すべてのネームスペース"
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All Namespaces"
-msgstr "すべてのネームスペース"
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
+msgstr ""
 
 #: View/Jobs/index.ctp:12
 msgid "Are you sure you want to purge all completed job entries? Job entries are considered as log entries and have no impact on actual job execution."
@@ -7593,37 +8275,37 @@ msgstr "本当にすべてのジョブエントリーをパージしますか? 
 msgid "Completed."
 msgstr "完了しました。"
 
-#: View/Jobs/index.ctp:63
+#: View/Jobs/index.ctp:68;98
 msgid "Show all queues"
 msgstr "すべてのキューを表示"
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:74;99
 msgid "Show default queue"
 msgstr "デフォルトのキューを表示"
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr "Eメールのキューを表示"
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr "キャッシュ キューを表示"
+
+#: View/Jobs/index.ctp:99
 #: View/Roles/admin_index.ctp:22
 #: View/Roles/index.ctp:22
 msgid "Default"
 msgstr "デフォルト"
 
-#: View/Jobs/index.ctp:65
-msgid "Show email queue"
-msgstr "Eメールのキューを表示"
-
-#: View/Jobs/index.ctp:66
-msgid "Show cache queue"
-msgstr "キャッシュ キューを表示"
-
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:101
 msgid "Cache"
 msgstr "キャッシュ"
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:127
 msgid "No worker active"
 msgstr "アクティブなワーカーが存在しません"
 
-#: View/Jobs/index.ctp:124
+#: View/Jobs/index.ctp:159
 msgid "View stacktrace"
 msgstr "スタック トレースを表示"
 
@@ -7643,10 +8325,6 @@ msgstr "クリックしてスタックトレースを隠す"
 msgid "No error data found. Generally job error data is purged from Redis after 24 hours, however, you can still view the errors in the log files in \"/app/tmp/logs\"."
 msgstr "エラーデータは見つかりませんでした。一般的に、ジョブのエラーデータは24時間後に Redis から削除されます。しかし、\"/app/tmp/logs\"内のログファイルでエラーを確認することができます。"
 
-#: View/Jobs/ajax/error.ctp:34
-msgid "Close"
-msgstr "閉じる"
-
 #: View/Logs/admin_index.ctp:2
 #: View/Logs/event_index.ctp:6
 msgid "Logs"
@@ -7688,22 +8366,20 @@ msgstr "次の変更を含む"
 msgid "from IP"
 msgstr "from IP"
 
-#: View/Logs/admin_index.ctp:20;21
-msgid "Search"
-msgstr "検索"
-
-#: View/Logs/admin_index.ctp:59
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr "モデル ID"
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:50
-#: View/ObjectTemplates/view.ctp:13
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/Templates/view.ctp:33
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
 msgstr "組織"
 
@@ -7789,12 +8465,12 @@ msgstr "リレーションシップ タイプ"
 msgid "Target UUID"
 msgstr "対象の UUID"
 
-#: View/ObjectReferences/ajax/add.ctp:53
+#: View/ObjectReferences/ajax/add.ctp:54
 #: View/Objects/orphaned_object_diagnostics.ctp:38
 msgid "Object"
 msgstr "オブジェクト"
 
-#: View/ObjectReferences/ajax/add.ctp:68
+#: View/ObjectReferences/ajax/add.ctp:120
 msgid "Target Details"
 msgstr "対象の詳細"
 
@@ -7815,7 +8491,7 @@ msgid " The Attribute will be permanently deleted and unrecoverable. Also, this
 msgstr " アトリビュートは完全に削除され、回復不能になります。また、他のインスタンスに影響を与える削除は禁止されます。"
 
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:24
-#: View/Pages/doc/categories_and_types.ctp:46
+#: View/Pages/doc/categories_and_types.ctp:40
 #: View/Pages/doc/md/categories_and_types.ctp:23
 msgid "Categories"
 msgstr "カテゴリー"
@@ -7836,43 +8512,35 @@ msgstr "相関を無効化"
 msgid "Object Template index"
 msgstr "オブジェクトテンプレートインデックス"
 
-#: View/ObjectTemplates/index.ctp:54
-#: View/ObjectTemplates/view.ctp:23
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr "必要条件"
 
-#: View/ObjectTemplates/index.ctp:107
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr "本当にテンプレート # %s を強制的にアップデートしますか?"
 
-#: View/ObjectTemplates/index.ctp:108
+#: View/ObjectTemplates/index.ctp:119
 msgid "Are you sure you want to delete template # %s?"
 msgstr "本当に # %s テンプレートを削除しますか?"
 
-#: View/ObjectTemplates/view.ctp:7
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr "ID"
+
+#: View/ObjectTemplates/view.ctp:33
 msgid " Object Template"
 msgstr "オブジェクトテンプレート"
 
-#: View/ObjectTemplates/view.ctp:9
-msgid "Object Template ID"
-msgstr "オブジェクトレンプレート ID"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:2
-msgid "Select Object Category"
-msgstr "オブジェクトカテゴリーを選択"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All meta-categories"
-msgstr "すべてのメタカテゴリー"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All Objects"
-msgstr "すべてのオブジェクト"
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:50
-msgid "Back to categories"
-msgstr "カテゴリーに戻る"
-
 #: View/Objects/add.ctp:6
 msgid " Object"
 msgstr " オブジェクト"
@@ -7949,15 +8617,6 @@ msgstr "送信する前に、以下のオブジェクトがあなたの想定を
 msgid "To IDS"
 msgstr "To IDS"
 
-#: View/Objects/revise_object.ctp:49
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/ajax/merge.ctp:65
-#: View/SharingGroups/add.ctp:32
-#: View/SharingGroups/edit.ctp:32
-msgid "UUID"
-msgstr "UUID"
-
 #: View/Objects/ajax/delete.ctp:6
 msgid "Object Deletion"
 msgstr "オブジェクトの削除"
@@ -7979,6 +8638,7 @@ msgid "Simply paste a list of all the organisation UUIDs that you wish to block
 msgstr "入力をブロックしたい全ての組織 UUID のリストを貼り付けます。"
 
 #: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr "組織名"
 
@@ -8103,9 +8763,9 @@ msgstr "上記の uuid を持つ組織は既に存在しています。この組
 msgid "Click here"
 msgstr "ここをクリック"
 
-#: View/Organisations/index.ctp:5
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:51
+#: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr "すべての組織"
@@ -8114,7 +8774,7 @@ msgstr "すべての組織"
 msgid ", both local and remote"
 msgstr ", ローカルとリモート両方"
 
-#: View/Organisations/index.ctp:9
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr "既知のリモート組織"
@@ -8123,7 +8783,7 @@ msgstr "既知のリモート組織"
 msgid " on other instances"
 msgstr " 別のインスタンス上"
 
-#: View/Organisations/index.ctp:13
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr "ローカル組織"
@@ -8140,55 +8800,52 @@ msgstr "改ページ"
 msgid "View all"
 msgstr "すべて表示"
 
-#: View/Organisations/index.ctp:65
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:30
 msgid "Logo"
 msgstr "ロゴ"
 
-#: View/Organisations/index.ctp:76
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr "追加者"
 
-#: View/Organisations/index.ctp:117
+#: View/Organisations/index.ctp:138
 #: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 ""
 
-#: View/Organisations/view.ctp:3
-msgid "Organisation "
-msgstr "組織 "
-
-#: View/Organisations/view.ctp:7
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:4
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/Users/admin_view.ctp:9
-#: View/Users/view.ctp:4
-#: View/Warninglists/view.ctp:4
-msgid "Id"
-msgstr "ID"
-
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr "ローカル or リモート"
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:12
 #: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr "ローカル"
 
-#: View/Organisations/view.ctp:26
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr "リモート"
 
-#: View/Organisations/view.ctp:40
-msgid "E-mail domain restrictions"
-msgstr "Eメールドメイン制限"
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
+msgstr ""
 
-#: View/Organisations/view.ctp:93;94
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr "組織 "
+
+#: View/Organisations/view.ctp:62;63
 msgid "Members"
 msgstr "メンバー"
 
@@ -8201,7 +8858,6 @@ msgid "Available Organisations"
 msgstr "利用可能な組織"
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
 msgid "Added Organisations"
 msgstr "追加された組織"
 
@@ -8266,6 +8922,14 @@ msgstr "アトリビュート カウントをリセット"
 msgid "Events need to have no validation issues"
 msgstr "イベントはバリデーションの問題を持たない必要があります"
 
+#: View/Pages/administration.ctp:15
+msgid "Recorrelate attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:16
+msgid "Recorrelate proposals"
+msgstr ""
+
 #: View/Pages/administration.ctp:18
 msgid "Verify Certificates"
 msgstr "証明書を検証"
@@ -8282,6 +8946,10 @@ msgstr "組織の長さを拡張"
 msgid "Hotfix 2.3.57: Increase the max length of the organization field when adding a new server connection."
 msgstr "ホットフィックス 2.3.57: 新しいサーバーとのコネクションを追加するときの、組織項目の最大長を増加します。"
 
+#: View/Pages/administration.ctp:20
+msgid "Convert log fields to text"
+msgstr ""
+
 #: View/Pages/administration.ctp:20
 msgid "Hotfix 2.3.78: Some of the log fields that were varchar(255) ended up truncating the data. This function will change them to \"text\""
 msgstr "ホットフィックス 2.3.78：いくつかのログ項目は varchar (255) で、データを切り捨てていました。この関数はそれらを \"text\" に変更します。"
@@ -8294,18 +8962,34 @@ msgstr "重複した UUID を修正"
 msgid "Hotfix 2.3.107: it was previously possible to get duplicate attribute UUIDs in the database, this script will remove all duplicates and ensure that duplicates will not be entered into the database in the future."
 msgstr "ホットフィックス 2.3.107: 以前はデータベースから重複した UUID アトリビュートを取得することができました。このスクリプトはすべての重複を削除し、重複した値が今後データベースに入力されないようにします。"
 
+#: View/Pages/administration.ctp:22
+msgid "Remove duplicate events (with the same UUID)"
+msgstr ""
+
 #: View/Pages/administration.ctp:22
 msgid "Hotfix 2.3.115: In some rare situations it could occur that a duplicate of an event was created on an instance, with the exact same uuid. This action will remove any such duplicates and make sure that this cannot happen again."
 msgstr "ホットフィックス 2.3.115: 稀にまったく同じ uuid を持つイベントがインスタンス上に作成されることがあります。このアクションはそのような重複を削除し、再び起こらないようにします。"
 
+#: View/Pages/administration.ctp:23
+msgid "Prune orphaned attributes"
+msgstr ""
+
 #: View/Pages/administration.ctp:23
 msgid "In some rare occasions it can happen that you end up with some attributes in your database that do not belong to an event - for example during a race condition between an event insert and a delete. This tool will collect and delete any such orphaned attributes. If you ever run into an issue where you cannot add an attribute with a specific valid value, this is probably the reason."
 msgstr "稀に、イベントに属していないアトリビュートが発生することがあります。例えば、イベントの挿入と削除時に競合が発生した際にです。このツールは、そのような孤立したアトリビュートを収集し削除します。特定の有効な値を持つアトリビュートを追加することができない問題に遭遇した場合、これが原因である可能性があります。"
 
+#: View/Pages/administration.ctp:24
+msgid "Clean regex table of potentially malicious entries"
+msgstr ""
+
 #: View/Pages/administration.ctp:24
 msgid "Hotfix 2.3.160: Prior to this version it was possible for a user/admin with Regex permission to create a malicious regular expression that could be used to execute arbitrary code. Since this version it is no longer possible to input such expressions, but already existing malicious entries still have to be cleaned using this tool."
 msgstr "Hotfix 2.3.160: このバージョンより古い場合、ユーザーや管理者が作る悪意のある正規表現によって任意のコードが実行される危険があります。このバージョン以降では悪意ある正規表現は入力できないようになっていますが、すでに存在してしまっている悪性なエントリーは、このツールを使ってクリアする必要があります。"
 
+#: View/Pages/administration.ctp:25
+msgid "Remove URL type attribute sanitisation"
+msgstr ""
+
 #: View/Pages/administration.ctp:25
 msgid "Hotfix 2.3.173: Sanitised URLs can cause issues with the NIDS exports and as of this version attributes will be modified on entry to correct this. To correct existing entries, run this script."
 msgstr "ホットフィックス 2.3.173: サニタイズされた URL は NIDS のエクスポートに問題を引き起こす可能性があります。このバージョンではエントリー上のアトリビュートを修正してこれに対応します。既存のエントリーを修正するには、このスクリプトを実行します。"
@@ -8359,7 +9043,6 @@ msgid "If the migration of your data from 2.4 is not complete this will lead to
 msgstr "2.4 からのデータのマイグレーションが完了していない場合、これはデータの損失につながります。DB をバックアップすることを強くお勧めします。廃止された項目を削除する準備はできたでしょうか?"
 
 #: View/Pages/doc/administration.ctp:3
-#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:3
 #: View/Pages/doc/general.ctp:3
 #: View/Pages/doc/quickstart.ctp:3;14
@@ -8369,7 +9052,6 @@ msgid "Quick Start"
 msgstr "クイックスタート"
 
 #: View/Pages/doc/administration.ctp:4
-#: View/Pages/doc/categories_and_types.ctp:4
 #: View/Pages/doc/concepts.ctp:4
 #: View/Pages/doc/general.ctp:4;14
 #: View/Pages/doc/quickstart.ctp:4
@@ -8379,7 +9061,6 @@ msgid "General Layout"
 msgstr "一般的なレイアウト"
 
 #: View/Pages/doc/administration.ctp:5
-#: View/Pages/doc/categories_and_types.ctp:5
 #: View/Pages/doc/concepts.ctp:5;14
 #: View/Pages/doc/general.ctp:5
 #: View/Pages/doc/quickstart.ctp:5
@@ -8389,7 +9070,6 @@ msgid "General Concepts"
 msgstr "一般的なコンセプト"
 
 #: View/Pages/doc/administration.ctp:6
-#: View/Pages/doc/categories_and_types.ctp:6
 #: View/Pages/doc/concepts.ctp:6
 #: View/Pages/doc/general.ctp:6
 #: View/Pages/doc/quickstart.ctp:6
@@ -8399,7 +9079,6 @@ msgid "User Management and Global actions"
 msgstr "ユーザー管理とグローバルアクション"
 
 #: View/Pages/doc/administration.ctp:7
-#: View/Pages/doc/categories_and_types.ctp:7
 #: View/Pages/doc/concepts.ctp:7
 #: View/Pages/doc/general.ctp:7
 #: View/Pages/doc/quickstart.ctp:7
@@ -8442,7 +9121,7 @@ msgid "FAQ"
 msgstr "FAQ"
 
 #: View/Pages/doc/administration.ctp:22
-#: View/Pages/doc/categories_and_types.ctp:9
+#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:9
 #: View/Pages/doc/general.ctp:9
 #: View/Pages/doc/quickstart.ctp:9
@@ -8500,6 +9179,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr "ブルートフォースプロテクションとアプリケーションのソルトキーを制御する設定。"
 
 #: View/Pages/doc/administration.ctp:37
+#: View/Servers/edit.ctp:82
 msgid "Misc settings"
 msgstr "その他の設定"
 
@@ -8719,8 +9399,8 @@ msgstr "このオプションを選択すると、新しいユーザーは、新
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_view.ctp:40
-#: View/Users/view.ctp:34
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
 msgid "Authkey"
 msgstr "認証キー"
 
@@ -8773,8 +9453,8 @@ msgid "The e-mail address (and login name) of the user."
 msgstr "ユーザーのEメールアドレス (及びログイン名)。"
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_view.ctp:29
-#: View/Users/view.ctp:24
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr "自動アラート"
 
@@ -8795,8 +9475,6 @@ msgid "Shows the currently assigned NIDS ID."
 msgstr "現在アサインされている NIDS ID を表示する。"
 
 #: View/Pages/doc/administration.ctp:109;125
-#: View/Users/admin_view.ctp:100
-#: View/Users/view.ctp:55
 msgid "Termsaccepted"
 msgstr "利用規約の承認"
 
@@ -8805,7 +9483,7 @@ msgid "This flag indicates whether the user has accepted the terms of use or not
 msgstr "このフラグは、ユーザーが利用規約に同意したかどうかを示します。"
 
 #: View/Pages/doc/administration.ctp:110
-#: View/Users/admin_view.ctp:120
+#: View/Users/admin_view.ctp:84
 msgid "Newsread"
 msgstr "ニュース読み込み"
 
@@ -8867,7 +9545,7 @@ msgstr "ここでユーザーに連絡します。"
 
 #: View/Pages/doc/administration.ctp:133;184;197
 #: View/Pages/doc/using_the_system.ctp:269
-#: View/Taxonomies/view.ctp:78
+#: View/Taxonomies/view.ctp:89
 msgid "Action"
 msgstr "アクション"
 
@@ -9344,16 +10022,16 @@ msgstr "my_new_password"
 msgid "This will create a new password hash using the currently set salt."
 msgstr "これにより、現在設定されている salt を使用して新しいパスワードハッシュを作成します。"
 
-#: View/Pages/doc/categories_and_types.ctp:13
+#: View/Pages/doc/categories_and_types.ctp:7
 msgid "Attribute Categories and Types"
 msgstr "アトリビュート カテゴリーとタイプ"
 
-#: View/Pages/doc/categories_and_types.ctp:14
+#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/md/categories_and_types.ctp:1
 msgid "Attribute Categories vs. Types"
 msgstr "アトリビュート カテゴリー vs. タイプ"
 
-#: View/Pages/doc/categories_and_types.ctp:80
+#: View/Pages/doc/categories_and_types.ctp:74
 msgid "Click here to get the .md version for gitbook generation."
 msgstr "Gitbook 生成用の .md バージョンを取得するには、ここをクリックしてください。"
 
@@ -9362,8 +10040,8 @@ msgid "Admins and Site Admins"
 msgstr "管理者とサイト管理者"
 
 #: View/Pages/doc/concepts.ctp:16
-msgid "There are two types of admins in MISP: Admins (also refered to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
-msgstr "MISP には管理者 (組織管理者とも言われる) とサイト管理者の2種類の管理者があります。前者は所属組織のユーザーの限られた管理しかできません。サイト管理者はシステム上のすべての機能とデータにアクセスすることができます。彼らはシステムが正常に動作することと MISP のメンテナンスを確実にすることを担当しています。"
+msgid "There are two types of admins in MISP: Admins (also referred to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
+msgstr ""
 
 #: View/Pages/doc/concepts.ctp:17
 msgid "Background Jobs"
@@ -9494,10 +10172,6 @@ msgstr "ホームボタン"
 msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
 msgstr "このボタンは、イベントのインデックスページであるアプリケーションの開始画面に戻ります(詳細は後で説明します)。"
 
-#: View/Pages/doc/general.ctp:20
-msgid "Event Actions"
-msgstr "イベントアクション"
-
 #: View/Pages/doc/general.ctp:20
 msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
 msgstr "MISP に入力されたすべてのマルウェアデータは、関連するアトリビュートによって記述されたイベントオブジェクトで構成されます。イベントのアクションメニューを使用すると、イベントとアトリビュートの作成、修正、削除、公開、検索と一覧表示に関連するすべての機能にアクセスできます。"
@@ -9507,18 +10181,10 @@ msgid "Input filters alter what and how data can be entered into this instance.
 msgstr "入力フィルターは、このインスタンスに入力されるデータの種類と方法を変更します。\n"
 "アトリビュートエントリーのタイプによる基本的なバリデーションに加え、サイト管理者は特定の値に対する正規表現による置き換えやブラックリストを定義すること、特定の値をエクスポートからブロックすることができます。ユーザーはこれらの置き換えとブラックリストのルールをここで表示することができます。一方、管理者はそれらを変更することができます。"
 
-#: View/Pages/doc/general.ctp:22;54
-msgid "Global Actions"
-msgstr "グローバルアクション"
-
 #: View/Pages/doc/general.ctp:22
 msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
 msgstr "このメニューでは MISP とこのインスタンスに関する情報にアクセスできます。自分のプロフィールの表示および編集、ニュースまたは利用規約を再度読む、インスタンス上のアクティブな組織の一覧とアトリビュートのタイプ毎のコントリビューションヒストグラムを見ることができます。"
 
-#: View/Pages/doc/general.ctp:23;66
-msgid "Sync Actions"
-msgstr "同期アクション"
-
 #: View/Pages/doc/general.ctp:23
 msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
 msgstr "管理者のアクセス権限では、接続されたインスタンスの一覧の表示と、プシュとプルの開始ができます (同期のメカニズムについては後述します)。"
@@ -9645,6 +10311,11 @@ msgstr "ここでロールの権限を閲覧できます。"
 msgid "A link to this user guide."
 msgstr "このユーザーガイドへのリンク"
 
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr "利用規約"
+
 #: View/Pages/doc/general.ctp:61
 msgid "View the terms &amp; conditions again."
 msgstr "利用規約をもう一度表示する。"
@@ -9910,7 +10581,7 @@ msgstr "プラットフォーム上に現存するイベントやアトリビュ
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:47
+#: View/Users/statistics_data.ctp:53
 msgid "Activity Heatmap"
 msgstr "アクティビティのヒートマップ"
 
@@ -10838,12 +11509,6 @@ msgstr "任意のイベントを (直接または間接的にアトリビュー
 msgid "As described earlier, users with tagging rights can arbitrarily tag events using tags chosen from a pool of available options. If you have tagging privileges and would like to create a new tag, navigate to Event Actions - Add Tag. You'll be presented with the following form"
 msgstr "前述のように、タグ付け権限を持つユーザーは、使用可能なオプションの中からタグを選択し、イベントにタグを付けることができます。タグ付け権限を持っており、新しいタグを生成したい場合、イベントアクション から タグを追加 に移動します。次のフォームが表示されます"
 
-#: View/Pages/doc/using_the_system.ctp:303
-#: View/Templates/add.ctp:17
-#: View/Templates/edit.ctp:17
-msgid "Add tag"
-msgstr "タグを追加"
-
 #: View/Pages/doc/using_the_system.ctp:303
 msgid "Enter a name for the tag and click on the color field to be able to pick a colour for it."
 msgstr "タグの名前を入力し、カラー項目をクリックするとカラーを選択できます。"
@@ -11174,8 +11839,8 @@ msgid "Make sure that you enter the authentication key that you have been given
 msgstr "認証キーを入力する際、このインスタンスから取得したものではなく、リモートインスタンスをホストしている組織から与えられたものを入力してください。"
 
 #: View/Pages/doc/using_the_system.ctp:397
-#: View/Servers/add.ctp:7
-#: View/Servers/edit.ctp:7
+#: View/Servers/add.ctp:8
+#: View/Servers/edit.ctp:8
 msgid "Base URL"
 msgstr "ベース URL"
 
@@ -11277,7 +11942,7 @@ msgid "Clicking the delete button will delete the link to the instance."
 msgstr "削除ボタンをクリックすると、インスタンスへのリンクが削除されます。"
 
 #: View/Pages/doc/using_the_system.ctp:418
-#: View/Servers/index.ctp:92
+#: View/Servers/index.ctp:128
 msgid "Push all"
 msgstr "すべてをプッシュ"
 
@@ -11286,7 +11951,7 @@ msgid " By clicking this button, all events that are eligible to be pushed on th
 msgstr " このボタンをクリックすると、インスタンス上にあるプッシュできるすべてのイベントがリモートインスタンスにプッシュされ始めます。向こう側に存在するイベントとアトリビュートが更新されます。"
 
 #: View/Pages/doc/using_the_system.ctp:419
-#: View/Servers/index.ctp:89
+#: View/Servers/index.ctp:125
 msgid "Pull all"
 msgstr "すべてをプル"
 
@@ -11441,7 +12106,7 @@ msgstr "ok"
 msgid "remove"
 msgstr "削除"
 
-#: View/Roles/view.ctp:14
+#: View/Roles/view.ctp:5
 msgid "Permission level"
 msgstr "権限レベル"
 
@@ -11449,138 +12114,157 @@ msgstr "権限レベル"
 msgid "Add Server"
 msgstr "サーバーを追加"
 
-#: View/Servers/add.ctp:10
-#: View/Servers/edit.ctp:10
+#: View/Servers/add.ctp:6
+#: View/Servers/edit.ctp:6
+msgid "Instance identification"
+msgstr ""
+
+#: View/Servers/add.ctp:11
+#: View/Servers/edit.ctp:11
 msgid "Instance name"
 msgstr "インスタンス名"
 
-#: View/Servers/add.ctp:16
+#: View/Servers/add.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change."
 msgstr "下記のチェックボックをチェックすると、このインスタンスを内部インスタンスとして設定できます。\n"
 "つまり、このインスタンスとリモート間の同期は、通常の同期シナリオと同じように自動的にはデグレーションしません。あなたがこの両方のインスタンスを所有していることを確認してください。OKではない場合、危険な変更になります。"
 
-#: View/Servers/add.ctp:19
-#: View/Servers/edit.ctp:19
+#: View/Servers/add.ctp:20
+#: View/Servers/edit.ctp:20
 msgid "Internal instance"
 msgstr "内部インスタンス"
 
-#: View/Servers/add.ctp:29
+#: View/Servers/add.ctp:30
+#: View/Servers/edit.ctp:31
+msgid "Instance ownership and credentials"
+msgstr ""
+
+#: View/Servers/add.ctp:31
+#: View/Servers/edit.ctp:32
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr "このイベントを受信する組織 (通常はリモートインスタンスのホスト組織) に関する情報。"
 
-#: View/Servers/add.ctp:35
+#: View/Servers/add.ctp:37
 msgid "Remote Sync Organisation Type"
 msgstr "リモート同期する組織タイプ"
 
-#: View/Servers/add.ctp:40
-#: View/Servers/edit.ctp:37
+#: View/Servers/add.ctp:42
+#: View/Servers/edit.ctp:43
 msgid "External Organisation"
 msgstr "外部組織"
 
-#: View/Servers/add.ctp:46
-#: View/Servers/edit.ctp:48
-msgid "Local Organisation"
-msgstr "ローカル組織"
+#: View/Servers/add.ctp:48
+msgid "Owner of remote instance"
+msgstr ""
 
-#: View/Servers/add.ctp:52
-#: View/Servers/edit.ctp:59
+#: View/Servers/add.ctp:54
+#: View/Servers/edit.ctp:65
 msgid "Remote Organisation's Name"
 msgstr "リモート組織名"
 
-#: View/Servers/add.ctp:56
-#: View/Servers/edit.ctp:63
+#: View/Servers/add.ctp:58
+#: View/Servers/edit.ctp:69
 msgid "Remote Organisation's Uuid"
 msgstr "リモート組織の Uuid"
 
-#: View/Servers/add.ctp:97
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:78
+msgid "Enabled synchronisation methods"
+msgstr ""
+
+#: View/Servers/add.ctp:86
 msgid "Server certificate file"
 msgstr "サーバー証明書"
 
-#: View/Servers/add.ctp:103
+#: View/Servers/add.ctp:92
 msgid "Client certificate file"
 msgstr "クライアント証明書"
 
-#: View/Servers/add.ctp:108
-#: View/Servers/edit.ctp:147
+#: View/Servers/add.ctp:97
+#: View/Servers/edit.ctp:142
 msgid "Push rules:"
 msgstr "プッシュ ルール:"
 
-#: View/Servers/add.ctp:109;115
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:98;104
+#: View/Servers/edit.ctp:143;149
 msgid "Events with the following tags allowed: "
 msgstr "以下のタグが許可されたイベント: "
 
-#: View/Servers/add.ctp:110;116
-#: View/Servers/edit.ctp:149;155
+#: View/Servers/add.ctp:99;105
+#: View/Servers/edit.ctp:144;150
 msgid "Events with the following tags blocked: "
 msgstr "以下のタグがブロックされたイベント: "
 
-#: View/Servers/add.ctp:111;117
-#: View/Servers/edit.ctp:150;156
+#: View/Servers/add.ctp:100;106
+#: View/Servers/edit.ctp:145;151
 msgid "Events with the following organisations allowed: "
 msgstr "以下の組織が許可されたイベント: "
 
-#: View/Servers/add.ctp:112;118
-#: View/Servers/edit.ctp:151;157
+#: View/Servers/add.ctp:101;107
+#: View/Servers/edit.ctp:146;152
 msgid "Events with the following organisations blocked: "
 msgstr "以下の組織がブロックされたイベント: "
 
-#: View/Servers/add.ctp:114
-#: View/Servers/edit.ctp:153
+#: View/Servers/add.ctp:103
+#: View/Servers/edit.ctp:148
 msgid "Pull rules:"
 msgstr "プル ルール:"
 
-#: View/Servers/add.ctp:142
-#: View/Servers/edit.ctp:184
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:179
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr "同期したい外部サーバーのベース Url。例: https://foo.sig.mil.be"
 
-#: View/Servers/add.ctp:148
+#: View/Servers/add.ctp:137
 msgid "Unpublish new event (working with Pull event)."
 msgstr "新しいイベントを非公開 (プルイベントと連動)"
 
-#: View/Servers/add.ctp:149
+#: View/Servers/add.ctp:138
 msgid "Publish new event without email (working with Push event)."
 msgstr "新しいイベントをEメールなしで公開 (プッシュイベントと連動)"
 
-#: View/Servers/add.ctp:150
+#: View/Servers/add.ctp:139
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr "接続しようとしているインスタンスに独自の署名権限がある場合、証明書ファイルをアップロードすることもできます。(*.pem)"
 
-#: View/Servers/edit.ctp:16
+#: View/Servers/edit.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change. This also requires that the current instance's host organisation and the remote sync organisation are the same."
 msgstr "下記のチェックボックをチェックすると、このインスタンスを内部インスタンスとして設定できます。\n"
 "つまり、このインスタンスとリモート間の同期は、通常の同期シナリオと同じように自動的にはデグレーションしません。あなたがこの両方のインスタンスを所有していることを確認してください。OKではない場合、危険な変更になります。現在のインスタンスのホスト組織とリモート同期先の組織が同じであることが必要です。"
 
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:37
 msgid "Organisation Type"
 msgstr "組織のタイプ"
 
-#: View/Servers/edit.ctp:69
+#: View/Servers/edit.ctp:54
+msgid "Local Organisation"
+msgstr "ローカル組織"
+
+#: View/Servers/edit.ctp:75
 msgid "Leave empty to use current key"
 msgstr "現在のキーを使用する場合、空のままにしてください"
 
-#: View/Servers/edit.ctp:104
+#: View/Servers/edit.ctp:99
 msgid "Server certificate file (*.pem): "
 msgstr "サーバー証明書ファイル (*.pem): "
 
-#: View/Servers/edit.ctp:112;134
+#: View/Servers/edit.ctp:107;129
 msgid "Add certificate file"
 msgstr "証明書を追加"
 
-#: View/Servers/edit.ctp:113;135
+#: View/Servers/edit.ctp:108;130
 msgid "Remove certificate file"
 msgstr "証明書を削除"
 
-#: View/Servers/edit.ctp:126
+#: View/Servers/edit.ctp:121
 msgid "Client certificate file: "
 msgstr "クライアント証明書: "
 
-#: View/Servers/edit.ctp:193
+#: View/Servers/edit.ctp:188
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr "接続しようとしているインスタンスに要求された場合、クライアント証明書ファイルをアップロードすることもできます。"
 
-#: View/Servers/edit.ctp:250;254
+#: View/Servers/edit.ctp:245;249
 msgid "Not set."
 msgstr "設定されていません。"
 
@@ -11593,8 +12277,8 @@ msgid "Example:"
 msgstr "例:"
 
 #: View/Servers/filter_event_index.ctp:21
-msgid "Apply filters to the remote instance"
-msgstr "リモートインスタンスにフィルターを適用"
+msgid "Apply filters to the remote instance's index"
+msgstr ""
 
 #: View/Servers/index.ctp:2
 msgid "Servers"
@@ -11604,34 +12288,38 @@ msgstr "サーバー"
 msgid "Connection test"
 msgstr "接続テスト"
 
-#: View/Servers/index.ctp:30
+#: View/Servers/index.ctp:31
 msgid "Remote Organisation"
 msgstr "リモート組織"
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Test the connection to the remote instance"
 msgstr "リモートインスタントとの接続をテスト"
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Run"
 msgstr "実行"
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Internal instance that ignores distribution level degradation *WARNING: Only use this setting if you have several internal instances and the sync link is to an internal extension of the current MISP community*"
 msgstr "内部インスタンスはディストリビューションレベルのデグレーションを無視します。 *注意: いくつかの内部インスタンスがあり、同期リンクが現在のMISP コミュニティの内部拡張の場合のみ、この設定を使用してください*"
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr "外部の MISP インスタンスへの通常の同期リンク。ディストリビューションのデグレーションは通常のルールに従います。"
 
-#: View/Servers/index.ctp:86
+#: View/Servers/index.ctp:122
 msgid "Explore"
 msgstr "探索"
 
-#: View/Servers/index.ctp:88
+#: View/Servers/index.ctp:124
 msgid "Pull updates to events that already exist locally"
 msgstr "現在ローカルに存在するイベントの更新をプル"
 
+#: View/Servers/index.ctp:131
+msgid "Cache instance"
+msgstr ""
+
 #: View/Servers/preview_event.ctp:7
 msgid "You are currently viewing an event on the remote instance %s "
 msgstr "現在、リモートインスタンス %s 上のイベントを表示しています "
@@ -11648,15 +12336,15 @@ msgstr "タグ: %s でリモートインスタンスをフィルター"
 msgid "You are currently viewing the event index of the remote instance %s"
 msgstr "現在、リモートインスタンス %s 上のイベントインデックスを表示しています"
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr "非 "
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "published"
 msgstr "公開済み"
 
-#: View/Servers/preview_index.ctp:147
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr "イベントを取得"
 
@@ -11700,19 +12388,23 @@ msgstr "成功したプッシュ"
 msgid "No succeeded pushes"
 msgstr "成功したプッシュはありません"
 
-#: View/Servers/rest.ctp:7;17
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
 msgid "Relative path to query"
 msgstr "クエリーへの相対パス"
 
-#: View/Servers/rest.ctp:54
+#: View/Servers/rest.ctp:116
 msgid "Response code"
 msgstr "レスポンスコード"
 
-#: View/Servers/rest.ctp:55
+#: View/Servers/rest.ctp:117
 msgid "Request duration"
 msgstr "リクエストの所要時間"
 
-#: View/Servers/rest.ctp:56
+#: View/Servers/rest.ctp:118
 msgid "Headers"
 msgstr "Headers"
 
@@ -11732,6 +12424,10 @@ msgstr "追加するインスタンスを選択"
 msgid "Available Instances"
 msgstr "利用可能なインスタンス"
 
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
+msgid "Added Instances"
+msgstr ""
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 msgid "Add servers to sharing group"
 msgstr "共有グループにサーバーを追加"
@@ -11779,39 +12475,31 @@ msgstr "提案"
 msgid "IDS Signature?"
 msgstr "IDS シグネチャー?"
 
-#: View/ShadowAttributes/index.ctp:21
-msgid "Only list proposals of my organisation"
-msgstr "自組織内の提案のみの一覧"
-
-#: View/ShadowAttributes/index.ctp:21
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr "自組織のイベント"
 
-#: View/ShadowAttributes/index.ctp:26
-msgid "List all proposals"
-msgstr "すべてのプロポーザルの一覧"
-
-#: View/ShadowAttributes/index.ctp:26
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
 msgstr "すべてのイベント"
 
-#: View/ShadowAttributes/index.ctp:33
+#: View/ShadowAttributes/index.ctp:43
 msgid "Proposal by"
 msgstr "提案者"
 
-#: View/ShadowAttributes/index.ctp:39
+#: View/ShadowAttributes/index.ctp:49
 msgid "Event creator"
 msgstr "イベント作成者"
 
-#: View/ShadowAttributes/index.ctp:45
+#: View/ShadowAttributes/index.ctp:55
 msgid "Proposed value"
 msgstr "提案された値"
 
-#: View/ShadowAttributes/index.ctp:71
+#: View/ShadowAttributes/index.ctp:81
 msgid "Attribute edit"
 msgstr "アトリビュート編集"
 
-#: View/ShadowAttributes/index.ctp:73
+#: View/ShadowAttributes/index.ctp:83
 msgid "New Attribute"
 msgstr "新しいアトリビュート"
 
@@ -11839,160 +12527,160 @@ msgstr "提案を削除"
 msgid "New Sharing Group"
 msgstr "新しい共有グループ"
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
-msgid "General tab"
-msgstr "全般タブ"
-
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
 msgid "General"
 msgstr "全般"
 
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr "全般タブ"
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
 msgid "Organisations tab"
 msgstr "組織タブ"
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
-msgid "MISP instances tab"
-msgstr "MISP インスタンスのタブ"
-
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
 msgid "MISP Instances"
 msgstr "MISP インスタンス"
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
-msgid "Sharing group summary"
-msgstr "共有グループのサマリー"
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
+msgstr "MISP インスタンスのタブ"
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
 msgstr "サマリーと保存"
 
-#: View/SharingGroups/add.ctp:12
-#: View/SharingGroups/edit.ctp:12
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr "共有グループのサマリー"
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
 msgid "Example: Multinational sharing group"
 msgstr "例: 多国籍の共有グループ"
 
-#: View/SharingGroups/add.ctp:13
-#: View/SharingGroups/edit.ctp:13
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
 msgid "Releasable to"
 msgstr "リリース先"
 
-#: View/SharingGroups/add.ctp:14
-#: View/SharingGroups/edit.ctp:14
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
 msgid "Example: Community1, Organisation1, Organisation2"
 msgstr "例: コミュニティ1、組織1、組織2"
 
-#: View/SharingGroups/add.ctp:16
-#: View/SharingGroups/edit.ctp:16
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
 msgid "A description of the sharing group."
 msgstr "共有グループの説明。"
 
-#: View/SharingGroups/add.ctp:18
-#: View/SharingGroups/edit.ctp:18
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
 msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
 msgstr "イベント作成時に、ローカルインスタンス上のユーザーはアクティブな共有グループを選択することができます。一般的に、共有グループは同期経由で受け取りますが、これは手動で有効化されるまで無効になっています。"
 
-#: View/SharingGroups/add.ctp:19
-#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
 msgid "Make the sharing group selectable (active)"
 msgstr "共有グループを選択可能 (アクティブ) にする"
 
-#: View/SharingGroups/add.ctp:21;38;59
-#: View/SharingGroups/edit.ctp:21;38;67
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
 msgid "Next page"
 msgstr "次のページ"
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation(s) to the sharing group"
 msgstr "ローカル組織を共有グループに追加"
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation"
 msgstr "ローカル組織を追加"
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisations to the sharing group"
 msgstr "リモート組織を共有グループに追加"
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisation"
 msgstr "リモート組織を追加"
 
-#: View/SharingGroups/add.ctp:33
-#: View/SharingGroups/edit.ctp:33
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
 #: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr "拡張"
 
-#: View/SharingGroups/add.ctp:37;58;74
-#: View/SharingGroups/edit.ctp:37;66;82
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
 msgid "Previous page"
 msgstr "前のページ"
 
-#: View/SharingGroups/add.ctp:42
-#: View/SharingGroups/edit.ctp:50
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
 msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
 msgstr "この共有グループでローミングモードを有効にします。ローミングモードでは、共有グループは組織リストにリモート受信者が含まれるすべてのインスタンスに渡すことができます。代わりに、受信者インスタンスを列挙することをお勧めします。"
 
-#: View/SharingGroups/add.ctp:43
-#: View/SharingGroups/edit.ctp:51
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
 msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
 msgstr "この共有グループで<b>ローミングモードを有効にする</b>(同期接続が関連づけられており共有グループ組織リストに含まれている組織の接続インスタンスにイベントを渡します)"
 
-#: View/SharingGroups/add.ctp:47
-#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
 msgid "Add instance"
 msgstr "インスタンスの追加"
 
-#: View/SharingGroups/add.ctp:53
-#: View/SharingGroups/edit.ctp:61
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
 #: View/SharingGroups/view.ctp:69
 msgid "All orgs"
 msgstr "すべての組織"
 
-#: View/SharingGroups/add.ctp:63
+#: View/SharingGroups/add.ctp:103
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
 msgstr "<span class=\"bold\">一般: </span>あなたは<span id=\"summarytitle\" class=\"red bold\"></span>共有グループを作成しようとしています。これは、<span id=\"summaryreleasable\" class=\"red bold\"></span>にリリースすることを意図しています。"
 
-#: View/SharingGroups/add.ctp:64
+#: View/SharingGroups/add.ctp:104
 msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr "ローカル組織: </span>共有グループを拡張できる<span id=\"summarylocalextend\" class=\"red bold\"></span>から、<span id=\"summarylocal\" class=\"red bold\"></span>が見えます。"
 
-#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/add.ctp:105
 msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr "外部組織: </span>共有グループを拡張できる<span id=\"summaryexternalextend\" class=\"red bold\"></span> から、<span id=\"summaryexternal\" class=\"red bold\"></span>が見えます。"
 
-#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/add.ctp:106
 msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr "<span class=\"bold\">同期: </span>さらに、イベントは自動的に <span id=\"summaryservers\" class=\"red bold\"></span> へプッシュされます。"
 
-#: View/SharingGroups/add.ctp:67
-#: View/SharingGroups/edit.ctp:75
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
 msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
 msgstr "この情報を編集するには、前のページに戻ってください。上記の情報に同意する場合、送信をクリックして共有グループを作成します。"
 
-#: View/SharingGroups/add.ctp:75
-#: View/SharingGroups/edit.ctp:83
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
 msgid "Submit and create sharing group"
 msgstr "共有グループを送信・作成"
 
-#: View/SharingGroups/add.ctp:95
+#: View/SharingGroups/add.ctp:135
 msgid "Local instance"
 msgstr "ローカルインスタンス"
 
-#: View/SharingGroups/edit.ctp:71
+#: View/SharingGroups/edit.ctp:111
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
 "                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
 "                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
@@ -12000,7 +12688,7 @@ msgstr "<span class=\"bold\">一般: </span>あなたは<span id=\"summarytitle\
 "<p id=\"localText\"><span class=\"bold\">ローカル組織: </span>共有グループを拡張できる<span id=\"summarylocalextend\" class=\"red bold\"></span>から、<span id=\"summarylocal\" class=\"red bold\"></span>が見えます。</p>\n"
 "<p id=\"externalText\"><span class=\"bold\">外部組織: </span>共有グループを拡張できる<span id=\"summaryexternalextend\" class=\"red bold\"></span> から、<span id=\"summaryexternal\" class=\"red bold\"></span>が見えます。"
 
-#: View/SharingGroups/edit.ctp:74
+#: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr "同期: </span>さらに、イベントは自動的に <span id=\"summaryservers\" class=\"red bold\"></span> へプッシュされます。"
 
@@ -12008,23 +12696,15 @@ msgstr "同期: </span>さらに、イベントは自動的に <span id=\"summar
 msgid "Sharing Groups"
 msgstr "共有グループ"
 
-#: View/SharingGroups/index.ctp:20
-msgid "View only active sharing groups"
-msgstr "アクティブな共有グループのみを表示"
-
-#: View/SharingGroups/index.ctp:20
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
 msgstr "アクティブな共有グループ"
 
-#: View/SharingGroups/index.ctp:21
-msgid "View only passive sharing groups"
-msgstr "パッシブな共有グループのみを表示"
-
-#: View/SharingGroups/index.ctp:21
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
 msgstr "パッシブな共有グループ"
 
-#: View/SharingGroups/index.ctp:61
+#: View/SharingGroups/index.ctp:80
 msgid "Distribution List"
 msgstr "ディストリビューションのリスト"
 
@@ -12068,6 +12748,18 @@ msgstr "アトリビュート ID"
 msgid "Delete sighting"
 msgstr "サイティングを削除"
 
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
+msgid "Add Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
+msgstr ""
+
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
 msgid "Remove Sighting"
 msgstr "サイティングを削除"
@@ -12080,6 +12772,26 @@ msgstr "サイティング (%s) を削除?"
 msgid "Remove sighting"
 msgstr "サイティングを削除"
 
+#: View/TagCollections/add.ctp:8
+msgid "Edit Tag Collection"
+msgstr ""
+
+#: View/TagCollections/add.ctp:16
+msgid "Visible to all orgs"
+msgstr ""
+
+#: View/TagCollections/import.ctp:4
+msgid "Paste tag collection data"
+msgstr ""
+
+#: View/TagCollections/import.ctp:5
+msgid "Paste a MISP tag collection JSON below to add tag collections."
+msgstr ""
+
+#: View/TagCollections/import.ctp:10
+msgid "Tag collection JSON"
+msgstr ""
+
 #: View/Tags/add.ctp:12
 #: View/Tags/edit.ctp:12
 msgid "Restrict tagging to org"
@@ -12090,6 +12802,10 @@ msgstr "タグ付けを組織に限定"
 msgid "Restrict tagging to user"
 msgstr "タグ付けをユーザーに限定"
 
+#: View/Tags/edit.ctp:31
+msgid "Unselectable Tag"
+msgstr ""
+
 #: View/Tags/index.ctp:10
 msgid "Your Favourite Tags"
 msgstr "お気に入りのタグ"
@@ -12122,57 +12838,6 @@ msgstr "タグ付きアトリビュート"
 msgid "Favourite"
 msgstr "お気に入り"
 
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr "本当に \"%s\" を削除しますか?"
-
-#: View/Tags/ajax/select_tag.ctp:2
-msgid "Select Tag"
-msgstr "タグを選択"
-
-#: View/Tags/ajax/select_tag.ctp:16
-#: View/Tags/ajax/taxonomy_choice.ctp:4
-msgid "search tags…"
-msgstr "タグを検索..."
-
-#: View/Tags/ajax/select_tag.ctp:25
-msgid "Attach tag"
-msgstr "タグをアタッチ"
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Return to taxonomy selection"
-msgstr "タクソノミーの選択に戻る"
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Select Taxonomy"
-msgstr "タクソノミーを選択"
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Back to Taxonomy Selection"
-msgstr "タクソノミーの選択に戻る"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:2
-msgid "Select Tag Source"
-msgstr "タグのソースを選択"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:10
-msgid "Favourite Tags"
-msgstr "お気に入りのタグ"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:14
-msgid "Custom Tags"
-msgstr "カスタムタグ"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:17
-msgid "All Tags"
-msgstr "すべてのタグ"
-
-#: View/Tags/ajax/taxonomy_choice.ctp:21
-#: View/Taxonomies/view.ctp:2
-msgid "Taxonomy Library"
-msgstr "タクソノミーライブラリー"
-
 #: View/Tasks/index.ctp:4
 msgid "Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks."
 msgstr "ここでは、x 時間毎に実行される事前定義されたタスクをスケジュールすることができます。次回のスケジュールされた実行の日時と、それが繰り返される頻度 (hours 単位) を変更することができます。頻度を 0 に設定すると、タスクは繰り返されません。上記の設定を変更するには、スケジュールタスクの編集の完了後に該当する項目をクリックし\"すべてをアップデート\"をクリックします。"
@@ -12210,7 +12875,8 @@ msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr "本当にこのタクソノミーに関連付けられているすべてのタグを有効にしますか?"
 
 #: View/Taxonomies/index.ctp:41
-#: View/Taxonomies/view.ctp:29;143
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr "無効化"
 
@@ -12220,7 +12886,8 @@ msgid "Are you sure you want to disable this taxonomy library?"
 msgstr "本当にこのタクソノミーライブラリーを無効にしますか?"
 
 #: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:31;147
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr "有効化"
 
@@ -12237,19 +12904,27 @@ msgstr "タクソノミーを削除"
 msgid "Create and/or update selected tags"
 msgstr "選択したタグの削除または更新"
 
-#: View/Taxonomies/view.ctp:116
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
 msgid "Hidden"
 msgstr "非表示"
 
-#: View/Taxonomies/view.ctp:125
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr "グラフを表示"
 
-#: View/Taxonomies/view.ctp:142
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
 msgstr "更新"
 
-#: View/Taxonomies/view.ctp:147
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr "リフレッシュまたは有効化"
 
@@ -12277,6 +12952,30 @@ msgstr "選択したすべてのタクソノミー エントリーをタグと
 msgid "Create / update all taxonomy entries as tags"
 msgstr "すべてのタクソノミー エントリーをタグとして作成 / 更新"
 
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
 #: View/TemplateElements/ajax/ajaxIndex.ctp:2
 msgid "Template Elements"
 msgstr "テンプレート要素"
@@ -12529,6 +13228,8 @@ msgid "Admin Edit User"
 msgstr "管理 ユーザーを編集"
 
 #: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
 msgid "Terms accepted"
 msgstr "利用規約の承認"
 
@@ -12595,15 +13296,19 @@ msgstr "単一ユーザー"
 msgid "All users"
 msgstr "すべてのユーザー"
 
-#: View/Users/admin_email.ctp:36
+#: View/Users/admin_email.ctp:19
+msgid "All users of the same organisation"
+msgstr ""
+
+#: View/Users/admin_email.ctp:39
 msgid "Enter a custom message"
 msgstr "カスタムメッセージを入力"
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "New user registration"
 msgstr "新しいユーザーの登録"
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "Password reset"
 msgstr "パスワードリセット"
 
@@ -12627,10 +13332,6 @@ msgstr "フィルターを適用"
 msgid "Users"
 msgstr "ユーザー"
 
-#: View/Users/admin_index.ctp:40
-msgid "Filter user index"
-msgstr "ユーザーインデックスをフィルター"
-
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr "%s に連絡"
@@ -12643,42 +13344,48 @@ msgstr "警告: このユーザーには暗号化キーが設定されていま
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr "%s キーがユーザー用に見つかりました、Eメールはこのキーを用いて暗号化して送られます。"
 
-#: View/Users/admin_view.ctp:35
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
 msgid "Contactalert"
 msgstr "連絡先アラート"
 
-#: View/Users/admin_view.ctp:46
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr "API アクセスをリクエスト"
+
+#: View/Users/admin_view.ctp:44
 msgid "Invited By"
 msgstr "招待者"
 
-#: View/Users/admin_view.ctp:51
-msgid "Org admin"
-msgstr "組織管理者"
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
+msgstr ""
 
-#: View/Users/admin_view.ctp:74
-#: View/Users/view.ctp:67
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr "NIDS スタート SID"
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr "パスワードの変更"
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
 msgid "GnuPG fingerprint"
 msgstr "GnuPG フィンガープリント"
 
-#: View/Users/admin_view.ctp:80
-#: View/Users/view.ctp:73
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
 msgid "GnuPG status"
 msgstr "GnuPG ステータス"
 
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:83
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
 msgid "SMIME Public certificate"
 msgstr "SMIME 公開証明書"
 
-#: View/Users/admin_view.ctp:95
-msgid "Nids Sid"
-msgstr "Nids Sid"
-
-#: View/Users/admin_view.ctp:110
-msgid "Password change"
-msgstr "パスワードの変更"
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr "GnuPG で失敗?"
@@ -12711,37 +13418,37 @@ msgid "Proposals active"
 msgstr "アクティブな提案"
 
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:34
+#: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
 msgstr "ディスカッションスレッド"
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:39
+#: View/Users/statistics_data.ctp:45
 msgid "Discussion posts"
 msgstr "ディスカッションポスト"
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:48
+#: View/Users/statistics_data.ctp:54
 msgid "A heatmap showing user activity for each day during this month and the 4 months that preceded it. Use the buttons below to only show the heatmap of a specific organisation."
 msgstr "今月とそれ以前の4ヶ月間の日々のユーザー活動を示すヒートマップ。下のボタンを使用すると、特定の組織のヒートマップのみを表示できます。"
 
 #: View/Users/statistics.ctp:60
-#: View/Users/statistics_data.ctp:65
+#: View/Users/statistics_data.ctp:71
 msgid "Go left"
 msgstr "左へ"
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:71
+#: View/Users/statistics_data.ctp:77
 msgid "Go right"
 msgstr "右へ"
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:118
+#: View/Users/statistics_data.ctp:124
 msgid "The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings."
 msgstr "上記のグラフは、互換モードでは正しく機能しません。 Internet Explorer の設定で無効にしていることを確認してください。"
 
 #: View/Users/statistics.ctp:117
-#: View/Users/statistics_data.ctp:122
+#: View/Users/statistics_data.ctp:128
 msgid "The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer."
 msgstr "上記のグラフは、Internet Explorer 9.0 以前では正しく動作しません。Chorome, Firefox をダウンロードするか、新しいバージョンの Internet Explore にアップグレードしてください。"
 
@@ -12749,6 +13456,18 @@ msgstr "上記のグラフは、Internet Explorer 9.0 以前では正しく動
 msgid "A heatmap showing the usage of ATT&CK Tactic."
 msgstr "ATT&CK Tactic の使用方法を示すヒートマップ"
 
+#: View/Users/statistics_data.ctp:32
+msgid "Users with PGP keys"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:36
+msgid "Local Organisations"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:38
+msgid "Average Users / Org"
+msgstr ""
+
 #: View/Users/statistics_orgs.ctp:17
 msgid "Organisation list"
 msgstr "組織のリスト"
@@ -12817,13 +13536,13 @@ msgstr "証明書のバリデーション"
 msgid "GnuPG key validation"
 msgstr "GnuPG キーのバリデーション"
 
-#: View/Users/view.ctp:45
-msgid "Request API access"
-msgstr "API アクセスをリクエスト"
+#: View/Users/ajax/emailConfirmTemplate.ctp:2
+msgid "Confirm sending"
+msgstr ""
 
-#: View/Users/view.ctp:50
-msgid "NIDS Start SID"
-msgstr "NIDS スタート SID"
+#: View/Users/ajax/emailConfirmTemplate.ctp:4
+msgid "You are about to send a mail to %s recipient(s)?"
+msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:2
 msgid "Choose the key that you would like to use"
@@ -12885,7 +13604,7 @@ msgstr "警告リストの削除"
 msgid "Delete warninglist"
 msgstr "警告リストの削除"
 
-#: View/Warninglists/view.ctp:29
+#: View/Warninglists/view.ctp:14;16
 msgid "Accepted attribute types"
 msgstr "承認されたアトリビュートのタイプ"
 
@@ -12961,6 +13680,7 @@ msgstr "真偽値"
 #: Model/Attribute.php:validation for field uuid
 #: Model/Event.php:validation for field uuid;validation for field extends_uuid
 #: Model/EventBlacklist.php:validation for field event_uuid
+#: Model/MispObject.php:validation for field uuid
 #: Model/OrgBlacklist.php:validation for field org_uuid
 #: Model/Organisation.php:validation for field uuid
 #: Model/ShadowAttribute.php:validation for field uuid
@@ -12969,6 +13689,7 @@ msgid "Please provide a valid UUID"
 msgstr "有効な UUID を入力してください"
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/MispObject.php:validation for field uuid
 msgid "The UUID provided is not unique"
 msgstr "入力された UUID はユニークでありません"
 
@@ -12988,6 +13709,7 @@ msgstr "オプション: あなたの組織のみ、このコミュニティの
 #: Model/ServerTag.php:validation for field server_id;validation for field tag_id
 #: Model/SharingGroup.php:validation for field name
 #: Model/Tag.php:validation for field name;validation for field colour
+#: Model/TagCollection.php:validation for field name
 #: Model/TemplateElementAttribute.php:validation for field name;validation for field description
 #: Model/ThreatLevel.php:validation for field name;validation for field description;validation for field form_description
 #: Model/User.php:validation for field org_id;validation for field authkey
@@ -13087,6 +13809,7 @@ msgid "This field is required."
 msgstr "この項目は必須です。"
 
 #: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
 #: Model/Whitelist.php:validation for field name
 msgid "A similar name already exists."
 msgstr "類似の名前が既に存在します。"
diff --git a/app/Locale/kor/LC_MESSAGES/default.po b/app/Locale/kor/LC_MESSAGES/default.po
index 097e496c2..50a9f3b74 100644
--- a/app/Locale/kor/LC_MESSAGES/default.po
+++ b/app/Locale/kor/LC_MESSAGES/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-01-22 21:25\n"
+"PO-Revision-Date: 2019-03-06 02:07\n"
 "Last-Translator: SteveClement <steve@localhost.lu>\n"
 "Language-Team: Korean\n"
 "MIME-Version: 1.0\n"
@@ -15,272 +15,285 @@ msgstr ""
 "Language: ko_KR\n"
 
 #: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:149;153;157
+#: Controller/AttributesController.php:125;129;133
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1001;1348;1352;1356;1385;1800;1876;1880;1884;2102;2166;2248;2903;5264;5429;5433;5442
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
 #: Controller/PostsController.php:56
+#: Model/Galaxy.php:292
 msgid "Invalid event"
-msgstr "올바르지 않은 이벤트"
+msgstr "유효하지 않은 이벤트"
 
-#: Controller/AppController.php:607
+#: Console/Command/ServerShell.php:49
+#: Controller/ServersController.php:632
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+msgstr ""
+
+#: Console/Command/ServerShell.php:51
+msgid "ERROR: %s"
+msgstr ""
+
+#: Controller/AppController.php:383
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr ""
+
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
+msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+msgstr "이 인증키는 export 권한이 없습니다. 관리자에게 문의하세요."
+
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
+msgid "You have to be logged in to do that."
+msgstr "로그인이 필요합니다."
+
+#: Controller/AppController.php:627
+msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
+msgstr ""
+
+#: Controller/AppController.php:752
 msgid "All done. attribute_count generated from scratch for "
 msgstr "모두 완료. 처음부터 생성 된 attribute_count "
 
-#: Controller/AppController.php:726
-#: Controller/AttributesController.php:2668
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
 #: Controller/ShadowAttributesController.php:1276
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "작업이 대기중 입니다. 활성화된 작업 진행 상황은 (관리 -> 작업) 에서 확인하실 수 있습니다."
 
-#: Controller/AttributesController.php:140;1392
+#: Controller/AttributesController.php:116;1403
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "이벤트 ID가 설정되지 않았습니다."
 
-#: Controller/AttributesController.php:143
+#: Controller/AttributesController.php:119
 msgid "You don't have permissions to create attributes"
 msgstr "Attribute를 생성할 권한이 없습니다."
 
-#: Controller/AttributesController.php:163;489;666
+#: Controller/AttributesController.php:139;488;668
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1684;1705;1739
-#: Controller/ObjectsController.php:442
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
 msgid "You do not have permission to do that."
 msgstr "권한이 없습니다."
 
-#: Controller/AttributesController.php:414;864;869;873;1072;1152;2684;2698;2731;2753;2762;3309;3313;3409;3413
-#: Controller/ShadowAttributesController.php:824;1067;1091;1124;1134
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
 #: Controller/TagsController.php:491
 msgid "Invalid attribute"
 msgstr "올바르지 않은 속성"
 
-#: Controller/AttributesController.php:424
-#: Controller/ShadowAttributesController.php:500
+#: Controller/AttributesController.php:421
+#: Controller/ShadowAttributesController.php:499
 msgid "You do not have the permission to view this event."
 msgstr "이 이벤트를 볼 수 있는 권한이 없습니다."
 
-#: Controller/AttributesController.php:472
+#: Controller/AttributesController.php:468
 msgid "Attribute not an attachment or malware-sample"
 msgstr "속성이 첨부파일이나 멀웨어-샘플이 아닙니다."
 
-#: Controller/AttributesController.php:504;677
-#: Controller/ShadowAttributesController.php:548
-msgid "PHP says file was not uploaded. Are you attacking me?"
-msgstr "PHP에서 파일이 업로드 되지 안았습니다. 웹해킹 중이신가요?"
-
-#: Controller/AttributesController.php:680
-#: Controller/ShadowAttributesController.php:551;561
-msgid "There was a problem to upload the file."
-msgstr "파일 업로드에 문제가 발생했습니다."
-
-#: Controller/AttributesController.php:824
-msgid "The ThreatConnect data has been imported."
-msgstr "ThreatConnect 데이터를 가져 왔습니다."
-
-#: Controller/AttributesController.php:827
-msgid "%s entries imported."
-msgstr "%s 항목을 가져왔습니다."
-
-#: Controller/AttributesController.php:831
-msgid "%s entries could not be imported."
-msgstr "%s 항목을 가져올 수 없습니다."
-
-#: Controller/AttributesController.php:881;924;926
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "올바르지 않은 속성."
-
-#: Controller/AttributesController.php:920
-msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
-msgstr "Attribute을 저장 할 수 없습니다. 요청된 Attribute가 로컬 복사본보다 최신이 아닙니다."
-
-#: Controller/AttributesController.php:936;1401
-#: Controller/EventsController.php:4635;4648;5213;5227
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
 msgid "Invalid Event."
 msgstr "유효하지 않은 이벤트."
 
-#: Controller/AttributesController.php:953
+#: Controller/AttributesController.php:503;679
+#: Controller/ShadowAttributesController.php:546
+msgid "PHP says file was not uploaded. Are you attacking me?"
+msgstr "PHP에서 파일이 업로드 되지 안았습니다. 웹해킹 중이신가요?"
+
+#: Controller/AttributesController.php:682
+#: Controller/ShadowAttributesController.php:549;559
+msgid "There was a problem to upload the file."
+msgstr "파일 업로드에 문제가 발생했습니다."
+
+#: Controller/AttributesController.php:826
+msgid "The ThreatConnect data has been imported."
+msgstr "ThreatConnect 데이터를 가져 왔습니다."
+
+#: Controller/AttributesController.php:829
+msgid "%s entries imported."
+msgstr "%s 항목을 가져왔습니다."
+
+#: Controller/AttributesController.php:833
+msgid "%s entries could not be imported."
+msgstr "%s 항목을 가져올 수 없습니다."
+
+#: Controller/AttributesController.php:883;931;933
+#: Controller/ShadowAttributesController.php:829
+msgid "Invalid attribute."
+msgstr "올바르지 않은 속성."
+
+#: Controller/AttributesController.php:927
+msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
+msgstr "Attribute을 저장 할 수 없습니다. 요청된 Attribute가 로컬 복사본보다 최신이 아닙니다."
+
+#: Controller/AttributesController.php:960
 msgid "The attribute has been saved"
 msgstr "속성이 저장되었습니다"
 
-#: Controller/AttributesController.php:985
+#: Controller/AttributesController.php:995
 msgid "The attribute could not be saved. Please, try again."
 msgstr "속성이 저장되지 않았습니다. 다시 시도하세요."
 
-#: Controller/AttributesController.php:1076
+#: Controller/AttributesController.php:1087
 msgid "Invalid event id."
 msgstr "올바르지 않은 이벤트 id."
 
-#: Controller/AttributesController.php:1106
-#: Controller/EventsController.php:2023
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
+#: Controller/ShadowAttributesController.php:729
 msgid "Invalid input."
 msgstr "올바르지 않은 입력."
 
-#: Controller/AttributesController.php:1111
+#: Controller/AttributesController.php:1122
 msgid "Invalid field."
 msgstr "유효하지 않은 필드."
 
-#: Controller/AttributesController.php:1156
+#: Controller/AttributesController.php:1167
 msgid "Invalid attribute id."
 msgstr "올바르지 않은 속성 id."
 
-#: Controller/AttributesController.php:1231;1241
+#: Controller/AttributesController.php:1242;1252
 msgid "Attribute deleted"
 msgstr "속성이 삭제되었습니다"
 
-#: Controller/AttributesController.php:1236;1238
+#: Controller/AttributesController.php:1247;1249
 msgid "Attribute was not deleted"
 msgstr "속성이 삭제되지 않았습니다"
 
-#: Controller/AttributesController.php:1263;3155
-#: Controller/ShadowAttributesController.php:864
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
 msgid "Invalid Attribute"
 msgstr "올바르지 않은 속성"
 
-#: Controller/AttributesController.php:1290
+#: Controller/AttributesController.php:1301
 msgid "Could not restore the attribute"
 msgstr "Attribute를 복원 할 수 없습니다."
 
-#: Controller/AttributesController.php:1311;1318;1322
+#: Controller/AttributesController.php:1322;1329;1333
 msgid "Attribute not found or not authorised."
 msgstr "Attribute를 찾을 수 없거나 권한이 없습니다."
 
-#: Controller/AttributesController.php:1372
+#: Controller/AttributesController.php:1383
 msgid "This function is only accessible via POST requests."
 msgstr "이 함수는 POST로만 접근 가능합니다."
 
-#: Controller/AttributesController.php:1427
+#: Controller/AttributesController.php:1438
 msgid "No matching attributes found."
 msgstr "매칭된 Attributes가 없습니다."
 
-#: Controller/AttributesController.php:1461
+#: Controller/AttributesController.php:1472
 msgid "This method can only be accessed via AJAX."
 msgstr "이 메서드는 AJAX로만 접근 가능합니다."
 
-#: Controller/AttributesController.php:1472
+#: Controller/AttributesController.php:1482
 msgid "You are not authorized to edit this event."
 msgstr "이 이벤트를 수정할 권한이 없습니다."
 
-#: Controller/AttributesController.php:1537
+#: Controller/AttributesController.php:1580
 msgid "No event ID provided."
 msgstr "이벤트 ID가 제공되지 않았습니다."
 
-#: Controller/AttributesController.php:1640
-msgid "Invalid tag"
-msgstr "올바르지 않은 태그"
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
+msgid "Synonyms: "
+msgstr "동의어: "
 
-#: Controller/AttributesController.php:2107;2282;2391;2441;2524;2610
-#: Controller/EventsController.php:2484;2600;2662;2720;3079;3301;3993;4011
-msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
-msgstr "이 인증키는 export 권한이 없습니다. 관리자에게 문의하세요."
-
-#: Controller/AttributesController.php:2112;2277;2384
-#: Controller/EventsController.php:3084
+#: Controller/AttributesController.php:1997;2104
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr "권한이 없습니다. application/xml의 Accept header에 인증키를 같이 보내주세요."
 
-#: Controller/AttributesController.php:2123
-msgid "Content type and parameter mismatch. Expecting JSON."
-msgstr "컨텐츠 타입과 파라메터가 맞지 않습니다. JSON이 필요합니다."
-
-#: Controller/AttributesController.php:2128
-msgid "Content type and parameter mismatch. Expecting XML."
-msgstr "컨텐츠 타입과 파라메터가 맞지 않습니다. XML이 필요합니다."
-
-#: Controller/AttributesController.php:2132;2290
+#: Controller/AttributesController.php:2010
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
 msgstr "검색 조건을 url 이나 json 배열, xml(루트 요소는 \"request\"에서 올바른 accept와 content type 헤더를 지정하십시오) 에 POST 하여 지정하여야 합니다."
 
-#: Controller/AttributesController.php:2310
+#: Controller/AttributesController.php:2030
 msgid "You don't have access to that event."
 msgstr "이벤트에 접근할 수 없습니다."
 
-#: Controller/AttributesController.php:2373
+#: Controller/AttributesController.php:2093
 msgid "No matches."
 msgstr "검색결과 없음."
 
-#: Controller/AttributesController.php:2395;2404
+#: Controller/AttributesController.php:2115;2124
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "잘못된 attribute 거나 보기 권한이 없습니다."
 
-#: Controller/AttributesController.php:2445;2528;2614
-#: Controller/EventsController.php:2488;2605;2667;2724;3305;3997;4015
-msgid "You have to be logged in to do that."
-msgstr "로그인이 필요합니다."
-
-#: Controller/AttributesController.php:2472
+#: Controller/AttributesController.php:2192
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
 msgstr ""
 
-#: Controller/AttributesController.php:2536
+#: Controller/AttributesController.php:2256
 msgid "Invalid event ID format."
 msgstr "잘못된 이벤트 ID 형태입니다."
 
-#: Controller/AttributesController.php:2645
+#: Controller/AttributesController.php:2365
 #: Controller/ShadowAttributesController.php:1254
 msgid "All done. "
 msgstr "모두 완료. "
 
-#: Controller/AttributesController.php:2677;2724
+#: Controller/AttributesController.php:2397;2444
 #: Controller/ShadowAttributesController.php:1062
 msgid "Invalid field requested."
 msgstr "잘못 된 필드 요청입니다."
 
-#: Controller/AttributesController.php:2680;2727
+#: Controller/AttributesController.php:2400;2447
 msgid "This function can only be accessed via AJAX."
 msgstr "이 기능은 AJAX에서만 액세스 할 수 있습니다."
 
-#: Controller/AttributesController.php:2792;2800
-#: Controller/EventsController.php:3689;3967
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "이벤트가 없거나 attribute를 만들 권한이 없습니다"
 
-#: Controller/AttributesController.php:2821
+#: Controller/AttributesController.php:2541
 msgid "This action can only be accessed via AJAX."
 msgstr "이 작업은 AJAX에서만 액세스 할 수 있습니다."
 
-#: Controller/AttributesController.php:2830;3081;3095;3106
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
 msgid "You are not authorised to do that."
 msgstr "그것을 할 수있는 권한이 없습니다."
 
-#: Controller/AttributesController.php:2935
-#: Controller/EventsController.php:4431
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
 msgid "This functionality requires API key access."
 msgstr "이 기능은 API 키가 필요합니다."
 
-#: Controller/AttributesController.php:2943
+#: Controller/AttributesController.php:2663
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr "이 작업은 API 전용입니다. 사용 방법은 자동화 페이지를 참조하십시오."
 
-#: Controller/AttributesController.php:2955
+#: Controller/AttributesController.php:2675
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "해시 또는 이벤트 ID가 접수되지 않았습니다. 두 가지 중 하나는 설정해야합니다."
 
-#: Controller/AttributesController.php:3116
+#: Controller/AttributesController.php:2836
 msgid "Invalid script."
 msgstr "잘못된 스크립트."
 
-#: Controller/AttributesController.php:3181
+#: Controller/AttributesController.php:2901
 msgid "No valid enrichment options found for this attribute."
 msgstr "Attribute에 맞는 enrichment를 찾지 못했습니다."
 
-#: Controller/AttributesController.php:3245
+#: Controller/AttributesController.php:2964
 msgid "Invalid type requested."
 msgstr "잘못된 유형이 요청되었습니다."
 
-#: Controller/AttributesController.php:3476
-#: Controller/EventsController.php:5209
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "이 인스턴스는 연관분석 해제가 허용되지 않습니다."
 
-#: Controller/AttributesController.php:3480;3495
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3243;3258
+#: Controller/ShadowAttributesController.php:677
 msgid "Invalid Attribute."
 msgstr "잘못된 속성"
 
-#: Controller/AttributesController.php:3483;3498
-#: Controller/EventsController.php:5216;5230
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
 msgid "You don't have permission to do that."
 msgstr "실행할 수 있는 권한이 없습니다."
 
@@ -288,254 +301,286 @@ msgstr "실행할 수 있는 권한이 없습니다."
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "이벤트 블랙리스팅이 현재 인스턴스에서 활성화 되어 있지 않습니다."
 
-#: Controller/EventsController.php:804
+#: Controller/EventsController.php:848
 msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
 msgstr "X509 인증서 또는 GnuPG 키가 설정되어 있지 않습니다. 속성을 메일로받을 경우 중 하나를 프로필에 추가하십시오."
 
-#: Controller/EventsController.php:806
+#: Controller/EventsController.php:850
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "GnuPG 키가 설정되어 있지 않습니다. 메일로받을 경우 공개 키를 프로필에 추가하십시오."
 
-#: Controller/EventsController.php:812
+#: Controller/EventsController.php:856
 msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
 msgstr "X509 인증서 또는 GnuPG 키가 설정되어 있지 않습니다. attributes를 메일로받을 경우 둘 중 하나는 프로필에 추가하십시오."
 
-#: Controller/EventsController.php:814
+#: Controller/EventsController.php:858
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr "GnuPG 키가 프로필에 설정되어 있지 않습니다. 속성을 메일로받을 경우 공개 키를 프로필에 추가하십시오."
 
-#: Controller/EventsController.php:1527
+#: Controller/EventsController.php:1559
+msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
+msgstr "현재 사이트 관리자로 로그인했으며, 귀하의 조직에 속하지 않은 이벤트를 편집하고 있습니다. 이것은 MISP의 공유 모델에 부합하지 않습니다. 이것은 최후의 방편으로 남겨두고, 일상적인 작업에는 일반 사용자 계정을 이용하십시오."
+
+#: Controller/EventsController.php:1769
 msgid "You don't have permissions to create events"
 msgstr "이벤트를 생성할 수있는 권한이 없습니다"
 
-#: Controller/EventsController.php:1533
+#: Controller/EventsController.php:1775
 msgid "No valid event data received."
 msgstr "유효한 이벤트 데이터가 수신되지 않았습니다."
 
-#: Controller/EventsController.php:1569
+#: Controller/EventsController.php:1811
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "잘못된 공유 그룹이거나 권한이 없습니다(동기화 사용자가 공유 그룹에 포함되어있지 않습니다)."
 
-#: Controller/EventsController.php:1573;1577
+#: Controller/EventsController.php:1815;1819
 msgid "Invalid Sharing Group or not authorised."
 msgstr "잘못된 공유 그룹이거나 권한이 없습니다"
 
-#: Controller/EventsController.php:1601
+#: Controller/EventsController.php:1843
 msgid "Event blocked by local blacklist."
 msgstr "로컬 블랙리스트에 의해 이벤트가 차단되어 있습니다."
 
-#: Controller/EventsController.php:1614;1693;1955
+#: Controller/EventsController.php:1856;1933;2197
 msgid "The event has been saved"
 msgstr "이벤트가 저장되었습니다"
 
-#: Controller/EventsController.php:1622
+#: Controller/EventsController.php:1864
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "이벤트가 이미 존재합니다, 편집하고 싶다면 Location 헤더에 있는 url을 이용하십시오."
 
-#: Controller/EventsController.php:1633
+#: Controller/EventsController.php:1870
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "블랙리스트 항목을 통해 이벤트를 만들 수 없습니다. 관리 팀에 문의하십시오."
 
-#: Controller/EventsController.php:1635;1958
+#: Controller/EventsController.php:1872;2200
 msgid "The event could not be saved. Please, try again."
 msgstr "이벤트가 저장되지 않았습니다. 다시 시도하세요."
 
-#: Controller/EventsController.php:1719
+#: Controller/EventsController.php:1912
+msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
+msgstr "생성된 이벤트는 이 플랫폼에 계정을 가진 모든 조직에 공유되지만, 공개되기 전까지는 다른 MISP 인스턴스와 동기화되지 않습니다."
+
+#: Controller/EventsController.php:1959
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "MISP XML 또는 MISP JSON 파일만 업로드할 수 있습니다."
 
-#: Controller/EventsController.php:1720
+#: Controller/EventsController.php:1960
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "파일 업로드에 실패했거나, 파일의 예상한 확장자(.xml / .json)가 없습니다."
 
-#: Controller/EventsController.php:1768
+#: Controller/EventsController.php:2009
 msgid "STIX document imported, event's created: "
 msgstr "SITX 문서로 가져온 이벤트가 생성되었습니다: "
 
-#: Controller/EventsController.php:1771
+#: Controller/EventsController.php:2012
 msgid "STIX document imported."
 msgstr "STIX 문서를 가져왔다."
 
-#: Controller/EventsController.php:1774
+#: Controller/EventsController.php:2015
 msgid "Could not import STIX document: "
 msgstr "STIX 문서를 가져올 수 없습니다. "
 
-#: Controller/EventsController.php:1781
+#: Controller/EventsController.php:2022
 msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
 msgstr "파일 업로드에 실패했습니다. Stix 파일이 선택되어 있는지, 그리고 파일의 최대 크기가 다음보다 크지 않다는 것을 확인하십시오 "
 
-#: Controller/EventsController.php:1805;1890
+#: Controller/EventsController.php:2046;2131
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "이 동작을 수행 할 권한이 없습니다. \"attribute의 제안\"기능을 사용하십시오."
 
-#: Controller/EventsController.php:1813
+#: Controller/EventsController.php:2054
 msgid "Invalid event ID entered."
 msgstr "올바르지 않은 이벤트 ID 가 입력되었습니다."
 
-#: Controller/EventsController.php:1818
+#: Controller/EventsController.php:2059
 msgid "You are not authorised to read the selected event."
 msgstr "선택한 이벤트를 읽기 권한이 없습니다."
 
-#: Controller/EventsController.php:2109;2172
+#: Controller/EventsController.php:2349;2387;2450
 msgid "You don't have the permission to do that."
 msgstr "실행할 수있는 권한이 없습니다."
 
-#: Controller/EventsController.php:2259
+#: Controller/EventsController.php:2358
+msgid "Event unpublished."
+msgstr ""
+
+#: Controller/EventsController.php:2537
 msgid "Email sent to the reporter."
 msgstr "보고자에게 이메일이 발송되었습니다."
 
-#: Controller/EventsController.php:2261
+#: Controller/EventsController.php:2539
 msgid "Sending of email failed"
 msgstr "이메일 발송 실패"
 
-#: Controller/EventsController.php:2397
+#: Controller/EventsController.php:2678
 msgid "This feature is currently disabled"
 msgstr "이 기능은 비활성화되어 있습니다"
 
-#: Controller/EventsController.php:2439;4025
+#: Controller/EventsController.php:2720;3986
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
 msgstr "검색 조건을 url 이나 xml(루트 요소는 \"request\") 에 POST 하여 지정하여야 합니다."
 
-#: Controller/EventsController.php:2475
+#: Controller/EventsController.php:2756
 msgid "Invalid Event ID."
 msgstr "잘못된 이벤트 ID입니다."
 
-#: Controller/EventsController.php:2522
+#: Controller/EventsController.php:2803
 msgid "No events found that match the passed parameters."
 msgstr "전달된 파라메터에 맞는 이벤트를 찾지 못했습니다."
 
-#: Controller/EventsController.php:2547
+#: Controller/EventsController.php:2828
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
 msgstr ""
 
-#: Controller/EventsController.php:2622;2684
+#: Controller/EventsController.php:2903
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
 msgstr ""
 
-#: Controller/EventsController.php:2641
-#: Model/Attribute.php:1927
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
 msgid "Invalid hash type."
 msgstr "잘못된 해시 유형입니다."
 
-#: Controller/EventsController.php:2871
+#: Controller/EventsController.php:3025
 msgid "Filename not allowed."
 msgstr "허용되지 않은 파일 이름입니다."
 
-#: Controller/EventsController.php:2892
+#: Controller/EventsController.php:3045
 msgid "Problem with writing the ioc file. Please report to administrator."
 msgstr "Ioc 파일을 만드는 데 문제가 발생했습니다. 관리자에게 문의하십시오."
 
-#: Controller/EventsController.php:2986
+#: Controller/EventsController.php:3139
 msgid "This is not a valid MISP XML file."
 msgstr "유효한 MISP XML 파일이 아닙니다."
 
-#: Controller/EventsController.php:3101
-msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type)."
-msgstr ""
-
-#: Controller/EventsController.php:3294
+#: Controller/EventsController.php:3291
 msgid "Not yet implemented"
 msgstr "구현되어 있지 않습니다"
 
-#: Controller/EventsController.php:3312;3316
+#: Controller/EventsController.php:3309;3313
 msgid "Invalid event or not authorised."
 msgstr "잘못된 이벤트 또는 권한이 없습니다."
 
-#: Controller/EventsController.php:3336;3406
+#: Controller/EventsController.php:3333;3403
 msgid "You don't have the privileges to access this."
 msgstr "이것에 접근할 권한이 없습니다."
 
-#: Controller/EventsController.php:3920
-msgid "Could not add tags."
-msgstr "태그를 추가 할 수 없습니다."
+#: Controller/EventsController.php:3610
+#: Controller/TagCollectionsController.php:307
+msgid "Invalid Tag."
+msgstr "유효하지 않은 태그입니다."
 
-#: Controller/EventsController.php:3971;5055
-#: Controller/ObjectsController.php:46;140;144;438
+#: Controller/EventsController.php:3626
+#: Controller/TagCollectionsController.php:323
+msgid "Tag is already attached to this event."
+msgstr "이 이벤트에 이미 태그가 첨부되어 있습니다."
+
+#: Controller/EventsController.php:3637;3643
+#: Controller/TagCollectionsController.php:330
+msgid "Tag(s) added."
+msgstr ""
+
+#: Controller/EventsController.php:3639
+msgid "Tag could not be added."
+msgstr "태그를 추가하지 못했습니다."
+
+#: Controller/EventsController.php:3645
+#: Controller/TagCollectionsController.php:338
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
 msgid "Invalid event."
 msgstr "잘못된 이벤트입니다."
 
-#: Controller/EventsController.php:4085;4115;4131
+#: Controller/EventsController.php:3918
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
+msgstr ""
+
+#: Controller/EventsController.php:4049;4079;4095
 msgid "You do not have the permission to do that."
 msgstr "실행할 수있는 권한이 없습니다."
 
-#: Controller/EventsController.php:4196;4334
+#: Controller/EventsController.php:4160;4300
 msgid "Invalid ID"
 msgstr "잘못된 ID"
 
-#: Controller/EventsController.php:4200;4338
+#: Controller/EventsController.php:4164;4304
 msgid "Event not found or you are not authorised to view it."
 msgstr ""
 
-#: Controller/EventsController.php:4434;4441
+#: Controller/EventsController.php:4405;4412
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4470
+#: Controller/EventsController.php:4441
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4478
+#: Controller/EventsController.php:4449
 msgid "Event not found"
 msgstr "이벤트를 찾을 수 없습니다"
 
-#: Controller/EventsController.php:4501
+#: Controller/EventsController.php:4472
 msgid "Event not found."
 msgstr "이벤트를 찾을 수 없습니다."
 
-#: Controller/EventsController.php:4511
+#: Controller/EventsController.php:4482
 msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
 msgstr ""
 
-#: Controller/EventsController.php:4536
+#: Controller/EventsController.php:4507
 msgid "The creation of a new event with the supplied information has failed."
 msgstr "제공된 정보를 바탕으로 새로운 이벤트를 만들 수 없습니다."
 
-#: Controller/EventsController.php:4671;4693;4722;4747;4772;4802;4823
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
 msgid "Invalid type."
 msgstr "잘못된 형식"
 
-#: Controller/EventsController.php:4866
+#: Controller/EventsController.php:4906
 msgid "Invalid method."
 msgstr "잘못 된 방법입니다."
 
-#: Controller/EventsController.php:4946
+#: Controller/EventsController.php:4989
 msgid "%s services are not enabled."
 msgstr "%s 서비스가 활성화되어 있지 않습니다."
 
-#: Controller/EventsController.php:4950
+#: Controller/EventsController.php:4993
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "속성이 없거나 속성을 볼 수있는 권한이 없습니다."
 
-#: Controller/EventsController.php:4956
+#: Controller/EventsController.php:4999
 msgid "No valid %s options found for this attribute."
 msgstr "이 속성에 대한 유효한 %s 옵션이 없습니다."
 
-#: Controller/EventsController.php:4973
+#: Controller/EventsController.php:5016
 msgid "no valid %s options found for this attribute."
 msgstr "이 속성에 대한 유효한 %s 옵션이 없습니다."
 
-#: Controller/EventsController.php:4995
+#: Controller/EventsController.php:5038
 msgid "%s service not reachable."
 msgstr "%s 서비스에 도달 할 수 없습니다."
 
-#: Controller/EventsController.php:5007
+#: Controller/EventsController.php:5050
 msgid ": Enriched via the %s"
 msgstr ""
 
-#: Controller/EventsController.php:5136
+#: Controller/EventsController.php:5184
 msgid "Import service not reachable."
 msgstr "Import 서비스에 도달 할 수 없습니다."
 
-#: Controller/EventsController.php:5303
+#: Controller/EventsController.php:5351
 msgid "Invalid ID."
 msgstr "잘못된 ID."
 
-#: Controller/EventsController.php:5351
-#: Controller/ShadowAttributesController.php:312;317;534
+#: Controller/EventsController.php:5399
+#: Controller/ShadowAttributesController.php:311;316;532
 msgid "Invalid Event"
 msgstr "잘못 된 이벤트"
 
-#: Controller/EventsController.php:5369
+#: Controller/EventsController.php:5420
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "Enrichment 작업은 백그라운드 처리를 위해 큐에 추가되었습니다. 나중에 결과를 확인하십시오."
 
@@ -543,122 +588,138 @@ msgstr "Enrichment 작업은 백그라운드 처리를 위해 큐에 추가되
 msgid "You don't have the required privileges to do that."
 msgstr "그것을 실행하는 데 필요한 권한이 없습니다."
 
-#: Controller/FeedsController.php:193;291
+#: Controller/FeedsController.php:205;303
 msgid "Feed added."
 msgstr "피드가 추가되었습니다."
 
-#: Controller/FeedsController.php:201
+#: Controller/FeedsController.php:213
 msgid "Feed could not be added. Invalid field: %s"
 msgstr "피드를 추가 할 수 없습니다. 잘못된 항목: %s"
 
-#: Controller/FeedsController.php:226;326;348;470;502;682
+#: Controller/FeedsController.php:238;338;360;482;517;721
 msgid "Invalid feed."
 msgstr "잘못 된 피드입니다."
 
-#: Controller/FeedsController.php:299
+#: Controller/FeedsController.php:311
 msgid "Feed could not be updated. Invalid fields: %s"
 msgstr "피드를 업데이트 할 수 없습니다. 잘못된 항목: %s"
 
-#: Controller/FeedsController.php:322
+#: Controller/FeedsController.php:334
 msgid "This action requires a post request."
 msgstr "이 작업은 post 요청이 필요합니다."
 
-#: Controller/FeedsController.php:355;474
+#: Controller/FeedsController.php:367;486
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "피드는 현재 활성화되어 있지 않습니다. 활성화하십시오."
 
-#: Controller/FeedsController.php:368;434
+#: Controller/FeedsController.php:380;446
 msgid "Starting fetch from Feed."
 msgstr "피드의를 시작합니다."
 
-#: Controller/FeedsController.php:379
+#: Controller/FeedsController.php:391
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:384;386
+#: Controller/FeedsController.php:396;398
 msgid "Fetching the feed has failed."
 msgstr "피드를 가져 오는 데 실패했습니다."
 
-#: Controller/FeedsController.php:390
+#: Controller/FeedsController.php:402
 msgid "Fetching the feed has successfuly completed."
 msgstr "피드 가져 오기가 완료되었습니다."
 
-#: Controller/FeedsController.php:451
+#: Controller/FeedsController.php:463
 msgid "Fetching the feed has successfully completed."
 msgstr "피드 가져 오기가 완료되었습니다."
 
-#: Controller/FeedsController.php:481
+#: Controller/FeedsController.php:493
 msgid "Event added."
 msgstr "이벤트가 추가되었습니다."
 
-#: Controller/FeedsController.php:484
+#: Controller/FeedsController.php:496
 msgid "Event already up to date."
 msgstr "이벤트는 이미 최신입니다."
 
-#: Controller/FeedsController.php:486
+#: Controller/FeedsController.php:498
 msgid "Event updated."
 msgstr "이벤트가 업데이트되었습니다."
 
-#: Controller/FeedsController.php:490
+#: Controller/FeedsController.php:502
 msgid "Could not %s event."
 msgstr "이벤트를 %s 수 없습니다."
 
-#: Controller/FeedsController.php:493
+#: Controller/FeedsController.php:505
 msgid "Download failed."
 msgstr "다운로드에 실패했습니다."
 
-#: Controller/FeedsController.php:561
+#: Controller/FeedsController.php:597
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "피드를 가져올 수 없습니다. 리턴된 HTTP 오류 코드는 다음과 같습니다: "
 
-#: Controller/FeedsController.php:600;651
+#: Controller/FeedsController.php:636;687
 msgid "Invalid feed type."
 msgstr "잘못된 피드 유형입니다."
 
-#: Controller/FeedsController.php:714
+#: Controller/FeedsController.php:753
 msgid "This event is blocked by the Feed filters."
 msgstr "이 이벤트는 피드 필터에 의해 차단되어 있습니다."
 
-#: Controller/FeedsController.php:716
+#: Controller/FeedsController.php:755
 msgid "Could not download the selected Event"
 msgstr "선택한 이벤트를 다운로드 할 수 없습니다"
 
-#: Controller/FeedsController.php:752;756
+#: Controller/FeedsController.php:791;795
 msgid "Invalid Feed."
 msgstr "잘못된 피드입니다."
 
-#: Controller/FeedsController.php:777
+#: Controller/FeedsController.php:816
 msgid "Only POST requests are allowed."
 msgstr "POST 요청 만 허용되어 있습니다."
 
-#: Controller/FeedsController.php:781
+#: Controller/FeedsController.php:820
 msgid "Feed not found."
 msgstr "피드가 없습니다."
 
-#: Controller/FeedsController.php:790
+#: Controller/FeedsController.php:829
 msgid "Data pulled."
 msgstr "데이터를 가져왔습니다."
 
-#: Controller/FeedsController.php:792
+#: Controller/FeedsController.php:831
 msgid "Could not pull the selected data. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:809
+#: Controller/FeedsController.php:848
 msgid "Starting feed caching."
 msgstr "피드 캐싱 시작."
 
-#: Controller/FeedsController.php:824
+#: Controller/FeedsController.php:863
 msgid "Caching the feeds has failed."
 msgstr "피드를 캐싱에 실패 했습니다."
 
-#: Controller/FeedsController.php:827
+#: Controller/FeedsController.php:866
 msgid "Caching the feeds has successfully completed."
 msgstr "피드 캐싱을 성공적으로 완료 했습니다."
 
-#: Controller/FeedsController.php:858
+#: Controller/FeedsController.php:900
 msgid "Invalid feed list received."
 msgstr "잘못 된 피드 리스트를 받았습니다."
 
+#: Controller/GalaxiesController.php:92
+msgid "All clusters"
+msgstr "모든 클러스터"
+
+#: Controller/GalaxiesController.php:135
+msgid "All namespaces"
+msgstr "모든 네임 스페이스"
+
+#: Controller/GalaxiesController.php:250
+msgid "Failed to parse request."
+msgstr "요청을 파싱하지 못헀습니다."
+
+#: Controller/GalaxiesController.php:253
+msgid "No clusters picked."
+msgstr "선택한 클러스터가 없습니다."
+
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr "모든 완료 된 작업이 제거 되었습니다."
@@ -671,11 +732,23 @@ msgstr "모든 작업이 제거 되었습니다."
 msgid "Invalid object"
 msgstr "올바르지 않은 객체"
 
-#: Controller/ObjectReferencesController.php:187
+#: Controller/ObjectReferencesController.php:188
 msgid "Invalid object reference"
 msgstr "올바르지 않은 객체 참조"
 
-#: Controller/ObjectTemplatesController.php:88
+#: Controller/ObjectTemplatesController.php:31
+msgid "All Objects"
+msgstr "모든 객체"
+
+#: Controller/ObjectTemplatesController.php:99
+msgid "Invalid object template"
+msgstr "유효하지 않은 객체 템플릿"
+
+#: Controller/ObjectTemplatesController.php:103
+msgid "Invalid object template id."
+msgstr "유효하지 않은 객체 템플릿 id"
+
+#: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
 msgstr "오브젝트템플릿이 삭제 되었습니다."
 
@@ -696,25 +769,25 @@ msgstr "오브젝트를 생성할 수있는 권한이 없습니다."
 msgid "Invalid template."
 msgstr "올바르지 않은 양식입니다."
 
-#: Controller/ObjectsController.php:303
+#: Controller/ObjectsController.php:311
 msgid "You don't have permissions to edit objects."
 msgstr "오브젝트를 수정할 수있는 권한이 없습니다."
 
-#: Controller/ObjectsController.php:317;328;427
+#: Controller/ObjectsController.php:325;336;439
 msgid "Invalid object."
-msgstr ""
+msgstr "유효하지 않은 객체"
 
-#: Controller/ObjectsController.php:421
+#: Controller/ObjectsController.php:433
 msgid "You don't have permissions to delete objects."
-msgstr ""
+msgstr "객체를 삭제할 권한이 없습니다."
 
-#: Controller/ObjectsController.php:531;538;542
+#: Controller/ObjectsController.php:543;550;554
 msgid "Object not found or not authorised."
-msgstr ""
+msgstr "객체를 찾지 못했거나 권한이 없습니다."
 
-#: Controller/ObjectsController.php:799
+#: Controller/ObjectsController.php:811
 msgid "%s objects successfully reconstructed."
-msgstr ""
+msgstr "%s 객체가 성공적으로 재구성되었습니다."
 
 #: Controller/OrgBlacklistsController.php:15
 msgid "Organisation Blacklisting is not currently enabled on this instance."
@@ -722,7 +795,7 @@ msgstr ""
 
 #: Controller/OrganisationsController.php:251
 msgid "Organisation deleted"
-msgstr ""
+msgstr "조직이 삭제되었습니다."
 
 #: Controller/OrganisationsController.php:258
 msgid "Organisation could not be deleted. Generally organisations should never be deleted, instead consider moving them to the known remote organisations list. Alternatively, if you are certain that you would like to remove an organisation and are aware of the impact, make sure that there are no users or events still tied to this organisation before deleting it."
@@ -734,7 +807,7 @@ msgstr "올바르지 않은 쓰레드"
 
 #: Controller/PostsController.php:176
 msgid "Post added"
-msgstr ""
+msgstr "포스팅을 추가했습니다."
 
 #: Controller/PostsController.php:208;256
 msgid "Invalid post"
@@ -742,15 +815,15 @@ msgstr "올바르지 않은 포스트"
 
 #: Controller/RegexpController.php:27
 msgid "The Regexp has been saved."
-msgstr ""
+msgstr "정규 표현식이 저장되었습니다."
 
 #: Controller/RegexpController.php:31
 msgid "The Regexp could not be saved. Please, try again."
-msgstr ""
+msgstr "정규 표현식을 저장할 수없습니다. 다시 시도해 주십시오."
 
 #: Controller/RegexpController.php:45;116
 msgid "The Regular expressions have been saved."
-msgstr ""
+msgstr "정규 표현식이 저장되었습니다."
 
 #: Controller/RegexpController.php:48;123
 msgid "Could not create the Regex entry as no types were selected. Either check \"All\" or check the types that you wish the Regex to affect."
@@ -758,7 +831,7 @@ msgstr ""
 
 #: Controller/RegexpController.php:211
 msgid "All done! Number of changed attributes: "
-msgstr ""
+msgstr "모든 작업을 완료했습니다. 변경된 속성의 수: "
 
 #: Controller/RegexpController.php:231
 msgid "All done! Found and cleaned "
@@ -770,129 +843,153 @@ msgstr "올바르지 않은 role"
 
 #: Controller/RolesController.php:67;108
 msgid "The Role could not be saved. Please, try again."
-msgstr ""
+msgstr "역할을 저장하지 못했습니다. 다시 시도해 주십시오."
 
 #: Controller/RolesController.php:157
 msgid "Role deleted"
-msgstr ""
+msgstr "역할을 삭제했습니다."
 
-#: Controller/ServersController.php:204;394
+#: Controller/ServersController.php:226;417
 msgid "The pull filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:214;404
+#: Controller/ServersController.php:236;427
 msgid "The push filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:268;434
+#: Controller/ServersController.php:291;457
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr ""
 
-#: Controller/ServersController.php:280
+#: Controller/ServersController.php:303
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format? Also, make sure the organisation's name doesn't clash with an existing one."
 msgstr ""
 
-#: Controller/ServersController.php:309;490
+#: Controller/ServersController.php:332;513
 msgid "The server has been saved"
 msgstr ""
 
-#: Controller/ServersController.php:316;497
+#: Controller/ServersController.php:339;520
 msgid "The server could not be saved. Please, try again."
-msgstr ""
+msgstr "서버를 저장하지 못했습니다. 다시 시도해 주십시오."
 
-#: Controller/ServersController.php:369;565;590;598;659;1412
+#: Controller/ServersController.php:392;589;614;623;683;1360
 msgid "Invalid server"
 msgstr "올바르지 않은 서버"
 
-#: Controller/ServersController.php:451
+#: Controller/ServersController.php:474
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr ""
 
-#: Controller/ServersController.php:572
+#: Controller/ServersController.php:596
 msgid "Server deleted"
 msgstr "서버가 삭제됨"
 
-#: Controller/ServersController.php:575
+#: Controller/ServersController.php:599
 msgid "Server was not deleted"
 msgstr "서버를 삭제되지 않음"
 
-#: Controller/ServersController.php:602
+#: Controller/ServersController.php:626
 msgid "Pull setting not enabled for this server."
 msgstr ""
 
-#: Controller/ServersController.php:611
-msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+#: Controller/ServersController.php:659
+msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:1309
+#: Controller/ServersController.php:696
+msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
+msgstr ""
+
+#: Controller/ServersController.php:709
+msgid "Push complete. %s events pushed, %s events could not be pushed."
+msgstr ""
+
+#: Controller/ServersController.php:734
+msgid "Push queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:1257
 msgid "File not found."
 msgstr "파일을 찾을 수 없습니다."
 
-#: Controller/ServersController.php:1315
+#: Controller/ServersController.php:1263
 msgid "File could not be deleted."
 msgstr "파일을 삭제할 수 없습니다."
 
-#: Controller/ServersController.php:1338;1354
+#: Controller/ServersController.php:1286;1302
 msgid "Upload failed."
 msgstr "업로드 실패."
 
-#: Controller/ServersController.php:1346
+#: Controller/ServersController.php:1294
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "이미 존재하는 파일입니다. 교체하길 원하신다면, 먼저 기존 파일을 삭제해주세요."
 
-#: Controller/ShadowAttributesController.php:212
+#: Controller/ServersController.php:1748
+msgid "Starting server caching."
+msgstr ""
+
+#: Controller/ServersController.php:1763
+msgid "Caching the servers has failed."
+msgstr ""
+
+#: Controller/ServersController.php:1766
+msgid "Caching the servers has successfully completed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:211
 msgid "Moving of the file that this attachment references failed."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:280
+#: Controller/ShadowAttributesController.php:279
 msgid "Could not discard proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:341
+#: Controller/ShadowAttributesController.php:340
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:389;392;401
+#: Controller/ShadowAttributesController.php:388;391;400
 msgid "The lines"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:441
+#: Controller/ShadowAttributesController.php:440
 msgid "The proposal has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:453;763
+#: Controller/ShadowAttributesController.php:452;761
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:455
+#: Controller/ShadowAttributesController.php:454
 msgid "The proposal could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:492
+#: Controller/ShadowAttributesController.php:491
 msgid "Invalid Proposal"
 msgstr "올바르지 않은 제안"
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:521
 msgid "Proposal not an attachment or malware-sample"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:617
 msgid "The attachment has been uploaded"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:619
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:624
+#: Controller/ShadowAttributesController.php:622
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:752
 msgid "The proposed Attribute has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:763
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
@@ -924,6 +1021,86 @@ msgstr ""
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr ""
 
+#: Controller/SightingsController.php:86
+msgid "Could not add the Sighting. Reason: "
+msgstr ""
+
+#: Controller/SightingsController.php:96;99
+msgid "Sighting added"
+msgstr ""
+
+#: Controller/SightingsController.php:152
+msgid "You are not authorised to remove sightings data as you don't have permission to modify your organisation's data."
+msgstr ""
+
+#: Controller/SightingsController.php:158
+msgid "Attribute not found"
+msgstr "속성을 찾을 수 없습니다."
+
+#: Controller/SightingsController.php:176
+msgid "Invalid request."
+msgstr ""
+
+#: Controller/SightingsController.php:185
+msgid "Sighting added."
+msgstr ""
+
+#: Controller/SightingsController.php:187
+msgid "Sighting could not be added"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:56;177
+msgid "The tag collection has been saved"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:64;185
+msgid "The tag collection could not be added. Reason: "
+msgstr ""
+
+#: Controller/TagCollectionsController.php:85
+msgid "%s new tag collections added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:154
+msgid "Invalid Tag Collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:161
+msgid "You don't have editing rights on this Tag Collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:201;380
+msgid "Invalid tag collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:207
+msgid "Tag collection deleted."
+msgstr "태그 컬렉션이 삭제되었습니다."
+
+#: Controller/TagCollectionsController.php:215
+msgid "Tag collection could not be deleted."
+msgstr "태그 컬렉션을 삭제하지 못했습니다."
+
+#: Controller/TagCollectionsController.php:224
+msgid "You are not allowed to delete that."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:332
+msgid "Tag(s) could not be added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:384
+msgid "Insufficient privileges to remove the tag from the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:395
+msgid "Invalid tag or tag not associated with the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:399
+msgid "Failed to remove tag from the collection."
+msgstr ""
+
 #: Controller/TagsController.php:367
 msgid "Tag deleted"
 msgstr "태그가 삭제되었습니다"
@@ -932,6 +1109,27 @@ msgstr "태그가 삭제되었습니다"
 msgid "Tag was not deleted"
 msgstr "태그가 삭제되지 않았습니다"
 
+#: Controller/TagsController.php:580
+msgid "Favourite Tags"
+msgstr "즐겨찾는 태그"
+
+#: Controller/TagsController.php:586
+msgid "Tag Collections"
+msgstr "태그 컬렉션"
+
+#: Controller/TagsController.php:591
+msgid "All Tags"
+msgstr "모든 태그"
+
+#: Controller/TagsController.php:601
+#: View/Taxonomies/view.ctp:2
+msgid "Taxonomy Library"
+msgstr ""
+
+#: Controller/TagsController.php:756
+msgid "Includes: "
+msgstr ""
+
 #: Controller/TemplatesController.php:408
 msgid "Event populated, "
 msgstr ""
@@ -940,79 +1138,95 @@ msgstr ""
 msgid "Event populated, but "
 msgstr ""
 
-#: Controller/UsersController.php:42;221
+#: Controller/UsersController.php:42;247
 msgid "Invalid user or not authorised."
 msgstr "사용자가 올바르지 않거나 승인되지 않았습니다."
 
-#: Controller/UsersController.php:54;430;657;907
+#: Controller/UsersController.php:54;456;683;929
 msgid "Invalid user"
 msgstr "올바르지 않은 사용자"
 
-#: Controller/UsersController.php:119;564;728
+#: Controller/UsersController.php:119;590;754
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
 #: Controller/UsersController.php:146
 msgid "The profile has been updated"
-msgstr ""
+msgstr "프로필을 업데이트했습니다."
 
 #: Controller/UsersController.php:150
 msgid "The profile could not be updated. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:198
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
 msgid "Password Changed."
 msgstr "비밀번호가 변경되었습니다."
 
-#: Controller/UsersController.php:203
+#: Controller/UsersController.php:222
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "비밀번호를 갱신 할 수 없습니다. 비밀번호 복잡도와 최소길이를 충족하는지 확인하세요."
 
-#: Controller/UsersController.php:575
+#: Controller/UsersController.php:601
 msgid "The user could not be saved. Invalid organisation."
 msgstr "사용자를 저장할 수 없습니다. 올바르지 않은 조직입니다."
 
-#: Controller/UsersController.php:597
+#: Controller/UsersController.php:623
 msgid "The user has been saved."
 msgstr "사용자가 저장되었습니다."
 
-#: Controller/UsersController.php:606;843
+#: Controller/UsersController.php:632;865
 msgid "The user could not be saved. Please, try again."
 msgstr "사용자가 저장되지 않았습니다. 다시 시도하세요."
 
-#: Controller/UsersController.php:835
+#: Controller/UsersController.php:857
 msgid "The user has been saved"
 msgstr "사용자가 저장되었습니다."
 
-#: Controller/UsersController.php:915
+#: Controller/UsersController.php:937
 msgid "User deleted"
 msgstr "사용자가 삭제되었습니다"
 
-#: Controller/UsersController.php:919
+#: Controller/UsersController.php:941
 msgid "User was not deleted"
 msgstr "사용자가 삭제되지 않았습니다"
 
-#: Controller/UsersController.php:997
+#: Controller/UsersController.php:1019
 msgid "Invalid username or password, try again"
 msgstr "올바르지 않은 사용자 이름 또는 비밀번호 입니다. 다시 시도하세요."
 
-#: Controller/UsersController.php:1080
+#: Controller/UsersController.php:1106
 msgid "Good-Bye"
 msgstr "잘가요!"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1147
 msgid "New authkey generated."
 msgstr "새로운 인증키가 생성되었습니다."
 
-#: Controller/UsersController.php:1230
+#: Controller/UsersController.php:1256
 msgid "You accepted the Terms and Conditions."
 msgstr ""
 
-#: Controller/UsersController.php:1419
+#: Controller/UsersController.php:1438
+msgid "Recipient email not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1443
+msgid "Recipient organisation not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1480
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr ""
 
-#: Controller/UsersController.php:1421
+#: Controller/UsersController.php:1482
 msgid "E-mails sent."
 msgstr "이메일이 발송되었습니다."
 
@@ -1040,972 +1254,1040 @@ msgstr ""
 msgid "%s was not deleted"
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:72
+#: Controller/Component/BlackListComponent.php:75
 msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:123
+#: Controller/Component/BlackListComponent.php:126
 msgid "Blacklist item added."
 msgstr "블랙리스트 항목이 추가되었습니다."
 
-#: Controller/Component/BlackListComponent.php:152
+#: Controller/Component/BlackListComponent.php:155
 msgid "Invalid blacklist entry"
 msgstr "올바르지 않은 블랙리스트"
 
-#: Controller/Component/BlackListComponent.php:156
+#: Controller/Component/BlackListComponent.php:159
 msgid "Blacklist entry removed"
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:158
+#: Controller/Component/BlackListComponent.php:161
 msgid "Could not remove the blacklist entry"
 msgstr ""
 
-#: Model/Attribute.php:567
+#: Model/Attribute.php:591
 msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/Attribute.php:677
+#: Model/Attribute.php:703
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Attribute.php:802
+#: Model/Attribute.php:828
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Attribute.php:921
+#: Model/Attribute.php:953
 msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:928
+#: Model/Attribute.php:960
 msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:935
+#: Model/Attribute.php:967
 msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:946
+#: Model/Attribute.php:978
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:957
+#: Model/Attribute.php:989
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:972
+#: Model/Attribute.php:996
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:1011
 msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:990
+#: Model/Attribute.php:1029
 msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:995
+#: Model/Attribute.php:1034
 msgid "Invalid composite type. The format has to be %s."
 msgstr ""
 
-#: Model/Attribute.php:1006
+#: Model/Attribute.php:1045
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr ""
 
-#: Model/Attribute.php:1014
+#: Model/Attribute.php:1053
 msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1025
+#: Model/Attribute.php:1064
 msgid "Invalid CIDR notation value found."
 msgstr ""
 
-#: Model/Attribute.php:1032;1083
+#: Model/Attribute.php:1071;1122
 msgid "IP address has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1037
+#: Model/Attribute.php:1076
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr ""
 
-#: Model/Attribute.php:1066
+#: Model/Attribute.php:1105
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1086
+#: Model/Attribute.php:1125
 msgid "Domain name has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1099
+#: Model/Attribute.php:1138
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1107
+#: Model/Attribute.php:1146
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr ""
 
-#: Model/Attribute.php:1118
+#: Model/Attribute.php:1157
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr ""
 
-#: Model/Attribute.php:1230
+#: Model/Attribute.php:1272
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr ""
 
-#: Model/Attribute.php:1236
+#: Model/Attribute.php:1278
 msgid "The value has to be a number greater or equal 0."
 msgstr ""
 
-#: Model/Attribute.php:1243
+#: Model/Attribute.php:1285
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:1923;1991
+#: Model/Attribute.php:1968;2036
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2527
+#: Model/Attribute.php:2616
 msgid "This field is mandatory."
 msgstr ""
 
-#: Model/Attribute.php:2885
+#: Model/Attribute.php:3069
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
-#: Model/Event.php:4532
+#: Model/Event.php:5392
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:4534
+#: Model/Event.php:5394
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:4536
+#: Model/Event.php:5396
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:4539
+#: Model/Event.php:5399
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:4541
+#: Model/Event.php:5401
 msgid "Please "
 msgstr ""
 
-#: Model/Event.php:4543
+#: Model/Event.php:5403
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:4575
+#: Model/Event.php:5435
 msgid "#"
 msgstr ""
 
-#: Model/Event.php:4584
+#: Model/Event.php:5444
 msgid "%s not set"
 msgstr ""
 
-#: Model/Server.php:114
+#: Model/Event.php:5667
+msgid "Could not add tags."
+msgstr "태그를 추가 할 수 없습니다."
+
+#: Model/Galaxy.php:219;276;286;300
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
 msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
 msgstr ""
 
-#: Model/Server.php:115
+#: Model/Server.php:122
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:125
+#: Model/Server.php:132
 msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
 msgstr ""
 
-#: Model/Server.php:126
+#: Model/Server.php:133
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:135
+#: Model/Server.php:142
 msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
 msgstr ""
 
-#: Model/Server.php:137
+#: Model/Server.php:144
 msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
 msgstr ""
 
-#: Model/Server.php:143
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:151
+#: Model/Server.php:166
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:161
+#: Model/Server.php:176
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr ""
 
-#: Model/Server.php:170
+#: Model/Server.php:185
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:195
 msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
 msgstr ""
 
-#: Model/Server.php:179
+#: Model/Server.php:204
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:187
+#: Model/Server.php:212
 msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
 msgstr ""
 
-#: Model/Server.php:196
+#: Model/Server.php:221
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:198
+#: Model/Server.php:223
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:204;212;230;254;262;270;278;335;383;391;457
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
 msgid "This setting is deprecated and can be safely removed."
-msgstr ""
+msgstr "이 설정은 더 이상 사용되지 않으며 안전하게 제거 할 수 있습니다."
 
-#: Model/Server.php:220
+#: Model/Server.php:245
 msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
 msgstr ""
 
-#: Model/Server.php:238
+#: Model/Server.php:263
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:246
+#: Model/Server.php:271
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:286
+#: Model/Server.php:311
 msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:294
+#: Model/Server.php:319
 msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:302
+#: Model/Server.php:327
 msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:310
+#: Model/Server.php:335
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:318
+#: Model/Server.php:343
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:327
+#: Model/Server.php:352
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:329
+#: Model/Server.php:354
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:343
+#: Model/Server.php:368
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:351
+#: Model/Server.php:376
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:359
+#: Model/Server.php:384
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:367
+#: Model/Server.php:392
 msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
 msgstr ""
 
-#: Model/Server.php:375
+#: Model/Server.php:400
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:399
+#: Model/Server.php:424
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:407
+#: Model/Server.php:432
 msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
 msgstr ""
 
-#: Model/Server.php:416
+#: Model/Server.php:441
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:424
+#: Model/Server.php:449
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:432
+#: Model/Server.php:457
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:440
+#: Model/Server.php:465
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr ""
 
-#: Model/Server.php:449
+#: Model/Server.php:474
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:465
+#: Model/Server.php:490
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:473
+#: Model/Server.php:498
 msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
 msgstr ""
 
-#: Model/Server.php:481
+#: Model/Server.php:506
 msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
 msgstr ""
 
-#: Model/Server.php:489
+#: Model/Server.php:514
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:498
+#: Model/Server.php:523
 msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
 msgstr ""
 
-#: Model/Server.php:507
+#: Model/Server.php:532
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:516
+#: Model/Server.php:541
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:550
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:524
+#: Model/Server.php:558
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:533
+#: Model/Server.php:567
 msgid "Used on the login page, before the MISP logo"
-msgstr ""
+msgstr "로그인 페이지의 MISP 로고 앞에 사용됨"
 
-#: Model/Server.php:541
+#: Model/Server.php:575
 msgid "Used on the login page, after the MISP logo"
-msgstr ""
+msgstr "로그인 페이지의 MISP 로고 뒤에 사용됨"
 
-#: Model/Server.php:549
+#: Model/Server.php:583
 msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:557
+#: Model/Server.php:591
 msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:565
+#: Model/Server.php:599
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:573
+#: Model/Server.php:607
 msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
 msgstr ""
 
-#: Model/Server.php:581
+#: Model/Server.php:615
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:589
+#: Model/Server.php:623
 msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
 msgstr ""
 
-#: Model/Server.php:597
+#: Model/Server.php:631
 msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
 msgstr ""
 
-#: Model/Server.php:605
+#: Model/Server.php:639
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:614
+#: Model/Server.php:648
 msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:623
+#: Model/Server.php:657
 msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:631
+#: Model/Server.php:665
 msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
 msgstr ""
 
-#: Model/Server.php:638
+#: Model/Server.php:672
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:645
+#: Model/Server.php:679
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:654
+#: Model/Server.php:688
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:662
+#: Model/Server.php:696
 msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
 msgstr ""
 
-#: Model/Server.php:671
+#: Model/Server.php:705
 msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
 msgstr ""
 
-#: Model/Server.php:680
+#: Model/Server.php:714
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:689
+#: Model/Server.php:723
 msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:698
+#: Model/Server.php:732
 msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:707
+#: Model/Server.php:741
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:717
+#: Model/Server.php:751
 msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
 msgstr ""
 
-#: Model/Server.php:726
+#: Model/Server.php:760
 msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
-msgstr ""
+msgstr "MISP.block_event_alert 설정이 지정되면, 이 설정값에 정의된 태그로 태그 지정된 이벤트에 대한 경보 메일이 차단됩니다."
 
-#: Model/Server.php:735
+#: Model/Server.php:769
 msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
 msgstr ""
 
-#: Model/Server.php:744
+#: Model/Server.php:778
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:753
+#: Model/Server.php:787
 msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
 msgstr ""
 
-#: Model/Server.php:762
-msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/webroot/css directory and enter the name here."
+#: Model/Server.php:796
+msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
 msgstr ""
 
-#: Model/Server.php:771
+#: Model/Server.php:805
 msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
 msgstr ""
 
-#: Model/Server.php:780
+#: Model/Server.php:814
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr ""
 
-#: Model/Server.php:789
+#: Model/Server.php:823
 msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
-msgstr ""
+msgstr "* 경고* 이 설정은 인스턴스의 상관분석을 완전히 비활성화하고, 저장된 모든 상관분석 결과를 삭제합니다. 이 기능을 다시 활성화하면 모든 데이터에 대한 전체 상관분석이 다시 실행됩니다. 이 작업은 매우 길고 리소스가 많이 사용됩니다. 이 기능에 대해 정확히 이해한 다음 활성화 하십시오."
 
-#: Model/Server.php:799
+#: Model/Server.php:833
 msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
 msgstr ""
 
-#: Model/Server.php:808
+#: Model/Server.php:842
 msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:816
+#: Model/Server.php:850
 msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:824
+#: Model/Server.php:858
 msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
 msgstr ""
 
-#: Model/Server.php:832
+#: Model/Server.php:866
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:841
+#: Model/Server.php:875
 msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
 msgstr ""
 
-#: Model/Server.php:849
+#: Model/Server.php:883
+msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
+msgstr ""
+
+#: Model/Server.php:891
 msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
 msgstr ""
 
-#: Model/Server.php:861
+#: Model/Server.php:903
 msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
 msgstr ""
 
-#: Model/Server.php:869
+#: Model/Server.php:911
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:877
+#: Model/Server.php:919
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:885
+#: Model/Server.php:927
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:893
+#: Model/Server.php:935
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:901
+#: Model/Server.php:943
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:910
+#: Model/Server.php:952
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:921
+#: Model/Server.php:963
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr ""
 
-#: Model/Server.php:929
+#: Model/Server.php:971
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:937
+#: Model/Server.php:979
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:945
+#: Model/Server.php:987
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:953
+#: Model/Server.php:995
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:965
+#: Model/Server.php:1007
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:973
+#: Model/Server.php:1015
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:981
+#: Model/Server.php:1023
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:989
+#: Model/Server.php:1031
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:997
+#: Model/Server.php:1039
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1008
+#: Model/Server.php:1050
 msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
 msgstr ""
 
-#: Model/Server.php:1017
+#: Model/Server.php:1059
 msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
 msgstr ""
 
-#: Model/Server.php:1026
+#: Model/Server.php:1068
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr ""
 
-#: Model/Server.php:1034
+#: Model/Server.php:1076
 msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 msgstr ""
 
-#: Model/Server.php:1042
+#: Model/Server.php:1084
 msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
 msgstr ""
 
-#: Model/Server.php:1051
+#: Model/Server.php:1093
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1060
+#: Model/Server.php:1102
 msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
 msgstr ""
 
-#: Model/Server.php:1069
+#: Model/Server.php:1111
 msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
 msgstr ""
 
-#: Model/Server.php:1071
+#: Model/Server.php:1113
 msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
 msgstr ""
 
-#: Model/Server.php:1081
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1089
+#: Model/Server.php:1149
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr ""
 
-#: Model/Server.php:1100
+#: Model/Server.php:1160
 msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
 msgstr ""
 
-#: Model/Server.php:1108
+#: Model/Server.php:1168
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr ""
 
-#: Model/Server.php:1116
+#: Model/Server.php:1176
 msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
 msgstr ""
 
-#: Model/Server.php:1125
-msgid "The timeout duration of sessions (in MINUTES)."
-msgstr ""
-
-#: Model/Server.php:1133
-msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
-msgstr ""
-
-#: Model/Server.php:1144
-msgid "The default policy action for the values added to the RPZ."
-msgstr ""
-
-#: Model/Server.php:1153
-msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
-msgstr ""
-
-#: Model/Server.php:1161
-msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
-msgstr ""
-
-#: Model/Server.php:1169
-msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1177
-msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
 #: Model/Server.php:1185
-msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
 msgstr ""
 
 #: Model/Server.php:1193
+msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
+msgstr ""
+
+#: Model/Server.php:1204
+msgid "The default policy action for the values added to the RPZ."
+msgstr ""
+
+#: Model/Server.php:1213
+msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
+msgstr ""
+
+#: Model/Server.php:1221
+msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
+msgstr ""
+
+#: Model/Server.php:1229
+msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1237
+msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1245
+msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1253
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1201
+#: Model/Server.php:1261
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1217
+#: Model/Server.php:1277
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:1225
+#: Model/Server.php:1285
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1233
+#: Model/Server.php:1293
 msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
 msgstr ""
 
-#: Model/Server.php:1242
+#: Model/Server.php:1302
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1251
+#: Model/Server.php:1311
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1260
+#: Model/Server.php:1320
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1269
+#: Model/Server.php:1329
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1278
+#: Model/Server.php:1338
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1287
+#: Model/Server.php:1347
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1296
+#: Model/Server.php:1356
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1304
+#: Model/Server.php:1364
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1312
+#: Model/Server.php:1372
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1320
+#: Model/Server.php:1380
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1328
+#: Model/Server.php:1388
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1336
+#: Model/Server.php:1396
 msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1344
+#: Model/Server.php:1404
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1352
+#: Model/Server.php:1412
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1360
+#: Model/Server.php:1420
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1368
+#: Model/Server.php:1428
 msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1376
+#: Model/Server.php:1436
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1384
-msgid "The URL(s) at which to access ElasticSearch - comma seperate if you want to have more than one."
+#: Model/Server.php:1444
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1392
+#: Model/Server.php:1452
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1460
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1468
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1416
+#: Model/Server.php:1476
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1424
+#: Model/Server.php:1484
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr ""
 
-#: Model/Server.php:1432
+#: Model/Server.php:1492
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:1440
+#: Model/Server.php:1500
 msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
 msgstr ""
 
-#: Model/Server.php:1449
+#: Model/Server.php:1509
 msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
 msgstr ""
 
-#: Model/Server.php:1457
+#: Model/Server.php:1517
 msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
 msgstr ""
 
-#: Model/Server.php:1465
+#: Model/Server.php:1525
 msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
 msgstr ""
 
-#: Model/Server.php:1475
+#: Model/Server.php:1535
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1484
+#: Model/Server.php:1544
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1493
+#: Model/Server.php:1553
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1502
+#: Model/Server.php:1562
 msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
 msgstr ""
 
-#: Model/Server.php:1511
+#: Model/Server.php:1571
 msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
 msgstr ""
 
-#: Model/Server.php:1520
+#: Model/Server.php:1580
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr ""
 
-#: Model/Server.php:1529
+#: Model/Server.php:1589
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1537
+#: Model/Server.php:1597
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1545
+#: Model/Server.php:1605
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1553;1665
+#: Model/Server.php:1613;1725
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:1561;1682
+#: Model/Server.php:1621;1742
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:1569
+#: Model/Server.php:1629
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1577
+#: Model/Server.php:1637
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1585
+#: Model/Server.php:1645
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1593
+#: Model/Server.php:1653
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1601
+#: Model/Server.php:1661
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:1609
+#: Model/Server.php:1669
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:1617
+#: Model/Server.php:1677
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1625
+#: Model/Server.php:1685
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:1633
+#: Model/Server.php:1693
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1641
+#: Model/Server.php:1701
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1649
+#: Model/Server.php:1709
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:1657
+#: Model/Server.php:1717
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:1673
+#: Model/Server.php:1733
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:1690
+#: Model/Server.php:1750
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:1699
+#: Model/Server.php:1759
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:1708
+#: Model/Server.php:1768
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr ""
 
-#: Model/Server.php:1717
+#: Model/Server.php:1777
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:1726
+#: Model/Server.php:1786
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:1735
+#: Model/Server.php:1795
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:1745
+#: Model/Server.php:1805
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:1754
+#: Model/Server.php:1814
 msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
 msgstr ""
 
-#: Model/Server.php:2401
+#: Model/Server.php:1947
+msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/Server.php:2054
+msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+msgstr ""
+
+#: Model/Server.php:2056
+msgid "Sorry, this is not yet implemented"
+msgstr ""
+
+#: Model/Server.php:2057
+msgid "Something went wrong while trying to pull"
+msgstr ""
+
+#: Model/Server.php:2069;2071
+msgid "Unknown issue."
+msgstr ""
+
+#: Model/Server.php:2535
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:2404
+#: Model/Server.php:2538
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:2412
+#: Model/Server.php:2546
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:2527
+#: Model/Server.php:2661
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3130
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
 msgid "Organisation logos"
 msgstr ""
 
-#: Model/Server.php:3131
+#: Model/Server.php:3476
 msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
 msgstr ""
 
-#: Model/Server.php:3133
+#: Model/Server.php:3478
 msgid "48x48 pixel .png files"
 msgstr ""
 
-#: Model/Server.php:3136;3151
+#: Model/Server.php:3481;3496
 msgid "Filename must be in the following format: *.png"
 msgstr ""
 
-#: Model/Server.php:3140
+#: Model/Server.php:3485
 msgid "Additional image files"
 msgstr ""
 
-#: Model/Server.php:3141
+#: Model/Server.php:3486
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:3148
+#: Model/Server.php:3493
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:3765
+#: Model/Server.php:3665
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr ""
+
+#: Model/Server.php:4115
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:3766
+#: Model/Server.php:4116
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:3770
+#: Model/Server.php:4120
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:3771
+#: Model/Server.php:4121
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
@@ -2029,7 +2311,7 @@ msgstr ""
 
 #: View/Attributes/add.ctp:7
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr ""
@@ -2074,7 +2356,7 @@ msgstr ""
 #: View/Attributes/add.ctp:36
 #: View/Attributes/add_attachment.ctp:24
 #: View/Attributes/edit.ctp:24
-#: View/Events/add.ctp:24
+#: View/Events/add.ctp:20
 msgid "Distribution "
 msgstr ""
 
@@ -2082,7 +2364,7 @@ msgstr ""
 #: View/Attributes/add_attachment.ctp:33
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
-#: View/Events/add.ctp:34
+#: View/Events/add.ctp:30
 #: View/Events/edit.ctp:26
 #: View/Feeds/add.ctp:176
 #: View/Feeds/edit.ctp:172
@@ -2109,23 +2391,24 @@ msgstr ""
 msgid "for Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/add.ctp:87
+#: View/Attributes/add.ctp:91
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_mitre_attack_matrix.ctp:14;113
+#: View/Elements/view_galaxy_matrix.ctp:76;199
 #: View/Events/contact.ctp:29
 #: View/Events/edit.ctp:59
 #: View/Events/free_text_import.ctp:27
 #: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:78
+#: View/ObjectReferences/ajax/add.ctp:130
 #: View/Objects/add.ctp:147
 #: View/Objects/revise_object.ctp:85
 #: View/Organisations/admin_add.ctp:49
 #: View/Organisations/admin_edit.ctp:60
-#: View/Servers/add.ctp:126
-#: View/Servers/edit.ctp:167
-#: View/SharingGroups/add.ctp:75
+#: View/Servers/add.ctp:115
+#: View/Servers/edit.ctp:162
+#: View/SharingGroups/add.ctp:115
+#: View/TagCollections/add.ctp:21
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
 #: View/TemplateElements/ajax/template_element_add_file.ctp:67
 #: View/TemplateElements/ajax/template_element_add_text.ctp:29
@@ -2134,7 +2417,7 @@ msgstr ""
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/Users/admin_add.ctp:97
 #: View/Users/admin_edit.ctp:91
-#: View/Users/admin_email.ctp:51
+#: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
 #: View/Users/change_pw.ctp:23
 #: View/Users/edit.ctp:41
@@ -2142,14 +2425,17 @@ msgstr ""
 msgid "Submit"
 msgstr "제출"
 
-#: View/Attributes/add.ctp:88
+#: View/Attributes/add.ctp:92
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:62
+#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/exportSearch.ctp:32
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Elements/eventattributecreation.ctp:89
-#: View/Elements/view_mitre_attack_matrix.ctp:114
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/view_galaxy_matrix.ctp:200
 #: View/Elements/serverRuleElements/pull.ctp:70
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2158,21 +2444,18 @@ msgstr "제출"
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/ajax/enrich_event.ctp:21
+#: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:15
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/exportChoice.ctp:51
 #: View/Events/ajax/importChoice.ctp:12
 #: View/Events/ajax/quick_edit.ctp:6
-#: View/Galaxies/ajax/cluster_choice.ctp:32
-#: View/Galaxies/ajax/galaxy_choice.ctp:22
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:15
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
-#: View/ObjectReferences/ajax/add.ctp:82
+#: View/ObjectReferences/ajax/add.ctp:134
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/ObjectTemplates/ajax/object_choice.ctp:10
 #: View/Objects/add.ctp:153
 #: View/Objects/revise_object.ctp:87
 #: View/Objects/ajax/delete.ctp:24
@@ -2187,11 +2470,12 @@ msgstr "제출"
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
 #: View/Sightings/ajax/advanced.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
-#: View/Tags/ajax/select_tag.ctp:32
-#: View/Tags/ajax/taxonomy_choice.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:6
 #: View/TemplateElements/ajax/template_element_add_file.ctp:73
@@ -2201,6 +2485,7 @@ msgstr "제출"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:35
 #: View/Templates/ajax/template_choices.ctp:15
 #: View/Users/admin_filter_user_index.ctp:107
+#: View/Users/ajax/emailConfirmTemplate.ctp:14
 #: View/Users/ajax/fetchpgpkey.ctp:24
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
@@ -2239,8 +2524,6 @@ msgstr "이벤트 id"
 #: View/Elements/Users/userIndexTable.ctp:4
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_view.ctp:14
-#: View/Users/view.ctp:14
 msgid "Org"
 msgstr ""
 
@@ -2255,7 +2538,7 @@ msgid "Event date"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Event graph"
 msgstr "이벤트 그래프"
 
@@ -2283,12 +2566,12 @@ msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:26
 #: View/Noticelists/view.ctp:36
-#: View/Warninglists/view.ctp:54
+#: View/Warninglists/view.ctp:35
 msgid "Values"
 msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:75
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:46
@@ -2322,7 +2605,7 @@ msgstr ""
 msgid "disabled"
 msgstr ""
 
-#: View/Attributes/edit.ctp:64
+#: View/Attributes/edit.ctp:68
 #: View/ShadowAttributes/add.ctp:55
 #: View/ShadowAttributes/edit.ctp:45;54
 msgid "Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this."
@@ -2330,7 +2613,7 @@ msgstr ""
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -2338,10 +2621,6 @@ msgstr ""
 msgid "Attributes"
 msgstr ""
 
-#: View/Attributes/index.ctp:7
-msgid "Results for all attributes"
-msgstr ""
-
 #: View/Attributes/index.ctp:8
 msgid " with the value containing "
 msgstr ""
@@ -2354,57 +2633,67 @@ msgstr ""
 msgid " from the events "
 msgstr ""
 
-#: View/Attributes/index.ctp:12
-msgid " of category "
+#: View/Attributes/index.ctp:11
+msgid " carrying the tag(s) "
 msgstr ""
 
-#: View/Attributes/index.ctp:13
+#: View/Attributes/index.ctp:12
 msgid " of type "
 msgstr ""
 
-#: View/Attributes/index.ctp:14
-msgid " created by the organisation "
+#: View/Attributes/index.ctp:13
+msgid " of category "
 msgstr ""
 
-#: View/Attributes/index.ctp:28;173
-#: View/Elements/eventattribute.ctp:60;258
+#: View/Attributes/index.ctp:14
+msgid " created by organisation "
+msgstr ""
+
+#: View/Attributes/index.ctp:26
+msgid "Results for all attributes"
+msgstr ""
+
+#: View/Attributes/index.ctp:39;132
+#: View/Elements/eventattribute.ctp:60;229
 #: View/Elements/eventdiscussion.ctp:15;126
+#: View/Elements/generic_table.ctp:16
+#: View/Elements/generic_table_row.ctp:16
 #: View/Elements/Feeds/eventattribute.ctp:20;86
 #: View/Elements/Servers/eventattribute.ctp:20;86
 #: View/EventBlacklists/index.ctp:13;54
-#: View/Events/index.ctp:12;89
+#: View/Events/index.ctp:12;115
 #: View/Events/proposal_event_index.ctp:12;95
 #: View/Events/ajax/index.ctp:13;39
 #: View/Feeds/freetext_index.ctp:22;86
-#: View/Feeds/index.ctp:20;230
-#: View/Feeds/preview_index.ctp:14;82
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
 #: View/Galaxies/index.ctp:13;53
-#: View/GalaxyClusters/ajax/index.ctp:11;96
+#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:33;162
-#: View/Logs/admin_index.ctp:37;111
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
 #: View/Logs/event_index.ctp:17;61
 #: View/News/index.ctp:39
 #: View/Noticelists/index.ctp:13;83
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
-#: View/ObjectTemplates/index.ctp:13;126
+#: View/ObjectTemplates/index.ctp:13;137
 #: View/OrgBlacklists/index.ctp:13;52
-#: View/Organisations/index.ctp:42;138
+#: View/Organisations/index.ctp:42;159
 #: View/Regexp/admin_index.ctp:13;51
 #: View/Regexp/index.ctp:13;45
 #: View/Roles/admin_index.ctp:13;82
 #: View/Roles/index.ctp:13;55
-#: View/Servers/index.ctp:13;117
-#: View/Servers/preview_index.ctp:15;164
-#: View/ShadowAttributes/index.ctp:12;108
-#: View/SharingGroups/index.ctp:13;86
+#: View/Servers/index.ctp:13;156
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;63
-#: View/Taxonomies/view.ctp:53;169
+#: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:12;56
+#: View/Users/admin_index.ctp:12;86
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -2412,45 +2701,47 @@ msgstr ""
 msgid "previous"
 msgstr ""
 
-#: View/Attributes/index.ctp:30;175
-#: View/Elements/eventattribute.ctp:62;260
+#: View/Attributes/index.ctp:41;134
+#: View/Elements/eventattribute.ctp:62;231
 #: View/Elements/eventdiscussion.ctp:17;128
+#: View/Elements/generic_table.ctp:18
+#: View/Elements/generic_table_row.ctp:18
 #: View/Elements/Feeds/eventattribute.ctp:22;88
 #: View/Elements/Servers/eventattribute.ctp:22;88
 #: View/EventBlacklists/index.ctp:15;56
-#: View/Events/index.ctp:14;91
+#: View/Events/index.ctp:14;117
 #: View/Events/proposal_event_index.ctp:14;97
 #: View/Events/ajax/index.ctp:15;41
 #: View/Feeds/freetext_index.ctp:24;88
-#: View/Feeds/index.ctp:22;232
-#: View/Feeds/preview_index.ctp:16;84
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
 #: View/Galaxies/index.ctp:15;55
-#: View/GalaxyClusters/ajax/index.ctp:13;98
+#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:35;164
-#: View/Logs/admin_index.ctp:39;113
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
 #: View/Logs/event_index.ctp:19;63
 #: View/News/index.ctp:41
 #: View/Noticelists/index.ctp:15;85
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
-#: View/ObjectTemplates/index.ctp:15;128
+#: View/ObjectTemplates/index.ctp:15;139
 #: View/OrgBlacklists/index.ctp:15;54
-#: View/Organisations/index.ctp:44;140
+#: View/Organisations/index.ctp:44;161
 #: View/Regexp/admin_index.ctp:15;53
 #: View/Regexp/index.ctp:15;47
 #: View/Roles/admin_index.ctp:15;84
 #: View/Roles/index.ctp:15;57
-#: View/Servers/index.ctp:15;119
-#: View/Servers/preview_index.ctp:17;166
-#: View/ShadowAttributes/index.ctp:14;110
-#: View/SharingGroups/index.ctp:15;88
+#: View/Servers/index.ctp:15;158
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;65
-#: View/Taxonomies/view.ctp:55;171
+#: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:14;58
+#: View/Users/admin_index.ctp:14;88
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -2458,66 +2749,144 @@ msgstr ""
 msgid "next"
 msgstr "다음"
 
-#: View/Attributes/index.ctp:148
-msgid "Are you sure you want to delete this attribute?"
+#: View/Attributes/index.ctp:53
+#: View/Elements/eventattribute.ctp:152
+#: View/Elements/Events/eventIndexTable.ctp:37
+#: View/Elements/Feeds/eventattribute.ctp:45
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/view.ctp:117
+#: View/Feeds/preview_event.ctp:16
+#: View/Noticelists/view.ctp:43
+#: View/Pages/doc/using_the_system.ctp:164;207;318
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
+#: View/Tags/index.ctp:10
+#: View/Templates/add.ctp:12
+#: View/Templates/edit.ctp:12
+#: View/Templates/view.ctp:19
+msgid "Tags"
+msgstr "태그"
+
+#: View/Attributes/index.ctp:54
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/Galaxies/index.ctp:2
+msgid "Galaxies"
 msgstr ""
 
-#: View/Attributes/index.ctp:151
-msgid "Propose an edit"
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:161
+msgid "Correlate"
 msgstr ""
 
-#: View/Attributes/index.ctp:155
-#: View/Elements/Events/eventIndexTable.ctp:82;86;229
-#: View/Elements/Users/userIndexTable.ctp:94
-#: View/Elements/dashboard/dashboard_events.ctp:4;5
-#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
-#: View/Events/proposal_event_index.ctp:45;49
-#: View/Feeds/preview_index.ctp:66
-#: View/Noticelists/index.ctp:66
-#: View/ObjectTemplates/index.ctp:104
-#: View/Organisations/index.ctp:122
-#: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/preview_index.ctp:148
-#: View/Taxonomies/index.ctp:47
-#: View/Warninglists/index.ctp:60
-msgid "View"
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Events/view.ctp:314
+#: View/Feeds/preview_event.ctp:73
+#: View/Pages/doc/using_the_system.ctp:235
+#: View/Servers/preview_event.ctp:95
+msgid "Related Events"
 msgstr ""
 
-#: View/Attributes/index.ctp:166
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:163
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+msgid "Feed hits"
+msgstr ""
+
+#: View/Attributes/index.ctp:61
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
+msgid "Sightings"
+msgstr ""
+
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
+#: View/Tags/index.ctp:73
+msgid "Activity"
+msgstr ""
+
+#: View/Attributes/index.ctp:63
+#: View/Elements/eventattribute.ctp:168
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/healthElements/files.ctp:33
+#: View/Elements/healthElements/workers.ctp:60
+#: View/Elements/templateElements/templateRowAttribute.ctp:94
+#: View/Elements/templateElements/templateRowFile.ctp:71
+#: View/Elements/templateElements/templateRowText.ctp:28
+#: View/EventBlacklists/index.ctp:27
+#: View/Events/export.ctp:31
+#: View/Events/resolved_attributes.ctp:53
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:51
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:66
+#: View/OrgBlacklists/index.ctp:26
+#: View/Organisations/index.ctp:102
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:25
+#: View/Roles/admin_index.ctp:35
+#: View/Servers/index.ctp:37
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:27
+#: View/Templates/index.ctp:27
+#: View/Threads/index.ctp:28
+#: View/Warninglists/index.ctp:38
+#: View/Whitelists/admin_index.ctp:24
+msgid "Actions"
+msgstr ""
+
+#: View/Attributes/index.ctp:125
 #: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
 #: View/EventBlacklists/index.ctp:47
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:223
-#: View/Feeds/preview_index.ctp:74
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
 #: View/Galaxies/index.ctp:46
-#: View/GalaxyClusters/ajax/index.ctp:90
+#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:155
-#: View/Logs/admin_index.ctp:104
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
 #: View/Logs/event_index.ctp:54
 #: View/News/index.ctp:33
 #: View/Noticelists/index.ctp:76
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:66
-#: View/ObjectTemplates/index.ctp:119
+#: View/ObjectTemplates/index.ctp:130
 #: View/OrgBlacklists/index.ctp:45
-#: View/Organisations/index.ctp:131
+#: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
 #: View/Roles/admin_index.ctp:75
 #: View/Roles/index.ctp:48
-#: View/Servers/index.ctp:110
-#: View/Servers/preview_index.ctp:156
-#: View/ShadowAttributes/index.ctp:101
-#: View/SharingGroups/index.ctp:79
+#: View/Servers/index.ctp:149
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:56
-#: View/Taxonomies/view.ctp:162
+#: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:49
+#: View/Users/admin_index.ctp:79
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -2564,26 +2933,22 @@ msgid "Containing the following expressions"
 msgstr ""
 
 #: View/Attributes/search.ctp:11
-msgid "Being an attribute matching the following tags"
+msgid "Having tag or being an attribute of an event having the tag"
 msgstr ""
 
 #: View/Attributes/search.ctp:12
 msgid "Being attributes of the following event IDs, event UUIDs or attribute UUIDs"
 msgstr ""
 
-#: View/Attributes/search.ctp:13
-msgid "Being an attribute of an event matching the following tags"
-msgstr ""
-
-#: View/Attributes/search.ctp:20
+#: View/Attributes/search.ctp:15
 msgid "From the following organisation(s)"
 msgstr ""
 
-#: View/Attributes/search.ctp:36
-msgid "Only find IOCs to use in IDS"
+#: View/Attributes/search.ctp:29
+msgid "Only find IOCs flagged as to_ids"
 msgstr ""
 
-#: View/Attributes/search.ctp:40
+#: View/Attributes/search.ctp:33
 msgid "Alternate Search Result (Events)"
 msgstr ""
 
@@ -2601,26 +2966,26 @@ msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90
-#: View/Elements/galaxyQuickView.ctp:23
-#: View/Elements/side_menu.ctp:351
-#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/eventIndexTable.ctp:229
 #: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:30
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Roles/admin_index.ctp:67
-#: View/Servers/index.ctp:99
+#: View/Servers/index.ctp:138
 #: View/Tags/index.ctp:125
 msgid "Delete"
 msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
@@ -2634,34 +2999,36 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:56
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:168
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
 #: View/Events/ajax/handleSelected.ctp:17
 #: View/Events/ajax/toggle_correlation.ctp:20
 #: View/Feeds/preview_event.ctp:56
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:79
 #: View/Servers/ajax/update.ctp:11
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
 #: View/Templates/view.ctp:41
-#: View/Users/admin_view.ctp:32;37;104;114;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:27
 msgid "Yes"
 msgstr "예"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:21
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
@@ -2675,29 +3042,30 @@ msgstr "예"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:58;176
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:166
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/handleSelected.ctp:22
 #: View/Events/ajax/toggle_correlation.ctp:25
 #: View/Feeds/preview_event.ctp:61;66
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:89
 #: View/Servers/ajax/update.ctp:16
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
 #: View/Templates/view.ctp:42
-#: View/Users/admin_view.ctp:32;37;106;116;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
 msgid "No"
@@ -2706,7 +3074,6 @@ msgstr "아니오"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:5
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:5
 #: View/Attributes/ajax/attributeEditValueForm.ctp:6
 msgid "Accept change"
@@ -2715,7 +3082,6 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:6
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
 msgid "Discard change"
@@ -2732,7 +3098,7 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/view.ctp:143
+#: View/Events/view.ctp:145
 #: View/Feeds/add.ctp:167
 #: View/Feeds/edit.ctp:164
 #: View/Feeds/freetext_index.ctp:36
@@ -2754,6 +3120,50 @@ msgstr ""
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr ""
 
+#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+msgid "Tags to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+msgid "Tags to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+msgid "Clusters to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+msgid "Clusters to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
 #: View/Attributes/ajax/attributeRestorationForm.ctp:5
 msgid "Attribute Restoration"
 msgstr ""
@@ -2762,6 +3172,15 @@ msgstr ""
 msgid "Are you sure you want to undelete Attribute #%s?"
 msgstr ""
 
+#: View/Attributes/ajax/exportSearch.ctp:2
+msgid "Choose the format that you wish to download the search results in"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:10;23
+#: View/Events/ajax/exportChoice.ctp:17;18;27;28
+msgid "Export as %s"
+msgstr ""
+
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
 msgid "Remove Tag"
 msgstr ""
@@ -2782,16 +3201,6 @@ msgstr ""
 msgid "Toggle Correlation %s "
 msgstr ""
 
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "on"
-msgstr ""
-
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "off"
-msgstr ""
-
 #: View/Attributes/ajax/toggle_correlation.ctp:11
 msgid "Re-enable the correlation for this attribute."
 msgstr ""
@@ -2804,13 +3213,21 @@ msgstr ""
 msgid "Toggle correlation for attribute"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:25
+#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Elements/ajaxTagCollectionTags.ctp:16
 #: View/Elements/ajaxTags.ctp:14
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr ""
 
+#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Pages/doc/using_the_system.ctp:303
+#: View/Templates/add.ctp:17
+#: View/Templates/edit.ctp:17
+msgid "Add tag"
+msgstr ""
+
 #: View/Elements/ajaxTags.ctp:17
 msgid "Remove tag %s"
 msgstr ""
@@ -2821,215 +3238,33 @@ msgstr ""
 msgid "Add a tag"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:71;269
+#: View/Elements/eventattribute.ctp:71;240
 #: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
 #: View/Elements/Servers/eventattribute.ctp:28;31;94;97
 msgid "view all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:117
-#: View/Pages/doc/using_the_system.ctp:86
-msgid "Add attribute"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:118
-msgid "Edit selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:119
-msgid "Tag selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:120
-msgid "Delete selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:121
-msgid "Accept selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:122
-msgid "Discard selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:123
-msgid "Sightings display for selected attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:127
-msgid "Populate using a template"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:129
-msgid "Populate using the freetext import tool"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:131
-msgid "Replace all attributes of a category/type combination within the event"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:140;159
-msgid "Show all attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:144
-msgid "Only show %s related attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:148
-msgid "Only show proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:148
-#: View/Logs/event_index.ctp:44
-msgid "Proposal"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:149
-msgid "Only show correlating attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Only show potentially false positive attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Warnings"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:152
-msgid "Include deleted attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show attribute context fields"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show context fields"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:157
-msgid "Filter on attributes value"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:159
-#: View/Events/index.ctp:41
-#: View/Servers/preview_index.ctp:42
-#: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:37
-msgid "Remove filters"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 msgid "Select all attributes/proposals on current page"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:188
-#: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/view.ctp:121
-#: View/Feeds/preview_event.ctp:16
-#: View/Noticelists/view.ctp:43
-#: View/Pages/doc/using_the_system.ctp:164;207;318
-#: View/Servers/preview_event.ctp:27
-#: View/Servers/preview_index.ctp:68
-#: View/Tags/index.ctp:10
-#: View/Templates/add.ctp:12
-#: View/Templates/edit.ctp:12
-#: View/Templates/view.ctp:19
-msgid "Tags"
-msgstr "태그"
-
-#: View/Elements/eventattribute.ctp:189
-#: View/Elements/global_menu.ctp:56
-#: View/Events/view.ctp:387
-#: View/Galaxies/index.ctp:2
-msgid "Galaxies"
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:191
-msgid "Correlate"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:192
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:263
-#: View/Feeds/preview_event.ctp:73
-#: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:95
-msgid "Related Events"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:193
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
-msgid "Feed hits"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:196
-#: View/Events/view.ctp:198
-msgid "Sightings"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:197
-#: View/Events/view.ctp:205
-#: View/Tags/index.ctp:73
-msgid "Activity"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:198
-#: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/healthElements/files.ctp:33
-#: View/Elements/healthElements/workers.ctp:55
-#: View/Elements/templateElements/templateRowAttribute.ctp:94
-#: View/Elements/templateElements/templateRowFile.ctp:71
-#: View/Elements/templateElements/templateRowText.ctp:28
-#: View/EventBlacklists/index.ctp:27
-#: View/Events/export.ctp:31
-#: View/Events/resolved_attributes.ctp:53
-#: View/Feeds/index.ctp:61
-#: View/Feeds/preview_index.ctp:38
-#: View/GalaxyClusters/ajax/index.ctp:51
-#: View/Noticelists/index.ctp:37
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:55
-#: View/OrgBlacklists/index.ctp:26
-#: View/Organisations/index.ctp:81
-#: View/Pages/doc/using_the_system.ctp:187;238;286;382
-#: View/Regexp/admin_index.ctp:25
-#: View/Roles/admin_index.ctp:35
-#: View/Servers/index.ctp:36
-#: View/Servers/preview_index.ctp:80
-#: View/SharingGroups/add.ctp:34;54
-#: View/SharingGroups/edit.ctp:34;62
-#: View/SharingGroups/index.ctp:30
-#: View/Sightings/ajax/list_sightings.ctp:11
-#: View/Tags/index.ctp:76
-#: View/Taxonomies/index.ctp:27
-#: View/Templates/index.ctp:27
-#: View/Threads/index.ctp:28
-#: View/Warninglists/index.ctp:38
-#: View/Whitelists/admin_index.ctp:24
-msgid "Actions"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:238
+#: View/Elements/eventattribute.ctp:209
 msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
 "a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
 "attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:242
+#: View/Elements/eventattribute.ctp:213
 msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
 msgstr ""
 
@@ -3037,6 +3272,140 @@ msgstr ""
 msgid "Create multiple attributes one per line"
 msgstr ""
 
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr "경고"
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr ""
+
 #: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr ""
@@ -3046,14 +3415,14 @@ msgid "Deactivated user"
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:223
-#: View/Elements/Events/View/row_attribute.ctp:299
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/View/row_attribute.ctp:380
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/Feeds/edit.ctp:193
 #: View/OrgBlacklists/edit.ctp:22
 #: View/Pages/doc/using_the_system.ctp:191
-#: View/Servers/index.ctp:98
-#: View/Tags/edit.ctp:35
+#: View/Servers/index.ctp:137
+#: View/Tags/edit.ctp:36
 #: View/Templates/edit.ctp:49
 msgid "Edit"
 msgstr "편집"
@@ -3081,12 +3450,12 @@ msgid "Insert a link to an event - just enter the event ID between the [event][/
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:180;191
+#: View/Events/view.ctp:196;207
 #: View/Objects/orphaned_object_diagnostics.ctp:21
 #: View/Pages/doc/administration.ctp:167
 #: View/Pages/doc/using_the_system.ctp:200;279
 #: View/Posts/add.ctp:33
-#: View/ShadowAttributes/index.ctp:31
+#: View/ShadowAttributes/index.ctp:41
 msgid "Event"
 msgstr ""
 
@@ -3121,9 +3490,19 @@ msgid "Code"
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:156
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr ""
 
+#: View/Elements/flashErrorMessage.ctp:2
+msgid "Errors"
+msgstr ""
+
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Jobs/ajax/error.ctp:34
+msgid "Close"
+msgstr ""
+
 #: View/Elements/footer.ctp:5
 msgid "Keyboard shortcuts for this page"
 msgstr ""
@@ -3135,8 +3514,8 @@ msgstr ""
 #: View/Elements/footer.ctp:15
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:60
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
 msgid "GnuPG key"
 msgstr ""
 
@@ -3152,32 +3531,36 @@ msgstr ""
 msgid "View details about this galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:17
+#: View/Elements/galaxyQuickView.ctp:19
 #: View/Elements/galaxyQuickViewMini.ctp:69
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:18
+#: View/Elements/galaxyQuickView.ctp:20
 #: View/Elements/galaxyQuickViewMini.ctp:70
 msgid "View all events containing this cluster."
 msgstr ""
 
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
 #: View/Elements/galaxyQuickView.ctp:24
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:74
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 #: View/EventBlacklists/add.ctp:35
 #: View/EventBlacklists/edit.ctp:29
-#: View/Events/add.ctp:72
+#: View/Events/add.ctp:68
 #: View/Events/filter_event_index.ctp:125
 #: View/Feeds/add.ctp:198
 #: View/Feeds/import_feeds.ctp:19
@@ -3187,113 +3570,139 @@ msgstr ""
 #: View/Roles/admin_add.ctp:44
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 #: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:19
 #: View/Tags/add.ctp:35
 #: View/Users/admin_filter_user_index.ctp:62
 #: View/Whitelists/admin_add.ctp:13
 msgid "Add"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/side_menu.ctp:174;188
+#: View/Elements/generic_picker.ctp:205
+msgid "Due to the large number of options, no contextual information is provided."
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:273
+msgid "Nothing to pick"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:11
+#: View/Pages/doc/general.ctp:20
+msgid "Event Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:26
-#: View/Elements/side_menu.ctp:179;194
-#: View/Events/add.ctp:8
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
+#: View/Events/add.ctp:4
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:28
-#: View/Elements/side_menu.ctp:213
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/side_menu.ctp:218
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:30
-#: View/Elements/side_menu.ctp:206
-#: View/Servers/rest.ctp:4
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
+#: View/Servers/rest.ctp:20
 msgid "REST client"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:32
-#: View/Elements/side_menu.ctp:238
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:35
-#: View/Elements/side_menu.ctp:446
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
+#: View/Pages/doc/general.ctp:39
+msgid "Events with proposals"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "태그 목록"
 
-#: View/Elements/global_menu.ctp:37
-#: View/Elements/side_menu.ctp:450
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
+msgid "List Tag Collections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 #: View/Tags/edit.ctp:4
 msgid "Add Tag"
 msgstr "태그 추가"
 
-#: View/Elements/global_menu.ctp:39
-#: View/Elements/side_menu.ctp:471
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:41
-#: View/Elements/side_menu.ctp:485
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr "템플릿 목록"
 
-#: View/Elements/global_menu.ctp:43
-#: View/Elements/side_menu.ctp:487
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr "템플릿 추가"
 
-#: View/Elements/global_menu.ctp:46
-#: View/Elements/side_menu.ctp:247
+#: View/Elements/global_menu.ctp:78
 #: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
 msgstr "내보내기"
 
-#: View/Elements/global_menu.ctp:48
-#: View/Elements/side_menu.ctp:253
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
+#: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
 #: View/Pages/doc/using_the_system.ctp:15;361
 msgid "Automation"
 msgstr "자동화"
 
-#: View/Elements/global_menu.ctp:60
-#: View/Elements/side_menu.ctp:529
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:67
+#: View/Elements/global_menu.ctp:101
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:72;76
+#: View/Elements/global_menu.ctp:104;109
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -3302,7 +3711,7 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:73;77
+#: View/Elements/global_menu.ctp:114;119
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -3311,82 +3720,88 @@ msgstr ""
 msgid "Signature Whitelist"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:79
-#: View/Elements/side_menu.ctp:274
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:80
-#: View/Elements/side_menu.ctp:283
+#: View/Elements/global_menu.ctp:128
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:90
+#: View/Elements/global_menu.ctp:135
+#: View/Pages/doc/general.ctp:22;54
+msgid "Global Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:139
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:91
-#: View/Elements/side_menu.ctp:311
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:92;203
-#: View/Elements/side_menu.ctp:312
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "대시보드"
 
-#: View/Elements/global_menu.ctp:96
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
-#: View/Users/statistics_data.ctp:32
+#: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:100
-#: View/Elements/side_menu.ctp:325
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:102
-#: View/Elements/side_menu.ctp:552
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:104
-#: View/Elements/side_menu.ctp:331
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:106
-#: View/Elements/side_menu.ctp:332
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:109
-#: View/Elements/side_menu.ctp:334
-#: View/Events/automation.ctp:42
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
+#: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
 msgstr "사용자 가이드"
 
-#: View/Elements/global_menu.ctp:110
-#: View/Elements/side_menu.ctp:335
-#: View/Pages/doc/general.ctp:61
-#: View/Pages/doc/user_management.ctp:54
-msgid "Terms &amp; Conditions"
+#: View/Elements/global_menu.ctp:186
+msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:111
-#: View/Elements/side_menu.ctp:336
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -3399,30 +3814,34 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:113
+#: View/Elements/global_menu.ctp:201
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:114
+#: View/Elements/global_menu.ctp:205
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:125
-#: View/Elements/side_menu.ctp:354
+#: View/Elements/global_menu.ctp:212
+#: View/Pages/doc/general.ctp:23;66
+msgid "Sync Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:127
-#: View/Elements/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:136
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/administration.ctp:8
-#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
 #: View/Pages/doc/quickstart.ctp:8
@@ -3431,95 +3850,100 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:140
-#: View/Elements/side_menu.ctp:376
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:141
-#: View/Elements/side_menu.ctp:375
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
 msgid "Add User"
 msgstr "사용자 추가"
 
-#: View/Elements/global_menu.ctp:142
-#: View/Elements/side_menu.ctp:379
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:144
-#: View/Elements/side_menu.ctp:316;391
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
 msgid "List Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:146
-#: View/Elements/side_menu.ctp:383
-msgid "Add Organisation"
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:149
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:151
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-msgid "Maintenance"
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:158
-#: View/Elements/side_menu.ctp:401
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "작업"
 
-#: View/Elements/global_menu.ctp:160
-#: View/Elements/side_menu.ctp:403
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:165
-#: View/Elements/side_menu.ctp:407
+#: View/Elements/global_menu.ctp:300
+msgid "Blacklist Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
 msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:169
+#: View/Elements/global_menu.ctp:314
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/side_menu.ctp:411
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
 msgid "Manage Org Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:180
+#: View/Elements/global_menu.ctp:327
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:184
-#: View/Elements/side_menu.ctp:417
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr "로그 목록"
 
-#: View/Elements/global_menu.ctp:185
-#: View/Elements/side_menu.ctp:418
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "로그 검색"
 
-#: View/Elements/global_menu.ctp:207;209
+#: View/Elements/global_menu.ctp:362;367
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -3540,407 +3964,8 @@ msgstr ""
 msgid "Attributes per organization"
 msgstr ""
 
-#: View/Elements/side_menu.ctp:17;78
-msgid "Populate From Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:24
-msgid "Freetext Import Result"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:31
-msgid "View Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:36;465;540
-msgid "View Correlation Graph"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:41
-msgid "View Event History"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:48
-#: View/Events/edit.ctp:8
-msgid "Edit Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:50
-msgid "Delete Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:50;267;298;351;371
-#: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Servers/index.ctp:99
-msgid "Are you sure you want to delete # %s?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:61
-msgid "Add Object"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:66
-msgid "Add Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:73
-msgid "Populate from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:86
-#: View/Events/ajax/enrich_event.ctp:2
-msgid "Enrich Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:91
-msgid "Merge attributes from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:98
-msgid "Propose Attribute"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:103
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:115
-#: View/Elements/Events/eventIndexTable.ctp:218
-msgid "Publish Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:123
-msgid "Publish (no email)"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:132
-msgid "Delegate Publishing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:143
-#: View/EventDelegations/ajax/accept_delegation.ctp:2
-msgid "Accept Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:151
-msgid "Discard Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:157
-msgid "Publish event to ZMQ"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:162
-msgid "Contact Reporter"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:169
-msgid "Download as..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:201
-msgid "Import from…"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:224
-msgid "Download results as JSON"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:228
-msgid "Download results as XML"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:232
-msgid "Download results as CSV"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:242
-#: View/Pages/doc/general.ctp:39
-msgid "Events with proposals"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:259
-msgid "List Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:261
-msgid "New Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:262
-msgid "Perform on existing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:266
-msgid "Edit Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:267
-msgid "Delete Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:273
-msgid "View Warninglist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:276
-msgid "Update Warninglists"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:282
-msgid "View Noticelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:285
-msgid "Update Noticelists"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:291
-msgid "List Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:293
-msgid "New Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:297
-msgid "Edit Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:298
-msgid "Delete Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:305
-#: View/Users/edit.ctp:4
-msgid "Edit My Profile"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:306
-#: View/Pages/doc/administration.ctp:126
-#: View/Users/admin_edit.ctp:70
-#: View/Users/change_pw.ctp:4
-msgid "Change Password"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:321;389
-msgid "View Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:328
-#: View/SharingGroups/edit.ctp:3
-msgid "Edit Sharing Group"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:329
-msgid "View Sharing Group"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:342
-msgid "Explore Remote Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:343
-msgid "Fetch This Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:343
-#: View/Feeds/preview_index.ctp:65
-#: View/Servers/preview_index.ctp:147
-msgid "Are you sure you want to fetch and save this event on your instance?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:344;347
-msgid "Explore Remote Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:350
-#: View/Servers/edit.ctp:4
-msgid "Edit Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:356
-msgid "New Server"
-msgstr "새로운 서버"
-
-#: View/Elements/side_menu.ctp:363
-msgid "View User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:364
-msgid "Reset Password"
-msgstr "비밀번호 재설정"
-
-#: View/Elements/side_menu.ctp:365
-msgid "Edit User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:366
-msgid "Delete User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:366
-#: View/Elements/Users/userIndexTable.ctp:91
-msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:370
-#: View/Roles/admin_edit.ctp:4
-msgid "Edit Role"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:371
-msgid "Delete Role"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:385
-#: View/Organisations/admin_edit.ctp:4
-msgid "Edit Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:386
-#: View/Organisations/ajax/merge.ctp:5
-msgid "Merge Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:398
-#: View/Servers/server_settings.ctp:5
-msgid "Server Settings & Maintenance"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:406
-msgid "Blacklists Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:410
-msgid "Blacklists Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:426;433
-msgid "View Thread"
-msgstr "스레드 보기"
-
-#: View/Elements/side_menu.ctp:427
-#: View/Posts/add.ctp:4
-msgid "Add Post"
-msgstr "게시물 추가"
-
-#: View/Elements/side_menu.ctp:434
-#: View/Posts/edit.ctp:4
-msgid "Edit Post"
-msgstr "게시물 편집"
-
-#: View/Elements/side_menu.ctp:439
-msgid "List Threads"
-msgstr "스레드 목록"
-
-#: View/Elements/side_menu.ctp:440
-msgid "New Thread"
-msgstr "새로운 스레드"
-
-#: View/Elements/side_menu.ctp:445
-msgid "List Favourite Tags"
-msgstr "즐겨찾는 태그 목록"
-
-#: View/Elements/side_menu.ctp:455
-msgid "Edit Tag"
-msgstr "태그 편집"
-
-#: View/Elements/side_menu.ctp:461;473
-msgid "View Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:474
-msgid "Delete Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:492
-msgid "View Template"
-msgstr "템플릿 보기"
-
-#: View/Elements/side_menu.ctp:494
-#: View/Templates/edit.ctp:6
-msgid "Edit Template"
-msgstr "템플릿 편집"
-
-#: View/Elements/side_menu.ctp:502
-msgid "Add Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:503
-msgid "Import Feeds from JSON"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:504
-#: View/Feeds/compare_feeds.ctp:7
-msgid "Feed overlap analysis matrix"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:505
-msgid "Export Feed settings"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:507
-msgid "Edit Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:509
-msgid "PreviewIndex"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:511
-msgid "PreviewEvent"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:516
-msgid "View News"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:520
-#: View/News/add.ctp:6
-msgid "Add News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:522
-#: View/News/edit.ctp:6
-msgid "Edit News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:533
-msgid "Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:533
-msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:534
-msgid "Force Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:534
-msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:538;546
-msgid "View Galaxy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:539
-msgid "View Cluster"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:556
-msgid "Update Objects"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:561
-msgid "View Object Template"
-msgstr ""
-
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:84
+#: View/Layouts/default.ctp:87
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -3975,8 +4000,11 @@ msgid "Display"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Jobs/index.ctp:62
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
 #: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr ""
 
@@ -3989,12 +4017,12 @@ msgstr ""
 msgid "Toggle fullscreen"
 msgstr ""
 
-#: View/Elements/view_mitre_attack_matrix.ctp:27
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all events on current page"
 msgstr ""
 
@@ -4034,35 +4062,58 @@ msgstr ""
 msgid "#Posts"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:167
-msgid " correlation(s)"
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/dashboard/dashboard_events.ctp:4;5
+#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
+#: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/preview_index.ctp:174
+#: View/Taxonomies/index.ctp:47
+#: View/Warninglists/index.ctp:60
+msgid "View"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:177;182
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:187
+#: View/Elements/Events/eventIndexTable.ctp:190
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:207
-#: View/Jobs/index.ctp:15;63
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-msgid "All"
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:218
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:12
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
 msgid "Are you sure this event is complete and everyone should be informed?"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:219
+#: View/Elements/Events/eventIndexTable.ctp:222
 msgid "Not published"
 msgstr ""
 
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr ""
+
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid "Show "
 msgstr ""
@@ -4072,51 +4123,66 @@ msgid " more..."
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:295
+#: View/Events/view.ctp:346
 msgid "Collapse…"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:262
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr ""
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:343
 msgid "Restore attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:263;303
+#: View/Elements/Events/View/row_attribute.ctp:344;384
 msgid "Permanently delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Propose enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Propose enrichment through Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:279
+#: View/Elements/Events/View/row_attribute.ctp:360
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:280
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:290;295
+#: View/Elements/Events/View/row_attribute.ctp:371;376
 msgid "Add enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:295
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Add enrichment via Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:307
+#: View/Elements/Events/View/row_attribute.ctp:388
 msgid "Soft-delete attribute"
 msgstr ""
 
@@ -4138,24 +4204,36 @@ msgid "Expand or Collapse"
 msgstr ""
 
 #: View/Elements/Events/View/row_object.ctp:69
-msgid "Meta-category: "
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
 msgstr ""
 
 #: View/Elements/Events/View/row_object.ctp:70
+msgid "Meta-category: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:71
 #: View/Elements/Feeds/View/row_object.ctp:21
 msgid "Description: "
 msgstr "설명: "
 
-#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Events/View/row_object.ctp:72
 #: View/Elements/Feeds/View/row_object.ctp:22
 msgid "Template: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Soft delete object"
 msgstr ""
 
@@ -4196,6 +4274,7 @@ msgstr ""
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
 #: View/Sightings/ajax/advanced.ctp:10
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 msgid "Add sighting"
 msgstr ""
 
@@ -4204,7 +4283,6 @@ msgid "Mark as false-positive"
 msgstr ""
 
 #: View/Elements/Events/View/sighting_field.ctp:14
-#: View/Events/view.ctp:203
 msgid "Advanced sightings"
 msgstr ""
 
@@ -4232,7 +4310,7 @@ msgstr ""
 
 #: View/Elements/Feeds/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object.ctp:20
-#: View/ObjectTemplates/view.ctp:19
+#: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:23
 msgid "Meta-category"
 msgstr ""
@@ -4247,7 +4325,7 @@ msgid "all"
 msgstr ""
 
 #: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/view.ctp:126
+#: View/Events/view.ctp:131
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
 #: View/Servers/preview_event.ctp:36
 #: View/Sightings/ajax/list_sightings.ctp:5
@@ -4273,12 +4351,13 @@ msgstr ""
 #: View/Elements/Servers/View/row_attribute.ctp:93
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/healthElements/files.ctp:61
-#: View/Elements/healthElements/workers.ctp:61;62;63
-#: View/Events/automation.ctp:403;410;417;438;445
+#: View/Elements/healthElements/workers.ctp:66;67;68
+#: View/Events/automation.ctp:234;241;248;269;276
 #: View/Events/export.ctp:68;88
-#: View/Taxonomies/view.ctp:96;107;152
-#: View/Users/admin_view.ctp:83;92;122
-#: View/Users/view.ctp:62
+#: View/Events/legacy_automation.ctp:403;410;417;438;445
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
 msgid "N/A"
 msgstr ""
 
@@ -4287,23 +4366,24 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
 #: View/Galaxies/view.ctp:14
-#: View/ObjectTemplates/view.ctp:11
+#: View/ObjectTemplates/view.ctp:4
 #: View/Objects/revise_object.ctp:19
 #: View/Organisations/ajax/merge.ctp:57;64
 #: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/view.ctp:9
-#: View/SharingGroups/add.ctp:11;31;51
-#: View/SharingGroups/edit.ctp:11;31;59
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
 #: View/SharingGroups/view.ctp:42;67
 #: View/Templates/view.ctp:9
 #: View/Users/statistics_orgs.ctp:31
-#: View/Warninglists/view.ctp:9
+#: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr ""
 
 #: View/Elements/Servers/View/row_object.ctp:21
 #: View/Elements/healthElements/files.ctp:8
-#: View/Elements/healthElements/settings_tab.ctp:16
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:10
 #: View/Elements/templateElements/populateTemplateDescription.ctp:12
 #: View/Elements/templateElements/populateTemplateFile.ctp:10
@@ -4311,19 +4391,19 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:27
 #: View/Galaxies/view.ctp:20
-#: View/ObjectTemplates/view.ctp:21
+#: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:16;94
-#: View/Organisations/view.ctp:32;89;90
+#: View/Organisations/view.ctp:15;58;59
 #: View/Pages/doc/administration.ctp:48;241
-#: View/Pages/doc/categories_and_types.ctp:50;67
+#: View/Pages/doc/categories_and_types.ctp:44;61
 #: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
 #: View/Servers/preview_event.ctp:65
-#: View/SharingGroups/add.ctp:15
-#: View/SharingGroups/edit.ctp:15
-#: View/SharingGroups/index.ctp:28
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
 #: View/Taxonomies/view.ctp:14
 #: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:14
+#: View/Warninglists/view.ctp:11
 msgid "Description"
 msgstr ""
 
@@ -4342,11 +4422,17 @@ msgstr ""
 msgid "Referenced by"
 msgstr ""
 
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
+
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:2
+#: View/Roles/view.ctp:24
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_view.ctp:19
-#: View/Users/view.ctp:19
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
 msgstr ""
 
@@ -4357,7 +4443,7 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:17
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:54
+#: View/ShadowAttributes/index.ctp:64
 msgid "Created"
 msgstr ""
 
@@ -4369,6 +4455,11 @@ msgstr ""
 msgid "Create new credentials and inform user"
 msgstr ""
 
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Elements/dashboard/dashboard_events.ctp:2
 msgid "Changes since last visit"
 msgstr ""
@@ -4397,6 +4488,417 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr "비밀번호 재설정"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr "스레드 보기"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr "게시물 추가"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr "게시물 편집"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr "스레드 목록"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr "새로운 스레드"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr "즐겨찾는 태그 목록"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr "태그 편집"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr "템플릿 보기"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr "템플릿 편집"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr ""
+
 #: View/Elements/healthElements/diagnostics.ctp:5
 msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
 msgstr ""
@@ -4421,11 +4923,10 @@ msgstr ""
 msgid "Outdated version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:26;156;170;195
-#: View/Elements/healthElements/workers.ctp:18;71
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
+#: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
-#: View/Users/admin_view.ctp:81
 msgid "OK"
 msgstr "확인"
 
@@ -4445,131 +4946,135 @@ msgstr ""
 msgid "Current branch…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Pull the latest MISP version from github"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Update MISP"
 msgstr "업데이트 MISP"
 
-#: View/Elements/healthElements/diagnostics.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "Writeable Directories and files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:67
+#: View/Elements/healthElements/diagnostics.ctp:65
 msgid "The following directories and files have to be writeable for MISP to function properly. Make sure that the apache user has write privileges for the directories below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:68
+#: View/Elements/healthElements/diagnostics.ctp:66
 msgid "Directories"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:75
+#: View/Elements/healthElements/diagnostics.ctp:73
 msgid "Directory "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:83
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Writeable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:90;104
+#: View/Elements/healthElements/diagnostics.ctp:88;102
 msgid "File "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:97
+#: View/Elements/healthElements/diagnostics.ctp:95
 msgid "Readable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:112
+#: View/Elements/healthElements/diagnostics.ctp:110
 msgid "PHP Settings"
 msgstr "PHP 설정"
 
-#: View/Elements/healthElements/diagnostics.ctp:115;127
+#: View/Elements/healthElements/diagnostics.ctp:113;125
 msgid "Up to date"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:121
-#: View/Elements/healthElements/workers.ctp:78;80
-#: View/Organisations/view.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:119
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: View/Elements/healthElements/diagnostics.ctp:123
+#: View/Elements/healthElements/diagnostics.ctp:121
 msgid "Issues determining version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:130;139
+#: View/Elements/healthElements/diagnostics.ctp:128;137
 msgid "Update highly recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:133;142
+#: View/Elements/healthElements/diagnostics.ctp:131;140
 msgid "Version unsupported, update ASAP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:146
+#: View/Elements/healthElements/diagnostics.ctp:144
 msgid "PHP ini path"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:147
+#: View/Elements/healthElements/diagnostics.ctp:145
 msgid "PHP Version"
 msgstr "PHP 버전"
 
-#: View/Elements/healthElements/diagnostics.ctp:147;148
+#: View/Elements/healthElements/diagnostics.ctp:145;146
 msgid "recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:148
+#: View/Elements/healthElements/diagnostics.ctp:146
 msgid "PHP CLI Version"
 msgstr "PHP CLI 버전"
 
-#: View/Elements/healthElements/diagnostics.ctp:149
+#: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
 msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:156
+#: View/Elements/healthElements/diagnostics.ctp:155
 #: View/Events/filter_event_index.ctp:32;190
 #: View/Pages/doc/using_the_system.ctp:66;171
 msgid "Low"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:160
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP Extensions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:170
+#: View/Elements/healthElements/diagnostics.ctp:169
 msgid "Not loaded"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:175
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:183
+#: View/Elements/healthElements/diagnostics.ctp:182
 msgid "Advanced attachment handler"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:184
+#: View/Elements/healthElements/diagnostics.ctp:183
 msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PyMISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:201
+#: View/Elements/healthElements/diagnostics.ctp:200
 msgid "STIX and Cybox libraries"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:202
+#: View/Elements/healthElements/diagnostics.ctp:201
 msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:203
+#: View/Elements/healthElements/diagnostics.ctp:202
 msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
 msgstr ""
 
@@ -4806,72 +5311,35 @@ msgid "Permissions"
 msgstr "권한"
 
 #: View/Elements/healthElements/files.ctp:73
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
 #: View/Roles/admin_index.ctp:67
-#: View/SharingGroups/index.ctp:68
+#: View/SharingGroups/index.ctp:87
 msgid "Are you sure you want to delete %s?"
 msgstr "'%s' 을(를) 삭제하시겠습니까?"
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:5
 msgid "Good, but there are some optional settings that are incorrect / not set."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:6
 msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
-msgid "Overall health"
+msgid "Test"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:17
-msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:26
-msgid " settings incorrectly or not set"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:27
-msgid " incorrect settings."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:33
-msgid "Critical issues revealed by the diagnostics"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:34
-msgid " issues detected."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:35
-msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:9
-msgid "Toggle subgroup"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:13
-#: View/Pages/doc/administration.ctp:45
-msgid "Priority"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:14
-#: View/Pages/doc/administration.ctp:46
-msgid "Setting"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:15
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
 #: View/Events/filter_event_index.ctp:134
 #: View/Events/resolved_attributes.ctp:45
 #: View/Events/show_i_o_c_results.ctp:13
@@ -4886,128 +5354,166 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: View/Elements/healthElements/settings_tab.ctp:17
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:3;15;27;36
-#: View/Events/index.ctp:30;58
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
-#: View/Users/admin_index.ctp:28
-msgid "Modify filters"
-msgstr ""
-
-#: View/Elements/healthElements/tabs.ctp:3
+#: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:28
-#: View/Pages/doc/administration.ctp:38
-msgid "Diagnostics"
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:37
-#: View/Pages/doc/administration.ctp:39
-msgid "Workers"
+#: View/Elements/healthElements/tabs.ctp:34
+#: View/Pages/doc/administration.ctp:38
+msgid "Diagnostics"
 msgstr ""
 
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:48
+#: View/Elements/healthElements/tabs.ctp:50;65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:5
-msgid "Warning"
-msgstr "경고"
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
+msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:5
 msgid "MISP cannot access your /proc directory to check the status of the worker processes, which means that dead workers will not be detected by the diagnostic tool. If you would like to regain this functionality, make sure that the open_basedir directive is not set, or that /proc is included in it."
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:10
-msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgid "Note:"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "You have set the \"manage_workers\" variable to \"false\", therefore worker controls have been disabled."
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:15
+msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:20
 msgid "Worker started with the correct user, but the current status is unknown."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:24
+#: View/Elements/healthElements/workers.ctp:29
 msgid "There are issues with the worker(s), but at least one healthy worker is monitoring the queue."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:30
+#: View/Elements/healthElements/workers.ctp:35
 msgid "Worker type: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:32
+#: View/Elements/healthElements/workers.ctp:37
 msgid "Jobs in the queue: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:40
+#: View/Elements/healthElements/workers.ctp:45
 msgid "Queue status: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:51
+#: View/Elements/healthElements/workers.ctp:56
 msgid "Worker PID"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:52
+#: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
-#: View/Users/admin_view.ctp:7
-#: View/Users/view.ctp:2
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
 msgid "User"
 msgstr "사용자"
 
-#: View/Elements/healthElements/workers.ctp:53
+#: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:54
+#: View/Elements/healthElements/workers.ctp:59
 msgid "Information"
 msgstr "정보"
 
-#: View/Elements/healthElements/workers.ctp:64
+#: View/Elements/healthElements/workers.ctp:69
 msgid "Worker not running!"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:72
+#: View/Elements/healthElements/workers.ctp:77
 msgid "The worker appears to be healthy."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:75
+#: View/Elements/healthElements/workers.ctp:80
 msgid "The worker was started with a user other than the apache user. MISP cannot check whether the worker is alive or not."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:81
+#: View/Elements/healthElements/workers.ctp:86
 msgid "Cannot check whether the worker is alive or dead."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:85
+#: View/Elements/healthElements/workers.ctp:90
 msgid "Dead"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:86
+#: View/Elements/healthElements/workers.ctp:91
 msgid "The Worker appears to be dead."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:100
+#: View/Elements/healthElements/workers.ctp:106
 msgid "Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:111
+#: View/Elements/healthElements/workers.ctp:119
 msgid "Start a worker"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:119
+#: View/Elements/healthElements/workers.ctp:130
 msgid "Restart all workers"
 msgstr ""
 
@@ -5138,16 +5644,16 @@ msgstr ""
 #: View/Objects/revise_object.ctp:45
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
-#: View/Pages/doc/categories_and_types.ctp:66
+#: View/Pages/doc/categories_and_types.ctp:60
 #: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
-#: View/ShadowAttributes/index.ctp:36;51
-#: View/SharingGroups/add.ctp:30
-#: View/SharingGroups/edit.ctp:30
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
 #: View/Sightings/ajax/list_sightings.ctp:7
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:35
-#: View/Warninglists/view.ctp:24
+#: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr ""
 
@@ -5186,7 +5692,7 @@ msgid "Template Name"
 msgstr ""
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:60
+#: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr ""
@@ -5206,7 +5712,7 @@ msgid "s"
 msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
-#: View/ObjectReferences/ajax/add.ctp:60
+#: View/ObjectReferences/ajax/add.ctp:86
 #: View/Objects/revise_object.ctp:43
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
@@ -5220,19 +5726,19 @@ msgstr ""
 #: View/Feeds/freetext_index.ctp:31
 #: View/Objects/add.ctp:95
 #: View/Objects/revise_object.ctp:44
-#: View/Pages/doc/categories_and_types.ctp:17;23;37;43;49
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
 #: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
-#: View/ShadowAttributes/index.ctp:48
+#: View/ShadowAttributes/index.ctp:58
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_add_file.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:28
 #: View/Templates/populate_event_from_template_attributes.ctp:6
 msgid "Category"
-msgstr ""
+msgstr "카테고리:"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
-#: View/Pages/doc/categories_and_types.ctp:63
+#: View/Pages/doc/categories_and_types.ctp:57
 #: View/Pages/doc/using_the_system.ctp:109
 #: View/Pages/doc/md/categories_and_types.ctp:33
 msgid "Types"
@@ -5461,45 +5967,33 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
-#: View/Events/add.ctp:3
-msgid "The event created %s, but not synchronised to other MISP instances until it is published."
-msgstr ""
-
-#: View/Events/add.ctp:3
-msgid "will be restricted to your organisation"
-msgstr ""
-
-#: View/Events/add.ctp:3
-msgid "will be visible to the organisations having an account on this platform"
-msgstr ""
-
-#: View/Events/add.ctp:48
+#: View/Events/add.ctp:44
 #: View/Events/edit.ctp:35
 msgid "Threat Level "
 msgstr "위협 레벨 "
 
-#: View/Events/add.ctp:52
+#: View/Events/add.ctp:48
 #: View/Events/edit.ctp:38
 msgid "Analysis "
 msgstr "분석 "
 
-#: View/Events/add.ctp:56
+#: View/Events/add.ctp:52
 #: View/Events/edit.ctp:43
-#: View/ShadowAttributes/index.ctp:42
+#: View/ShadowAttributes/index.ctp:52
 msgid "Event Info"
 msgstr "이벤트 정보"
 
-#: View/Events/add.ctp:60
+#: View/Events/add.ctp:56
 #: View/Events/edit.ctp:47
 msgid "Quick Event Description or Tracking Info"
 msgstr ""
 
-#: View/Events/add.ctp:63
+#: View/Events/add.ctp:59
 #: View/Events/edit.ctp:50
 msgid "Extends event"
 msgstr ""
 
-#: View/Events/add.ctp:66
+#: View/Events/add.ctp:62
 #: View/Events/edit.ctp:53
 msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr ""
@@ -5510,7 +6004,8 @@ msgstr ""
 
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
-#: View/Events/upload_stix.ctp:22
+#: View/Events/upload_analysis_file.ctp:22
+#: View/Events/upload_stix.ctp:29
 msgid "Upload"
 msgstr "업로드"
 
@@ -5548,7 +6043,7 @@ msgid "Details"
 msgstr "세부사항"
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:89
+#: View/Jobs/index.ctp:124
 msgid "Failed"
 msgstr "실패"
 
@@ -5561,781 +6056,677 @@ msgid "Event with this UUID already exists."
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr ""
 
 #: View/Events/automation.ctp:3
-msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
-"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
-"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgid "Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.\n"
+"    To to make this functionality available for automated tools an authentication key is used."
 msgstr ""
 
 #: View/Events/automation.ctp:6
-msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgid "Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP."
 msgstr ""
 
-#: View/Events/automation.ctp:7
+#: View/Events/automation.ctp:9
+#: View/Events/legacy_automation.ctp:7
 msgid "Your current key is: <code>%s</code>.\n"
 "    You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:8
+#: View/Events/automation.ctp:10
+#: View/Events/legacy_automation.ctp:8
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:10
-msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
-msgstr ""
-
-#: View/Events/automation.ctp:11
-msgid "Please use the use the following header"
-msgstr ""
-
-#: View/Events/automation.ctp:12
-msgid "Authorization"
-msgstr ""
-
-#: View/Events/automation.ctp:13
-msgid "XML Export"
-msgstr ""
-
 #: View/Events/automation.ctp:14
-msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+#: View/Logs/admin_index.ctp:20;21
+msgid "Search"
 msgstr ""
 
-#: View/Events/automation.ctp:15;47;76
-msgid "You can configure your tools to automatically download the following file"
+#: View/Events/automation.ctp:16
+#: View/Events/legacy_automation.ctp:264
+msgid "It is possible to search the database for attributes based on a list of criteria."
 msgstr ""
 
 #: View/Events/automation.ctp:17
-msgid "If you only want to fetch a specific event append the eventid number"
+#: View/Events/legacy_automation.ctp:265
+msgid "To return an event or a list of events in a desired format, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:19;144
-msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+#: View/Events/automation.ctp:18
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
 msgstr ""
 
-#: View/Events/automation.ctp:26
-msgid "The xml download also accepts two additional the following optional parameters in the URL"
+#: View/Events/automation.ctp:21
+msgid "Set the return format of the search (Currently supported: json, xml, openioc, suricata, snort - more formats are being moved to restSearch with the goal being that all searches happen through this API). Can be passed as the first parameter after restSearch or via the JSON payload."
 msgstr ""
 
-#: View/Events/automation.ctp:29;52;85
-msgid "Restrict the download to a single event"
+#: View/Events/automation.ctp:22
+msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
 msgstr ""
 
-#: View/Events/automation.ctp:30
-msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+#: View/Events/automation.ctp:23
+msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
 msgstr ""
 
-#: View/Events/automation.ctp:31;54;87;112;134
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:24
+#: View/Events/legacy_automation.ctp:268;297
+msgid "Search for the given value in the attributes' value field."
 msgstr ""
 
-#: View/Events/automation.ctp:37;64;91;117;140;203;254;279
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:38;65;92;118;141;204;255;280
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:39;119;142;205;256;281;306
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:41;70;97;122;259;290
-msgid "The keywords false or null should be used for optional empty parameters in the URL."
-msgstr ""
-
-#: View/Events/automation.ctp:43
-msgid "Also check out the %s to read about the REST API."
-msgstr ""
-
-#: View/Events/automation.ctp:45
-msgid "CSV Export"
-msgstr ""
-
-#: View/Events/automation.ctp:46
-msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
-msgstr ""
-
-#: View/Events/automation.ctp:49
-msgid "You can specify additional flags for CSV exports as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:53
-msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
-msgstr ""
-
-#: View/Events/automation.ctp:58
-msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:61;270;299
-msgid "The attribute category, any valid MISP attribute category is accepted."
-msgstr ""
-
-#: View/Events/automation.ctp:62;199;269;298
+#: View/Events/automation.ctp:25
+#: View/Events/legacy_automation.ctp:62;199;269;298
 msgid "The attribute type, any valid MISP attribute type is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:63
-msgid "Include the event data with each attribute."
+#: View/Events/automation.ctp:26
+#: View/Events/legacy_automation.ctp:61;270;299
+msgid "The attribute category, any valid MISP attribute category is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:66
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+#: View/Events/automation.ctp:27
+#: View/Events/legacy_automation.ctp:271;300
+msgid "Search by the creator organisation by supplying the organisation identifier."
 msgstr ""
 
-#: View/Events/automation.ctp:67
-msgid "The CSV created when this setting is set to true will not contain the header row.\n"
-"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:71
-msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:74
-msgid "NIDS rules export"
-msgstr ""
-
-#: View/Events/automation.ctp:75
-msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:81
-msgid "The full API syntax is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:84
-msgid "The export format, can be \"suricata\" or \"snort\""
-msgstr ""
-
-#: View/Events/automation.ctp:86
-msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
-msgstr ""
-
-#: View/Events/automation.ctp:93
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:94
-msgid "Restrict the export to only use the given types."
-msgstr ""
-
-#: View/Events/automation.ctp:95;120;174;206;257
-msgid "All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:96
-msgid "All tags will be included even if not exportable."
-msgstr ""
-
-#: View/Events/automation.ctp:98
-msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
-msgstr ""
-
-#: View/Events/automation.ctp:100
-msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
-msgstr ""
-
-#: View/Events/automation.ctp:102
-msgid "Hash database export"
-msgstr ""
-
-#: View/Events/automation.ctp:103
-msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:104;188
-msgid "You can configure your tools to automatically download the following files"
-msgstr ""
-
-#: View/Events/automation.ctp:109
-msgid "The API's full format is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:111
-msgid "The export format, can be \"md5\" or \"sha1\""
-msgstr ""
-
-#: View/Events/automation.ctp:123
-msgid "For example, to only show sha1 values from events tagged tag1, use"
-msgstr ""
-
-#: View/Events/automation.ctp:126
-msgid "STIX export"
-msgstr ""
-
-#: View/Events/automation.ctp:127
-msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
-msgstr ""
-
-#: View/Events/automation.ctp:129
-msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:132;171
-msgid "The event's ID"
-msgstr ""
-
-#: View/Events/automation.ctp:133
-msgid "Encode attachments where applicable"
-msgstr ""
-
-#: View/Events/automation.ctp:151
-msgid "Various ways to narrow down the search results of the STIX export"
-msgstr ""
-
-#: View/Events/automation.ctp:152
-msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
-msgstr ""
-
-#: View/Events/automation.ctp:154
-msgid "To export the same events using a POST request use"
-msgstr ""
-
-#: View/Events/automation.ctp:156
-msgid "Together with this JSON object in the POST message"
-msgstr ""
-
-#: View/Events/automation.ctp:158
-msgid "XML is automagically assumed when using the stix export"
-msgstr ""
-
-#: View/Events/automation.ctp:160
-msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
-msgstr ""
-
-#: View/Events/automation.ctp:163
-msgid "RPZ export"
-msgstr ""
-
-#: View/Events/automation.ctp:164
-msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
-msgstr ""
-
-#: View/Events/automation.ctp:165
-msgid "It is possible to further restrict the exported values using the following filters"
-msgstr ""
-
-#: View/Events/automation.ctp:167
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
-"        "
-msgstr ""
-
-#: View/Events/automation.ctp:170
-msgid "Use semicolons instead (the search will automatically search for colons instead)"
-msgstr ""
-
-#: View/Events/automation.ctp:172
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
-msgstr ""
-
-#: View/Events/automation.ctp:173
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
-msgstr ""
-
-#: View/Events/automation.ctp:176
-msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:180
-msgid "To override the above values, either use the url parameters as described below"
-msgstr ""
-
-#: View/Events/automation.ctp:182
-msgid "or POST an XML or JSON object with the above listed options"
-msgstr ""
-
-#: View/Events/automation.ctp:186
-msgid "Text export"
-msgstr ""
-
-#: View/Events/automation.ctp:187
-msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:194
-msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
-msgstr ""
-
-#: View/Events/automation.ctp:197
-msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
-msgstr ""
-
-#: View/Events/automation.ctp:200
+#: View/Events/automation.ctp:28
+#: View/Events/legacy_automation.ctp:200
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'."
 msgstr ""
 
-#: View/Events/automation.ctp:201
-msgid "Only export the attributes of the given event ID"
+#: View/Events/automation.ctp:29
+#: View/Events/legacy_automation.ctp:278
+msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
 msgstr ""
 
-#: View/Events/automation.ctp:202
-msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+#: View/Events/automation.ctp:30;151
+#: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:207
-msgid "Include not published Events."
+#: View/Events/automation.ctp:31;152
+#: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:208;275
-msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:32
+#: View/Events/legacy_automation.ctp:282;307
+msgid "The events that should be included / excluded from the search"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:33
+#: View/Events/legacy_automation.ctp:283;308
+msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
+msgstr ""
+
+#: View/Events/automation.ctp:34
+#: View/Events/legacy_automation.ctp:284
+msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
+msgstr ""
+
+#: View/Events/automation.ctp:35
+#: View/Events/legacy_automation.ctp:285;309
+msgid "Restrict the results by uuid."
+msgstr ""
+
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:37
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:38
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:39
+#: View/Events/legacy_automation.ctp:288;311
+msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
+msgstr ""
+
+#: View/Events/automation.ctp:40
+#: View/Events/legacy_automation.ctp:289;313
+msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
+msgstr ""
+
+#: View/Events/automation.ctp:41
+#: View/Events/legacy_automation.ctp:314
+msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
+msgstr ""
+
+#: View/Events/automation.ctp:42
+#: View/Events/legacy_automation.ctp:315
+msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
+msgstr ""
+
+#: View/Events/automation.ctp:43
+#: View/Events/legacy_automation.ctp:316
+msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:44
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:45
+msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
+msgstr ""
+
+#: View/Events/automation.ctp:46
+msgid "Filter on the event's info field."
+msgstr ""
+
+#: View/Events/automation.ctp:47
+msgid "Search for a full or a substring (delimited by % for substrings) in the event info, event tags, attribute tags, attribute values or attribute comment fields."
+msgstr ""
+
+#: View/Events/automation.ctp:48
+msgid "CSV only, select the fields that you wish to include in the CSV export. By setting event level fields additionally, includeContext is not required to get event metadata."
+msgstr ""
+
+#: View/Events/automation.ctp:49
+msgid "CSV only, add additional event level data to the export. The additional fields can be added via requested_attributes too with more granularity."
+msgstr ""
+
+#: View/Events/automation.ctp:79
+msgid "CSV specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:81
+msgid "Limit the list of fields to be returned in the CSV."
+msgstr ""
+
+#: View/Events/automation.ctp:82
+msgid "Include the event level meta-data with each attribute."
+msgstr ""
+
+#: View/Events/automation.ctp:83
+msgid "The CSV created when this setting is set to true will not contain the header row."
+msgstr ""
+
+#: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
+msgid "RPZ specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:95
+#: View/Events/legacy_automation.ctp:164
+msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
+msgstr ""
+
+#: View/Events/automation.ctp:98
+#: View/Events/legacy_automation.ctp:176
+msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
+msgstr ""
+
+#: View/Events/automation.ctp:102
+#: View/Events/legacy_automation.ctp:180
+msgid "To override the above values, either use the url parameters as described below"
+msgstr ""
+
+#: View/Events/automation.ctp:104
+#: View/Events/legacy_automation.ctp:182
+msgid "or POST an XML or JSON object with the above listed options"
+msgstr ""
+
+#: View/Events/automation.ctp:108
+#: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:109
+#: View/Events/legacy_automation.ctp:212
 msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
 msgstr ""
 
-#: View/Events/automation.ctp:213
+#: View/Events/automation.ctp:110
+#: View/Events/legacy_automation.ctp:213
 msgid "You can configure your tools to automatically download a file one of the Bro types."
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:116
+#: View/Events/legacy_automation.ctp:219
 msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
 msgstr ""
 
-#: View/Events/automation.ctp:222
+#: View/Events/automation.ctp:119
+#: View/Events/legacy_automation.ctp:222
 msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
 msgstr ""
 
-#: View/Events/automation.ctp:240
+#: View/Events/automation.ctp:137
+#: View/Events/legacy_automation.ctp:240
 msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
 msgstr ""
 
-#: View/Events/automation.ctp:242
+#: View/Events/automation.ctp:139
+#: View/Events/legacy_automation.ctp:242
 msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:249;301
+#: View/Events/automation.ctp:146
+#: View/Events/legacy_automation.ctp:249;301
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
 "    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
 "    Use semicolons instead (the search will automatically search for colons instead)."
 msgstr ""
 
-#: View/Events/automation.ctp:252
+#: View/Events/automation.ctp:149
+#: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:150
+#: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:154
+#: View/Events/legacy_automation.ctp:95;120;174;206;257
+msgid "All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/automation.ctp:156
+#: View/Events/legacy_automation.ctp:41;70;97;122;259;290
+msgid "The keywords false or null should be used for optional empty parameters in the URL."
+msgstr ""
+
+#: View/Events/automation.ctp:157
+#: View/Events/legacy_automation.ctp:260
 msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
 msgstr ""
 
-#: View/Events/automation.ctp:263
-msgid "Searches with JSON/XML/OpenIOC results"
-msgstr ""
-
-#: View/Events/automation.ctp:264
-msgid "It is possible to search the database for attributes based on a list of criteria."
-msgstr ""
-
-#: View/Events/automation.ctp:265
-msgid "To return an event or a list of events in a desired format, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:267
-msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
-msgstr ""
-
-#: View/Events/automation.ctp:268;297
-msgid "Search for the given value in the attributes' value field."
-msgstr ""
-
-#: View/Events/automation.ctp:271;300
-msgid "Search by the creator organisation by supplying the organisation identifier."
-msgstr ""
-
-#: View/Events/automation.ctp:272
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
-msgstr ""
-
-#: View/Events/automation.ctp:278
-msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
-msgstr ""
-
-#: View/Events/automation.ctp:282;307
-msgid "The events that should be included / excluded from the search"
-msgstr ""
-
-#: View/Events/automation.ctp:283;308
-msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
-msgstr ""
-
-#: View/Events/automation.ctp:284
-msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
-msgstr ""
-
-#: View/Events/automation.ctp:285;309
-msgid "Restrict the results by uuid."
-msgstr ""
-
-#: View/Events/automation.ctp:286;310
-msgid "Restrict the results by the last publish timestamp (newer than)."
-msgstr ""
-
-#: View/Events/automation.ctp:287
-msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
-msgstr ""
-
-#: View/Events/automation.ctp:288;311
-msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
-msgstr ""
-
-#: View/Events/automation.ctp:289;313
-msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
-msgstr ""
-
-#: View/Events/automation.ctp:291
-msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
-msgstr ""
-
-#: View/Events/automation.ctp:294;320;349
-msgid "POST message payload (json)"
-msgstr ""
-
-#: View/Events/automation.ctp:296
-msgid "To just return a list of attributes, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:304
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
-msgstr ""
-
-#: View/Events/automation.ctp:305
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
-msgstr ""
-
-#: View/Events/automation.ctp:312
-msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
-msgstr ""
-
-#: View/Events/automation.ctp:314
-msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
-msgstr ""
-
-#: View/Events/automation.ctp:315
-msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
-msgstr ""
-
-#: View/Events/automation.ctp:316
-msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
-msgstr ""
-
-#: View/Events/automation.ctp:317
-msgid "Only return attributes from events that have received a modification after the given timestamp."
-msgstr ""
-
-#: View/Events/automation.ctp:322
-msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
-msgstr ""
-
-#: View/Events/automation.ctp:324
-msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
-"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:327
-msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
-msgstr ""
-
-#: View/Events/automation.ctp:329
+#: View/Events/automation.ctp:160
+#: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:330
+#: View/Events/automation.ctp:161
+#: View/Events/legacy_automation.ctp:330
 msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:332
+#: View/Events/automation.ctp:163
+#: View/Events/legacy_automation.ctp:332
 msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
 "    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
 "    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:168
+#: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:169
+#: View/Events/legacy_automation.ctp:338
 msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:340
+#: View/Events/automation.ctp:171
+#: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:341
+#: View/Events/automation.ctp:172
+#: View/Events/legacy_automation.ctp:341
 msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
 msgstr ""
 
-#: View/Events/automation.ctp:342
+#: View/Events/automation.ctp:173
+#: View/Events/legacy_automation.ctp:342
 msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
 msgstr ""
 
-#: View/Events/automation.ctp:343
+#: View/Events/automation.ctp:174
+#: View/Events/legacy_automation.ctp:343
 msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
 msgstr ""
 
-#: View/Events/automation.ctp:345
+#: View/Events/automation.ctp:176
+#: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:353
+#: View/Events/automation.ctp:180
+#: View/Events/legacy_automation.ctp:294;320;349
+msgid "POST message payload (json)"
+msgstr ""
+
+#: View/Events/automation.ctp:184
+#: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:354
+#: View/Events/automation.ctp:185
+#: View/Events/legacy_automation.ctp:354
 msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
 msgstr ""
 
-#: View/Events/automation.ctp:355
+#: View/Events/automation.ctp:186
+#: View/Events/legacy_automation.ctp:355
 msgid "If set, it will return all samples from events that have a match for the hash provided above."
 msgstr ""
 
-#: View/Events/automation.ctp:356
+#: View/Events/automation.ctp:187
+#: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:357
+#: View/Events/automation.ctp:188
+#: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:359
+#: View/Events/automation.ctp:190
+#: View/Events/legacy_automation.ctp:359
 msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
 msgstr ""
 
-#: View/Events/automation.ctp:360
+#: View/Events/automation.ctp:191
+#: View/Events/legacy_automation.ctp:360
 msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
 msgstr ""
 
-#: View/Events/automation.ctp:361
+#: View/Events/automation.ctp:192
+#: View/Events/legacy_automation.ctp:361
 msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
 msgstr ""
 
-#: View/Events/automation.ctp:362
+#: View/Events/automation.ctp:193
+#: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:371
+#: View/Events/automation.ctp:202
+#: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:372
+#: View/Events/automation.ctp:203
+#: View/Events/legacy_automation.ctp:372
 msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
 msgstr ""
 
-#: View/Events/automation.ctp:373
+#: View/Events/automation.ctp:204
+#: View/Events/legacy_automation.ctp:373
 msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:374
+#: View/Events/automation.ctp:205
+#: View/Events/legacy_automation.ctp:374
 msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
 msgstr ""
 
-#: View/Events/automation.ctp:375
+#: View/Events/automation.ctp:206
+#: View/Events/legacy_automation.ctp:375
 msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 msgstr ""
 
-#: View/Events/automation.ctp:376
+#: View/Events/automation.ctp:207
+#: View/Events/legacy_automation.ctp:376
 msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
 msgstr ""
 
-#: View/Events/automation.ctp:377
+#: View/Events/automation.ctp:208
+#: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:378
+#: View/Events/automation.ctp:209
+#: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:379
+#: View/Events/automation.ctp:210
+#: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr ""
 
-#: View/Events/automation.ctp:380
+#: View/Events/automation.ctp:211
+#: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:381
+#: View/Events/automation.ctp:212
+#: View/Events/legacy_automation.ctp:381
 msgid "You can add or remove an existing tag from an event in the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:384
+#: View/Events/automation.ctp:215
+#: View/Events/legacy_automation.ctp:384
 msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
 msgstr ""
 
-#: View/Events/automation.ctp:386
+#: View/Events/automation.ctp:217
+#: View/Events/legacy_automation.ctp:386
 msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:388
+#: View/Events/automation.ctp:219
+#: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:389
+#: View/Events/automation.ctp:220
+#: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr ""
 
-#: View/Events/automation.ctp:393
+#: View/Events/automation.ctp:224
+#: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:394
+#: View/Events/automation.ctp:225
+#: View/Events/legacy_automation.ctp:394
 #: View/Pages/doc/using_the_system.ctp:445
-#: View/SharingGroups/add.ctp:52
-#: View/SharingGroups/edit.ctp:60
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
 msgid "URL"
 msgstr ""
 
-#: View/Events/automation.ctp:395
+#: View/Events/automation.ctp:226
+#: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:396
+#: View/Events/automation.ctp:227
+#: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:397
-#: View/Servers/rest.ctp:53
+#: View/Events/automation.ctp:228
+#: View/Events/legacy_automation.ctp:397
+#: View/Servers/rest.ctp:115
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:402
+#: View/Events/automation.ctp:233
+#: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:404;424;425;431;432
+#: View/Events/automation.ctp:235;255;256;262;263
+#: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:409
+#: View/Events/automation.ctp:240
+#: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:411;418
+#: View/Events/automation.ctp:242;249
+#: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:416
+#: View/Events/automation.ctp:247
+#: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:423
+#: View/Events/automation.ctp:254
+#: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:430
+#: View/Events/automation.ctp:261
+#: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:437
+#: View/Events/automation.ctp:268
+#: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:439;446
+#: View/Events/automation.ctp:270;277
+#: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
 #: View/Pages/doc/using_the_system.ctp:254
 msgid "Message"
 msgstr ""
 
-#: View/Events/automation.ctp:444
+#: View/Events/automation.ctp:275
+#: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:449
+#: View/Events/automation.ctp:280
+#: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:454
+#: View/Events/automation.ctp:285
+#: View/Events/legacy_automation.ctp:454
 msgid "None of the above fields are mandatory, but at least one of them has to be provided."
 msgstr ""
 
-#: View/Events/automation.ctp:456
+#: View/Events/automation.ctp:287
+#: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:457
+#: View/Events/automation.ctp:288
+#: View/Events/legacy_automation.ctp:457
 msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
 msgstr ""
 
-#: View/Events/automation.ctp:461
+#: View/Events/automation.ctp:292
+#: View/Events/legacy_automation.ctp:461
 msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
 "    An example for a valid lookup"
 msgstr ""
 
-#: View/Events/automation.ctp:472
+#: View/Events/automation.ctp:303
+#: View/Events/legacy_automation.ctp:472
 msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
 msgstr ""
 
-#: View/Events/automation.ctp:473
+#: View/Events/automation.ctp:304
+#: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:474
+#: View/Events/automation.ctp:305
+#: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:475
+#: View/Events/automation.ctp:306
+#: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:476
+#: View/Events/automation.ctp:307
+#: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:477
+#: View/Events/automation.ctp:308
+#: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:478
+#: View/Events/automation.ctp:309
+#: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:479
+#: View/Events/automation.ctp:310
+#: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:480
+#: View/Events/automation.ctp:311
+#: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:481
+#: View/Events/automation.ctp:312
+#: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:482
+#: View/Events/automation.ctp:313
+#: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:483
+#: View/Events/automation.ctp:314
+#: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:484
+#: View/Events/automation.ctp:315
+#: View/Events/legacy_automation.ctp:484
 msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:485
+#: View/Events/automation.ctp:316
+#: View/Events/legacy_automation.ctp:485
 msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
+#: View/Events/automation.ctp:319
+msgid "Freetext Import API"
+msgstr ""
+
+#: View/Events/automation.ctp:321
+msgid "The freetext import tool is also exposed to the API."
+msgstr ""
+
+#: View/Events/automation.ctp:322
+msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
+msgstr ""
+
+#: View/Events/automation.ctp:323
+msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:324
+msgid "The contents of the POST body should be the text to be parsed."
+msgstr ""
+
 #: View/Events/contact.ctp:8
 msgid "Contact organization reporting event "
 msgstr ""
@@ -6529,7 +6920,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:9;101
+#: View/Jobs/index.ctp:9;136
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr ""
@@ -6553,7 +6944,7 @@ msgid "All communities"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:53
+#: View/Feeds/index.ctp:103
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -6605,47 +6996,378 @@ msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/Organisations/view.ctp:97;98
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:33
 msgid "Events"
 msgstr ""
 
-#: View/Events/index.ctp:30
-msgid "Filter events"
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
 msgstr ""
 
-#: View/Events/index.ctp:31
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr ""
 
-#: View/Events/index.ctp:44
-msgid "Quickfilter"
+#: View/Events/index.ctp:73
+msgid "My events only"
 msgstr ""
 
-#: View/Events/index.ctp:44
-#: View/Organisations/index.ctp:59
-#: View/Servers/preview_index.ctp:45
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr ""
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr ""
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr ""
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
 msgid "Filter"
 msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My events only"
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
 msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My Events"
+#: View/Events/legacy_automation.ctp:3
+msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
+"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
 msgstr ""
 
-#: View/Events/index.ctp:72
-msgid "My organisation's events only"
+#: View/Events/legacy_automation.ctp:6
+msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
-#: View/Events/index.ctp:72
-msgid "Org Events"
+#: View/Events/legacy_automation.ctp:10
+msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:11
+msgid "Please use the use the following header"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:12
+msgid "Authorization"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:13
+msgid "XML Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:14
+msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:15;47;76
+msgid "You can configure your tools to automatically download the following file"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:17
+msgid "If you only want to fetch a specific event append the eventid number"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:19;144
+msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:26
+msgid "The xml download also accepts two additional the following optional parameters in the URL"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:29;52;85
+msgid "Restrict the download to a single event"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:30
+msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:31;54;87;112;134
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:43
+msgid "Also check out the %s to read about the REST API."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:45
+msgid "CSV Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:46
+msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:49
+msgid "You can specify additional flags for CSV exports as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:53
+msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:58
+msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:63
+msgid "Include the event data with each attribute."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:66
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:67
+msgid "The CSV created when this setting is set to true will not contain the header row.\n"
+"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:71
+msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:74
+msgid "NIDS rules export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:75
+msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:81
+msgid "The full API syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:84
+msgid "The export format, can be \"suricata\" or \"snort\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:86
+msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:93
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:94
+msgid "Restrict the export to only use the given types."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:96
+msgid "All tags will be included even if not exportable."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:98
+msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:100
+msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:102
+msgid "Hash database export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:103
+msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:104;188
+msgid "You can configure your tools to automatically download the following files"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:109
+msgid "The API's full format is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:111
+msgid "The export format, can be \"md5\" or \"sha1\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:123
+msgid "For example, to only show sha1 values from events tagged tag1, use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:126
+msgid "STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:127
+msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:129
+msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:132;171
+msgid "The event's ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:133
+msgid "Encode attachments where applicable"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:151
+msgid "Various ways to narrow down the search results of the STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:152
+msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:154
+msgid "To export the same events using a POST request use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:156
+msgid "Together with this JSON object in the POST message"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:158
+msgid "XML is automagically assumed when using the stix export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:160
+msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:163
+msgid "RPZ export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:165
+msgid "It is possible to further restrict the exported values using the following filters"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:167
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
+"        "
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:170
+msgid "Use semicolons instead (the search will automatically search for colons instead)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:172
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:173
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:186
+msgid "Text export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:187
+msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:194
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:197
+msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:201
+msgid "Only export the attributes of the given event ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:202
+msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:207
+msgid "Include not published Events."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:208;275
+msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:263
+msgid "Searches with JSON/XML/OpenIOC results"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:267
+msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:272
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:291
+msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:296
+msgid "To just return a list of attributes, use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:304
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:305
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:312
+msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:322
+msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:324
+msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
+"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:327
+msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
 msgstr ""
 
 #: View/Events/merge.ctp:4
@@ -6671,19 +7393,19 @@ msgid "Proposals"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:93
+#: View/Events/view.ctp:106
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:113
-#: View/Jobs/index.ctp:65
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
 #: View/Logs/admin_search.ctp:6
 #: View/Pages/doc/administration.ctp:87;104;116;181;195
 #: View/Pages/doc/using_the_system.ctp:166
-#: View/Users/admin_view.ctp:24
-#: View/Users/view.ctp:9
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
 msgid "Email"
 msgstr ""
 
@@ -6761,11 +7483,8 @@ msgid "Successfully added attributes"
 msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Events/view.ctp:56
 #: View/Feeds/preview_event.ctp:11
 #: View/Galaxies/view.ctp:18
-#: View/ObjectTemplates/view.ctp:15
-#: View/Organisations/view.ctp:54
 #: View/Organisations/ajax/merge.ctp:58
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
@@ -6788,6 +7507,14 @@ msgstr ""
 msgid "Visualisation"
 msgstr ""
 
+#: View/Events/upload_analysis_file.ctp:6
+msgid "Import analysis file"
+msgstr ""
+
+#: View/Events/upload_analysis_file.ctp:61
+msgid "Create Objects"
+msgstr ""
+
 #: View/Events/upload_stix.ctp:6
 msgid "Import %s file"
 msgstr ""
@@ -6796,193 +7523,186 @@ msgstr ""
 msgid "%s file"
 msgstr ""
 
-#: View/Events/view.ctp:49
-msgid "Extended view"
+#: View/Events/upload_stix.ctp:24
+msgid "Include the original imported file as attachment"
 msgstr ""
 
-#: View/Events/view.ctp:51
+#: View/Events/view.ctp:53
 #: View/Servers/preview_event.ctp:12
 #: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Event ID"
 msgstr ""
 
-#: View/Events/view.ctp:63
+#: View/Events/view.ctp:57
 msgid "Source Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:68
+#: View/Events/view.ctp:66
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:83
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
 msgid "Owner org"
 msgstr ""
 
-#: View/Events/view.ctp:131
+#: View/Events/view.ctp:135
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
 #: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
 msgstr ""
 
-#: View/Events/view.ctp:139
+#: View/Events/view.ctp:140
 #: View/Feeds/preview_event.ctp:37
 #: View/Pages/doc/using_the_system.ctp:70;177;210
 #: View/Servers/preview_event.ctp:48
 msgid "Analysis"
 msgstr ""
 
-#: View/Events/view.ctp:159
+#: View/Events/view.ctp:161
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr ""
 
-#: View/Events/view.ctp:165;167
+#: View/Events/view.ctp:165
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:169
+#: View/Events/view.ctp:173
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:171
+#: View/Events/view.ctp:177
+msgid "First recorded change"
+msgstr ""
+
+#: View/Events/view.ctp:181
 msgid "Last change"
 msgstr ""
 
-#: View/Events/view.ctp:176
+#: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:210
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:194
-msgid "Currently in "
+#: View/Events/view.ctp:217
+msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:202
-msgid "- restricted to own organisation only."
+#: View/Events/view.ctp:217
+msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:203
-msgid "Advanced Sightings"
-msgstr ""
-
-#: View/Events/view.ctp:219
-msgid "you"
-msgstr ""
-
-#: View/Events/view.ctp:220
-msgid " has"
-msgstr ""
-
-#: View/Events/view.ctp:223
-msgid "You have"
-msgstr ""
-
-#: View/Events/view.ctp:226
+#: View/Events/view.ctp:265
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:227
-msgid "%s requested that %s take over this event."
-msgstr ""
-
-#: View/Events/view.ctp:227
+#: View/Events/view.ctp:277
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:232
-msgid "Correlation"
-msgstr ""
-
-#: View/Events/view.ctp:238;247
-#: View/Users/admin_view.ctp:125
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:238
-msgid "enable"
-msgstr ""
-
-#: View/Events/view.ctp:242;249
-#: View/ObjectTemplates/index.ctp:32
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
 #: View/Taxonomies/view.ctp:24
-#: View/Warninglists/view.ctp:38
 msgid "Enabled"
 msgstr ""
 
-#: View/Events/view.ctp:242
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr ""
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:277
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr ""
+
+#: View/Events/view.ctp:328
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:335
+#: View/Events/view.ctp:386;415
 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."
+#: View/Events/view.ctp:387;416
+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
+#: View/Events/view.ctp:424
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Discussion"
 msgstr ""
 
@@ -7018,16 +7738,24 @@ msgstr ""
 msgid " Event #"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:7
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:6
 msgid "Publish Event%s"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:8
+msgid "Unpublish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:20
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
-#: View/Feeds/index.ctp:54
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Feeds/index.ctp:104
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -7037,10 +7765,6 @@ msgstr ""
 msgid "Choose the format that you wish to download the event in"
 msgstr ""
 
-#: View/Events/ajax/exportChoice.ctp:17;18;27;28
-msgid "Export as %s"
-msgstr ""
-
 #: View/Events/ajax/importChoice.ctp:2
 msgid "Choose the format that you would like to use for the import"
 msgstr ""
@@ -7211,7 +7935,7 @@ msgstr ""
 
 #: View/Feeds/add.ctp:156
 #: View/Feeds/edit.ctp:153
-#: View/Feeds/index.ctp:55
+#: View/Feeds/index.ctp:105
 msgid "Delta Merge"
 msgstr ""
 
@@ -7252,16 +7976,16 @@ msgstr ""
 
 #: View/Feeds/add.ctp:196
 #: View/Feeds/edit.ctp:191
-#: View/Servers/add.ctp:113
-#: View/Servers/edit.ctp:152;158
+#: View/Servers/add.ctp:102
+#: View/Servers/edit.ctp:147;153
 msgid "Modify"
 msgstr ""
 
-#: View/Feeds/compare_feeds.ctp:58
+#: View/Feeds/compare_feeds.ctp:66
 msgid "None or less than 1% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
-#: View/Feeds/compare_feeds.ctp:59
+#: View/Feeds/compare_feeds.ctp:67
 msgid "%s\\% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
@@ -7282,53 +8006,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr ""
 
 #: View/Feeds/edit.ctp:207
-#: View/Servers/add.ctp:143
-#: View/Servers/edit.ctp:186
+#: View/Servers/add.ctp:132
+#: View/Servers/edit.ctp:181
 msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
 msgstr ""
 
 #: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:185
+#: View/Servers/add.ctp:133
+#: View/Servers/edit.ctp:180
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
 #: View/Feeds/edit.ctp:209
-#: View/Servers/add.ctp:145
-#: View/Servers/edit.ctp:187
+#: View/Servers/add.ctp:134
+#: View/Servers/edit.ctp:182
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:146
-#: View/Servers/edit.ctp:188
+#: View/Servers/add.ctp:135
+#: View/Servers/edit.ctp:183
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
 #: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:189
+#: View/Servers/add.ctp:136
+#: View/Servers/edit.ctp:184
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:212
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:185
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:191
+#: View/Servers/edit.ctp:186
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:192
+#: View/Servers/edit.ctp:187
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority."
 msgstr ""
 
 #: View/Feeds/edit.ctp:215
-#: View/Servers/add.ctp:151
-#: View/Servers/edit.ctp:194
+#: View/Servers/add.ctp:140
+#: View/Servers/edit.ctp:189
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -7380,130 +8104,104 @@ msgstr ""
 msgid "Fetch and store all feed data"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
+#: View/Feeds/index.ctp:33
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
-msgid "Enable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:28
+#: View/Feeds/index.ctp:39
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:28
-msgid "Disable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:29
+#: View/Feeds/index.ctp:45
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:29
-msgid "Enable Caching for Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:51
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:30
-msgid "Disable Caching for  Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
-msgid "Default feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:61
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:31
+#: View/Feeds/index.ctp:66
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:32
+#: View/Feeds/index.ctp:71
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:32
-msgid "All Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:33
+#: View/Feeds/index.ctp:76
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:33
-msgid "Enabled Feeds"
+#: View/Feeds/index.ctp:95
+msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:48
+#: View/Feeds/index.ctp:96
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:98
 msgid "Feed Format"
 msgstr ""
 
-#: View/Feeds/index.ctp:50
-#: View/Jobs/index.ctp:76
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr ""
 
-#: View/Feeds/index.ctp:56
+#: View/Feeds/index.ctp:106
 msgid "Override IDS"
 msgstr ""
 
-#: View/Feeds/index.ctp:60
+#: View/Feeds/index.ctp:110
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:108
-#: View/Servers/index.ctp:73;74
+#: View/Feeds/index.ctp:158
+#: View/Servers/index.ctp:74;75
 msgid "Rules"
 msgstr ""
 
-#: View/Feeds/index.ctp:135
+#: View/Feeds/index.ctp:185
 msgid "Error: Invalid event!"
 msgstr "오류: 올바르지 않은 이벤트!"
 
-#: View/Feeds/index.ctp:140
+#: View/Feeds/index.ctp:190
 msgid "Fixed event %s"
 msgstr ""
 
-#: View/Feeds/index.ctp:143
+#: View/Feeds/index.ctp:193
 msgid "New fixed event"
 msgstr ""
 
-#: View/Feeds/index.ctp:195
+#: View/Feeds/index.ctp:245
+#: View/Servers/index.ctp:94
 msgid "Age: "
 msgstr ""
 
-#: View/Feeds/index.ctp:197
+#: View/Feeds/index.ctp:247
+#: View/Servers/index.ctp:102
 msgid "Not cached"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:210
+#: View/Feeds/index.ctp:260
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 msgid "Are you sure you want to permanently remove the feed (%s)?"
 msgstr ""
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:267
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -7525,46 +8223,30 @@ msgid "Namespace"
 msgstr ""
 
 #: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:17
+#: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:19
+#: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:2
-msgid "Select Cluster"
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:11
-msgid "search clusters…"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "Galaxy Cluster Deletion"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:28
-msgid "Back to Galaxy Selection"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies."
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:2
-msgid "Select Cluster Source"
+#: View/GalaxyClusters/ajax/index.ctp:82
+msgid "Delete galaxy cluster"
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All clusters"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All Galaxies"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:2
-msgid "Select Galaxy Namespace Source"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All namespaces"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All Namespaces"
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
 msgstr ""
 
 #: View/Jobs/index.ctp:12
@@ -7579,37 +8261,37 @@ msgstr ""
 msgid "Completed."
 msgstr ""
 
-#: View/Jobs/index.ctp:63
+#: View/Jobs/index.ctp:68;98
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:74;99
 msgid "Show default queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:99
 #: View/Roles/admin_index.ctp:22
 #: View/Roles/index.ctp:22
 msgid "Default"
 msgstr ""
 
-#: View/Jobs/index.ctp:65
-msgid "Show email queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
-msgid "Show cache queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:101
 msgid "Cache"
 msgstr ""
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:127
 msgid "No worker active"
 msgstr ""
 
-#: View/Jobs/index.ctp:124
+#: View/Jobs/index.ctp:159
 msgid "View stacktrace"
 msgstr ""
 
@@ -7629,10 +8311,6 @@ msgstr ""
 msgid "No error data found. Generally job error data is purged from Redis after 24 hours, however, you can still view the errors in the log files in \"/app/tmp/logs\"."
 msgstr ""
 
-#: View/Jobs/ajax/error.ctp:34
-msgid "Close"
-msgstr ""
-
 #: View/Logs/admin_index.ctp:2
 #: View/Logs/event_index.ctp:6
 msgid "Logs"
@@ -7674,22 +8352,20 @@ msgstr ""
 msgid "from IP"
 msgstr ""
 
-#: View/Logs/admin_index.ctp:20;21
-msgid "Search"
-msgstr ""
-
-#: View/Logs/admin_index.ctp:59
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr ""
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:50
-#: View/ObjectTemplates/view.ctp:13
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/Templates/view.ctp:33
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
 msgstr ""
 
@@ -7775,12 +8451,12 @@ msgstr ""
 msgid "Target UUID"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:53
+#: View/ObjectReferences/ajax/add.ctp:54
 #: View/Objects/orphaned_object_diagnostics.ctp:38
 msgid "Object"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:68
+#: View/ObjectReferences/ajax/add.ctp:120
 msgid "Target Details"
 msgstr ""
 
@@ -7801,7 +8477,7 @@ msgid " The Attribute will be permanently deleted and unrecoverable. Also, this
 msgstr ""
 
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:24
-#: View/Pages/doc/categories_and_types.ctp:46
+#: View/Pages/doc/categories_and_types.ctp:40
 #: View/Pages/doc/md/categories_and_types.ctp:23
 msgid "Categories"
 msgstr ""
@@ -7822,43 +8498,35 @@ msgstr ""
 msgid "Object Template index"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:54
-#: View/ObjectTemplates/view.ctp:23
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:107
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:108
+#: View/ObjectTemplates/index.ctp:119
 msgid "Are you sure you want to delete template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:7
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/ObjectTemplates/view.ctp:33
 msgid " Object Template"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:9
-msgid "Object Template ID"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:2
-msgid "Select Object Category"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All meta-categories"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All Objects"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:50
-msgid "Back to categories"
-msgstr ""
-
 #: View/Objects/add.ctp:6
 msgid " Object"
 msgstr ""
@@ -7935,15 +8603,6 @@ msgstr ""
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:49
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/ajax/merge.ctp:65
-#: View/SharingGroups/add.ctp:32
-#: View/SharingGroups/edit.ctp:32
-msgid "UUID"
-msgstr ""
-
 #: View/Objects/ajax/delete.ctp:6
 msgid "Object Deletion"
 msgstr ""
@@ -7965,6 +8624,7 @@ msgid "Simply paste a list of all the organisation UUIDs that you wish to block
 msgstr ""
 
 #: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr ""
 
@@ -8089,9 +8749,9 @@ msgstr ""
 msgid "Click here"
 msgstr ""
 
-#: View/Organisations/index.ctp:5
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:51
+#: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr ""
@@ -8100,7 +8760,7 @@ msgstr ""
 msgid ", both local and remote"
 msgstr ""
 
-#: View/Organisations/index.ctp:9
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr ""
@@ -8109,7 +8769,7 @@ msgstr ""
 msgid " on other instances"
 msgstr ""
 
-#: View/Organisations/index.ctp:13
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr ""
@@ -8126,55 +8786,52 @@ msgstr ""
 msgid "View all"
 msgstr ""
 
-#: View/Organisations/index.ctp:65
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:30
 msgid "Logo"
 msgstr ""
 
-#: View/Organisations/index.ctp:76
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr ""
 
-#: View/Organisations/index.ctp:117
+#: View/Organisations/index.ctp:138
 #: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 ""
 
-#: View/Organisations/view.ctp:3
-msgid "Organisation "
-msgstr ""
-
-#: View/Organisations/view.ctp:7
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:4
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/Users/admin_view.ctp:9
-#: View/Users/view.ctp:4
-#: View/Warninglists/view.ctp:4
-msgid "Id"
-msgstr ""
-
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:12
 #: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr ""
 
-#: View/Organisations/view.ctp:26
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:40
-msgid "E-mail domain restrictions"
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
 msgstr ""
 
-#: View/Organisations/view.ctp:93;94
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr ""
+
+#: View/Organisations/view.ctp:62;63
 msgid "Members"
 msgstr ""
 
@@ -8187,7 +8844,6 @@ msgid "Available Organisations"
 msgstr ""
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
 msgid "Added Organisations"
 msgstr ""
 
@@ -8252,6 +8908,14 @@ msgstr ""
 msgid "Events need to have no validation issues"
 msgstr ""
 
+#: View/Pages/administration.ctp:15
+msgid "Recorrelate attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:16
+msgid "Recorrelate proposals"
+msgstr ""
+
 #: View/Pages/administration.ctp:18
 msgid "Verify Certificates"
 msgstr ""
@@ -8268,6 +8932,10 @@ msgstr ""
 msgid "Hotfix 2.3.57: Increase the max length of the organization field when adding a new server connection."
 msgstr ""
 
+#: View/Pages/administration.ctp:20
+msgid "Convert log fields to text"
+msgstr ""
+
 #: View/Pages/administration.ctp:20
 msgid "Hotfix 2.3.78: Some of the log fields that were varchar(255) ended up truncating the data. This function will change them to \"text\""
 msgstr ""
@@ -8280,18 +8948,34 @@ msgstr ""
 msgid "Hotfix 2.3.107: it was previously possible to get duplicate attribute UUIDs in the database, this script will remove all duplicates and ensure that duplicates will not be entered into the database in the future."
 msgstr ""
 
+#: View/Pages/administration.ctp:22
+msgid "Remove duplicate events (with the same UUID)"
+msgstr ""
+
 #: View/Pages/administration.ctp:22
 msgid "Hotfix 2.3.115: In some rare situations it could occur that a duplicate of an event was created on an instance, with the exact same uuid. This action will remove any such duplicates and make sure that this cannot happen again."
 msgstr ""
 
+#: View/Pages/administration.ctp:23
+msgid "Prune orphaned attributes"
+msgstr ""
+
 #: View/Pages/administration.ctp:23
 msgid "In some rare occasions it can happen that you end up with some attributes in your database that do not belong to an event - for example during a race condition between an event insert and a delete. This tool will collect and delete any such orphaned attributes. If you ever run into an issue where you cannot add an attribute with a specific valid value, this is probably the reason."
 msgstr ""
 
+#: View/Pages/administration.ctp:24
+msgid "Clean regex table of potentially malicious entries"
+msgstr ""
+
 #: View/Pages/administration.ctp:24
 msgid "Hotfix 2.3.160: Prior to this version it was possible for a user/admin with Regex permission to create a malicious regular expression that could be used to execute arbitrary code. Since this version it is no longer possible to input such expressions, but already existing malicious entries still have to be cleaned using this tool."
 msgstr ""
 
+#: View/Pages/administration.ctp:25
+msgid "Remove URL type attribute sanitisation"
+msgstr ""
+
 #: View/Pages/administration.ctp:25
 msgid "Hotfix 2.3.173: Sanitised URLs can cause issues with the NIDS exports and as of this version attributes will be modified on entry to correct this. To correct existing entries, run this script."
 msgstr ""
@@ -8345,7 +9029,6 @@ msgid "If the migration of your data from 2.4 is not complete this will lead to
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:3
-#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:3
 #: View/Pages/doc/general.ctp:3
 #: View/Pages/doc/quickstart.ctp:3;14
@@ -8355,7 +9038,6 @@ msgid "Quick Start"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:4
-#: View/Pages/doc/categories_and_types.ctp:4
 #: View/Pages/doc/concepts.ctp:4
 #: View/Pages/doc/general.ctp:4;14
 #: View/Pages/doc/quickstart.ctp:4
@@ -8365,7 +9047,6 @@ msgid "General Layout"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:5
-#: View/Pages/doc/categories_and_types.ctp:5
 #: View/Pages/doc/concepts.ctp:5;14
 #: View/Pages/doc/general.ctp:5
 #: View/Pages/doc/quickstart.ctp:5
@@ -8375,7 +9056,6 @@ msgid "General Concepts"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:6
-#: View/Pages/doc/categories_and_types.ctp:6
 #: View/Pages/doc/concepts.ctp:6
 #: View/Pages/doc/general.ctp:6
 #: View/Pages/doc/quickstart.ctp:6
@@ -8385,7 +9065,6 @@ msgid "User Management and Global actions"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:7
-#: View/Pages/doc/categories_and_types.ctp:7
 #: View/Pages/doc/concepts.ctp:7
 #: View/Pages/doc/general.ctp:7
 #: View/Pages/doc/quickstart.ctp:7
@@ -8428,7 +9107,7 @@ msgid "FAQ"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:22
-#: View/Pages/doc/categories_and_types.ctp:9
+#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:9
 #: View/Pages/doc/general.ctp:9
 #: View/Pages/doc/quickstart.ctp:9
@@ -8486,6 +9165,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
+#: View/Servers/edit.ctp:82
 msgid "Misc settings"
 msgstr ""
 
@@ -8704,8 +9384,8 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_view.ctp:40
-#: View/Users/view.ctp:34
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
 msgid "Authkey"
 msgstr ""
 
@@ -8758,8 +9438,8 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_view.ctp:29
-#: View/Users/view.ctp:24
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr ""
 
@@ -8780,8 +9460,6 @@ msgid "Shows the currently assigned NIDS ID."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:109;125
-#: View/Users/admin_view.ctp:100
-#: View/Users/view.ctp:55
 msgid "Termsaccepted"
 msgstr ""
 
@@ -8790,7 +9468,7 @@ msgid "This flag indicates whether the user has accepted the terms of use or not
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:110
-#: View/Users/admin_view.ctp:120
+#: View/Users/admin_view.ctp:84
 msgid "Newsread"
 msgstr ""
 
@@ -8852,7 +9530,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:133;184;197
 #: View/Pages/doc/using_the_system.ctp:269
-#: View/Taxonomies/view.ctp:78
+#: View/Taxonomies/view.ctp:89
 msgid "Action"
 msgstr ""
 
@@ -9329,16 +10007,16 @@ msgstr ""
 msgid "This will create a new password hash using the currently set salt."
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:13
+#: View/Pages/doc/categories_and_types.ctp:7
 msgid "Attribute Categories and Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:14
+#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/md/categories_and_types.ctp:1
 msgid "Attribute Categories vs. Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:80
+#: View/Pages/doc/categories_and_types.ctp:74
 msgid "Click here to get the .md version for gitbook generation."
 msgstr ""
 
@@ -9347,7 +10025,7 @@ msgid "Admins and Site Admins"
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:16
-msgid "There are two types of admins in MISP: Admins (also refered to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
+msgid "There are two types of admins in MISP: Admins (also referred to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:17
@@ -9478,10 +10156,6 @@ msgstr ""
 msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:20
-msgid "Event Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:20
 msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
 msgstr ""
@@ -9490,18 +10164,10 @@ msgstr ""
 msgid "Input filters alter what and how data can be entered into this instance. Apart from the basic validation of attribute entry by type, it is possible for the site administrators to define regular expression replacements and blacklists for certain values in addition to blocking certain values from being exportable. Users can view these replacement and blacklist rules here whilst administrator can alter them."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:22;54
-msgid "Global Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:22
 msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:23;66
-msgid "Sync Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:23
 msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
 msgstr ""
@@ -9627,6 +10293,11 @@ msgstr ""
 msgid "A link to this user guide."
 msgstr ""
 
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr ""
+
 #: View/Pages/doc/general.ctp:61
 msgid "View the terms &amp; conditions again."
 msgstr ""
@@ -9892,7 +10563,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:47
+#: View/Users/statistics_data.ctp:53
 msgid "Activity Heatmap"
 msgstr ""
 
@@ -10814,12 +11485,6 @@ msgstr ""
 msgid "As described earlier, users with tagging rights can arbitrarily tag events using tags chosen from a pool of available options. If you have tagging privileges and would like to create a new tag, navigate to Event Actions - Add Tag. You'll be presented with the following form"
 msgstr ""
 
-#: View/Pages/doc/using_the_system.ctp:303
-#: View/Templates/add.ctp:17
-#: View/Templates/edit.ctp:17
-msgid "Add tag"
-msgstr ""
-
 #: View/Pages/doc/using_the_system.ctp:303
 msgid "Enter a name for the tag and click on the color field to be able to pick a colour for it."
 msgstr ""
@@ -11149,8 +11814,8 @@ msgid "Make sure that you enter the authentication key that you have been given
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:397
-#: View/Servers/add.ctp:7
-#: View/Servers/edit.ctp:7
+#: View/Servers/add.ctp:8
+#: View/Servers/edit.ctp:8
 msgid "Base URL"
 msgstr ""
 
@@ -11251,7 +11916,7 @@ msgid "Clicking the delete button will delete the link to the instance."
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:418
-#: View/Servers/index.ctp:92
+#: View/Servers/index.ctp:128
 msgid "Push all"
 msgstr ""
 
@@ -11260,7 +11925,7 @@ msgid " By clicking this button, all events that are eligible to be pushed on th
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:419
-#: View/Servers/index.ctp:89
+#: View/Servers/index.ctp:125
 msgid "Pull all"
 msgstr ""
 
@@ -11414,7 +12079,7 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
-#: View/Roles/view.ctp:14
+#: View/Roles/view.ctp:5
 msgid "Permission level"
 msgstr ""
 
@@ -11422,136 +12087,155 @@ msgstr ""
 msgid "Add Server"
 msgstr ""
 
-#: View/Servers/add.ctp:10
-#: View/Servers/edit.ctp:10
+#: View/Servers/add.ctp:6
+#: View/Servers/edit.ctp:6
+msgid "Instance identification"
+msgstr ""
+
+#: View/Servers/add.ctp:11
+#: View/Servers/edit.ctp:11
 msgid "Instance name"
 msgstr ""
 
-#: View/Servers/add.ctp:16
+#: View/Servers/add.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change."
 msgstr ""
 
-#: View/Servers/add.ctp:19
-#: View/Servers/edit.ctp:19
+#: View/Servers/add.ctp:20
+#: View/Servers/edit.ctp:20
 msgid "Internal instance"
 msgstr ""
 
-#: View/Servers/add.ctp:29
+#: View/Servers/add.ctp:30
+#: View/Servers/edit.ctp:31
+msgid "Instance ownership and credentials"
+msgstr ""
+
+#: View/Servers/add.ctp:31
+#: View/Servers/edit.ctp:32
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr ""
 
-#: View/Servers/add.ctp:35
+#: View/Servers/add.ctp:37
 msgid "Remote Sync Organisation Type"
 msgstr ""
 
-#: View/Servers/add.ctp:40
-#: View/Servers/edit.ctp:37
+#: View/Servers/add.ctp:42
+#: View/Servers/edit.ctp:43
 msgid "External Organisation"
 msgstr ""
 
-#: View/Servers/add.ctp:46
-#: View/Servers/edit.ctp:48
-msgid "Local Organisation"
+#: View/Servers/add.ctp:48
+msgid "Owner of remote instance"
 msgstr ""
 
-#: View/Servers/add.ctp:52
-#: View/Servers/edit.ctp:59
+#: View/Servers/add.ctp:54
+#: View/Servers/edit.ctp:65
 msgid "Remote Organisation's Name"
 msgstr ""
 
-#: View/Servers/add.ctp:56
-#: View/Servers/edit.ctp:63
+#: View/Servers/add.ctp:58
+#: View/Servers/edit.ctp:69
 msgid "Remote Organisation's Uuid"
 msgstr ""
 
-#: View/Servers/add.ctp:97
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:78
+msgid "Enabled synchronisation methods"
+msgstr ""
+
+#: View/Servers/add.ctp:86
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:103
+#: View/Servers/add.ctp:92
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:108
-#: View/Servers/edit.ctp:147
+#: View/Servers/add.ctp:97
+#: View/Servers/edit.ctp:142
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:109;115
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:98;104
+#: View/Servers/edit.ctp:143;149
 msgid "Events with the following tags allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:110;116
-#: View/Servers/edit.ctp:149;155
+#: View/Servers/add.ctp:99;105
+#: View/Servers/edit.ctp:144;150
 msgid "Events with the following tags blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:111;117
-#: View/Servers/edit.ctp:150;156
+#: View/Servers/add.ctp:100;106
+#: View/Servers/edit.ctp:145;151
 msgid "Events with the following organisations allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:112;118
-#: View/Servers/edit.ctp:151;157
+#: View/Servers/add.ctp:101;107
+#: View/Servers/edit.ctp:146;152
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:114
-#: View/Servers/edit.ctp:153
+#: View/Servers/add.ctp:103
+#: View/Servers/edit.ctp:148
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:142
-#: View/Servers/edit.ctp:184
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:179
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:148
+#: View/Servers/add.ctp:137
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:149
+#: View/Servers/add.ctp:138
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:150
+#: View/Servers/add.ctp:139
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr ""
 
-#: View/Servers/edit.ctp:16
+#: View/Servers/edit.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change. This also requires that the current instance's host organisation and the remote sync organisation are the same."
 msgstr ""
 
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:37
 msgid "Organisation Type"
 msgstr ""
 
-#: View/Servers/edit.ctp:69
+#: View/Servers/edit.ctp:54
+msgid "Local Organisation"
+msgstr ""
+
+#: View/Servers/edit.ctp:75
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:104
+#: View/Servers/edit.ctp:99
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:112;134
+#: View/Servers/edit.ctp:107;129
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:113;135
+#: View/Servers/edit.ctp:108;130
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:126
+#: View/Servers/edit.ctp:121
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:193
+#: View/Servers/edit.ctp:188
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:250;254
+#: View/Servers/edit.ctp:245;249
 msgid "Not set."
 msgstr ""
 
@@ -11564,7 +12248,7 @@ msgid "Example:"
 msgstr ""
 
 #: View/Servers/filter_event_index.ctp:21
-msgid "Apply filters to the remote instance"
+msgid "Apply filters to the remote instance's index"
 msgstr ""
 
 #: View/Servers/index.ctp:2
@@ -11575,34 +12259,38 @@ msgstr ""
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:30
+#: View/Servers/index.ctp:31
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Internal instance that ignores distribution level degradation *WARNING: Only use this setting if you have several internal instances and the sync link is to an internal extension of the current MISP community*"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:86
+#: View/Servers/index.ctp:122
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:88
+#: View/Servers/index.ctp:124
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
+#: View/Servers/index.ctp:131
+msgid "Cache instance"
+msgstr ""
+
 #: View/Servers/preview_event.ctp:7
 msgid "You are currently viewing an event on the remote instance %s "
 msgstr ""
@@ -11619,15 +12307,15 @@ msgstr ""
 msgid "You are currently viewing the event index of the remote instance %s"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "published"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:147
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr ""
 
@@ -11671,19 +12359,23 @@ msgstr ""
 msgid "No succeeded pushes"
 msgstr ""
 
-#: View/Servers/rest.ctp:7;17
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:54
+#: View/Servers/rest.ctp:116
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:55
+#: View/Servers/rest.ctp:117
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:56
+#: View/Servers/rest.ctp:118
 msgid "Headers"
 msgstr ""
 
@@ -11703,6 +12395,10 @@ msgstr ""
 msgid "Available Instances"
 msgstr ""
 
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
+msgid "Added Instances"
+msgstr ""
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 msgid "Add servers to sharing group"
 msgstr ""
@@ -11750,39 +12446,31 @@ msgstr ""
 msgid "IDS Signature?"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:21
-msgid "Only list proposals of my organisation"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:21
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:26
-msgid "List all proposals"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:26
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:33
+#: View/ShadowAttributes/index.ctp:43
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:39
+#: View/ShadowAttributes/index.ctp:49
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:45
+#: View/ShadowAttributes/index.ctp:55
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:71
+#: View/ShadowAttributes/index.ctp:81
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:73
+#: View/ShadowAttributes/index.ctp:83
 msgid "New Attribute"
 msgstr ""
 
@@ -11810,166 +12498,166 @@ msgstr ""
 msgid "New Sharing Group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
-msgid "General tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
 msgid "General"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
 msgid "Organisations tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
-msgid "MISP instances tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
 msgid "MISP Instances"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
-msgid "Sharing group summary"
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:12
-#: View/SharingGroups/edit.ctp:12
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
 msgid "Example: Multinational sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:13
-#: View/SharingGroups/edit.ctp:13
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
 msgid "Releasable to"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:14
-#: View/SharingGroups/edit.ctp:14
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
 msgid "Example: Community1, Organisation1, Organisation2"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:16
-#: View/SharingGroups/edit.ctp:16
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
 msgid "A description of the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:18
-#: View/SharingGroups/edit.ctp:18
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
 msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:19
-#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
 msgid "Make the sharing group selectable (active)"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:21;38;59
-#: View/SharingGroups/edit.ctp:21;38;67
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
 msgid "Next page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation(s) to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisations to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:33
-#: View/SharingGroups/edit.ctp:33
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
 #: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:37;58;74
-#: View/SharingGroups/edit.ctp:37;66;82
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
 msgid "Previous page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:42
-#: View/SharingGroups/edit.ctp:50
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
 msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:43
-#: View/SharingGroups/edit.ctp:51
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
 msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:47
-#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:53
-#: View/SharingGroups/edit.ctp:61
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
 #: View/SharingGroups/view.ctp:69
 msgid "All orgs"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:63
+#: View/SharingGroups/add.ctp:103
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:64
+#: View/SharingGroups/add.ctp:104
 msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/add.ctp:105
 msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/add.ctp:106
 msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:67
-#: View/SharingGroups/edit.ctp:75
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
 msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:75
-#: View/SharingGroups/edit.ctp:83
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
 msgid "Submit and create sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:95
+#: View/SharingGroups/add.ctp:135
 msgid "Local instance"
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:71
+#: View/SharingGroups/edit.ctp:111
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
 "                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
 "                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:74
+#: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
@@ -11977,23 +12665,15 @@ msgstr ""
 msgid "Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:20
-msgid "View only active sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:20
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:21
-msgid "View only passive sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:21
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:61
+#: View/SharingGroups/index.ctp:80
 msgid "Distribution List"
 msgstr ""
 
@@ -12037,6 +12717,18 @@ msgstr ""
 msgid "Delete sighting"
 msgstr ""
 
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
+msgid "Add Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
+msgstr ""
+
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
 msgid "Remove Sighting"
 msgstr ""
@@ -12049,6 +12741,26 @@ msgstr ""
 msgid "Remove sighting"
 msgstr ""
 
+#: View/TagCollections/add.ctp:8
+msgid "Edit Tag Collection"
+msgstr ""
+
+#: View/TagCollections/add.ctp:16
+msgid "Visible to all orgs"
+msgstr ""
+
+#: View/TagCollections/import.ctp:4
+msgid "Paste tag collection data"
+msgstr ""
+
+#: View/TagCollections/import.ctp:5
+msgid "Paste a MISP tag collection JSON below to add tag collections."
+msgstr ""
+
+#: View/TagCollections/import.ctp:10
+msgid "Tag collection JSON"
+msgstr ""
+
 #: View/Tags/add.ctp:12
 #: View/Tags/edit.ctp:12
 msgid "Restrict tagging to org"
@@ -12059,6 +12771,10 @@ msgstr ""
 msgid "Restrict tagging to user"
 msgstr ""
 
+#: View/Tags/edit.ctp:31
+msgid "Unselectable Tag"
+msgstr ""
+
 #: View/Tags/index.ctp:10
 msgid "Your Favourite Tags"
 msgstr ""
@@ -12091,57 +12807,6 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:2
-msgid "Select Tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:16
-#: View/Tags/ajax/taxonomy_choice.ctp:4
-msgid "search tags…"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:25
-msgid "Attach tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Return to taxonomy selection"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Select Taxonomy"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Back to Taxonomy Selection"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:2
-msgid "Select Tag Source"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:10
-msgid "Favourite Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:14
-msgid "Custom Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:17
-msgid "All Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:21
-#: View/Taxonomies/view.ctp:2
-msgid "Taxonomy Library"
-msgstr ""
-
 #: View/Tasks/index.ctp:4
 msgid "Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks."
 msgstr ""
@@ -12179,7 +12844,8 @@ msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:41
-#: View/Taxonomies/view.ctp:29;143
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr ""
 
@@ -12189,7 +12855,8 @@ msgid "Are you sure you want to disable this taxonomy library?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:31;147
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr ""
 
@@ -12206,19 +12873,27 @@ msgstr ""
 msgid "Create and/or update selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:116
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
 msgid "Hidden"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:125
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:142
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:147
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr ""
 
@@ -12246,6 +12921,30 @@ msgstr ""
 msgid "Create / update all taxonomy entries as tags"
 msgstr ""
 
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
 #: View/TemplateElements/ajax/ajaxIndex.ctp:2
 msgid "Template Elements"
 msgstr ""
@@ -12498,6 +13197,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
 msgid "Terms accepted"
 msgstr ""
 
@@ -12564,15 +13265,19 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: View/Users/admin_email.ctp:36
+#: View/Users/admin_email.ctp:19
+msgid "All users of the same organisation"
+msgstr ""
+
+#: View/Users/admin_email.ctp:39
 msgid "Enter a custom message"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "New user registration"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "Password reset"
 msgstr ""
 
@@ -12596,10 +13301,6 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: View/Users/admin_index.ctp:40
-msgid "Filter user index"
-msgstr ""
-
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr ""
@@ -12612,42 +13313,48 @@ msgstr ""
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr ""
 
-#: View/Users/admin_view.ctp:35
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
 msgid "Contactalert"
 msgstr ""
 
-#: View/Users/admin_view.ctp:46
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/admin_view.ctp:44
 msgid "Invited By"
 msgstr ""
 
-#: View/Users/admin_view.ctp:51
-msgid "Org admin"
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:74
-#: View/Users/view.ctp:67
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr ""
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:80
-#: View/Users/view.ctp:73
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
 msgid "GnuPG status"
 msgstr ""
 
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:83
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
 msgid "SMIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:95
-msgid "Nids Sid"
-msgstr ""
-
-#: View/Users/admin_view.ctp:110
-msgid "Password change"
-msgstr ""
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr ""
@@ -12680,37 +13387,37 @@ msgid "Proposals active"
 msgstr ""
 
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:34
+#: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
 msgstr ""
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:39
+#: View/Users/statistics_data.ctp:45
 msgid "Discussion posts"
 msgstr ""
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:48
+#: View/Users/statistics_data.ctp:54
 msgid "A heatmap showing user activity for each day during this month and the 4 months that preceded it. Use the buttons below to only show the heatmap of a specific organisation."
 msgstr ""
 
 #: View/Users/statistics.ctp:60
-#: View/Users/statistics_data.ctp:65
+#: View/Users/statistics_data.ctp:71
 msgid "Go left"
 msgstr ""
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:71
+#: View/Users/statistics_data.ctp:77
 msgid "Go right"
 msgstr ""
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:118
+#: View/Users/statistics_data.ctp:124
 msgid "The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings."
 msgstr ""
 
 #: View/Users/statistics.ctp:117
-#: View/Users/statistics_data.ctp:122
+#: View/Users/statistics_data.ctp:128
 msgid "The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer."
 msgstr ""
 
@@ -12718,6 +13425,18 @@ msgstr ""
 msgid "A heatmap showing the usage of ATT&CK Tactic."
 msgstr ""
 
+#: View/Users/statistics_data.ctp:32
+msgid "Users with PGP keys"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:36
+msgid "Local Organisations"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:38
+msgid "Average Users / Org"
+msgstr ""
+
 #: View/Users/statistics_orgs.ctp:17
 msgid "Organisation list"
 msgstr ""
@@ -12786,12 +13505,12 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
-#: View/Users/view.ctp:45
-msgid "Request API access"
+#: View/Users/ajax/emailConfirmTemplate.ctp:2
+msgid "Confirm sending"
 msgstr ""
 
-#: View/Users/view.ctp:50
-msgid "NIDS Start SID"
+#: View/Users/ajax/emailConfirmTemplate.ctp:4
+msgid "You are about to send a mail to %s recipient(s)?"
 msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:2
@@ -12854,7 +13573,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:29
+#: View/Warninglists/view.ctp:14;16
 msgid "Accepted attribute types"
 msgstr ""
 
@@ -12930,6 +13649,7 @@ msgstr ""
 #: Model/Attribute.php:validation for field uuid
 #: Model/Event.php:validation for field uuid;validation for field extends_uuid
 #: Model/EventBlacklist.php:validation for field event_uuid
+#: Model/MispObject.php:validation for field uuid
 #: Model/OrgBlacklist.php:validation for field org_uuid
 #: Model/Organisation.php:validation for field uuid
 #: Model/ShadowAttribute.php:validation for field uuid
@@ -12938,6 +13658,7 @@ msgid "Please provide a valid UUID"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/MispObject.php:validation for field uuid
 msgid "The UUID provided is not unique"
 msgstr ""
 
@@ -12957,6 +13678,7 @@ msgstr ""
 #: Model/ServerTag.php:validation for field server_id;validation for field tag_id
 #: Model/SharingGroup.php:validation for field name
 #: Model/Tag.php:validation for field name;validation for field colour
+#: Model/TagCollection.php:validation for field name
 #: Model/TemplateElementAttribute.php:validation for field name;validation for field description
 #: Model/ThreatLevel.php:validation for field name;validation for field description;validation for field form_description
 #: Model/User.php:validation for field org_id;validation for field authkey
@@ -13056,6 +13778,7 @@ msgid "This field is required."
 msgstr ""
 
 #: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
 #: Model/Whitelist.php:validation for field name
 msgid "A similar name already exists."
 msgstr ""
diff --git a/app/Locale/pol/LC_MESSAGES/default-pl.po b/app/Locale/pol/LC_MESSAGES/default-pl.po
new file mode 100644
index 000000000..34139e42c
--- /dev/null
+++ b/app/Locale/pol/LC_MESSAGES/default-pl.po
@@ -0,0 +1,13855 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: misp\n"
+"PO-Revision-Date: 2019-03-06 02:11\n"
+"Last-Translator: SteveClement <steve@localhost.lu>\n"
+"Language-Team: Polish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+"X-Generator: crowdin.com\n"
+"X-Crowdin-Project: misp\n"
+"X-Crowdin-Language: pl\n"
+"X-Crowdin-File: default.pot\n"
+"Language: pl_PL\n"
+
+#: Console/Command/EventShell.php:13
+#: Controller/AttributesController.php:125;129;133
+#: Controller/EventGraphController.php:34;69
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
+#: Controller/PostsController.php:56
+#: Model/Galaxy.php:292
+msgid "Invalid event"
+msgstr "Nieprawidłowe zdarzenie"
+
+#: Console/Command/ServerShell.php:49
+#: Controller/ServersController.php:632
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+msgstr "Pobieranie zakończone. Zdarzenia pobrane: %s, zdarzenia niepobrane: %s, propozycje pobrane: %s."
+
+#: Console/Command/ServerShell.php:51
+msgid "ERROR: %s"
+msgstr "BŁĄD: %s"
+
+#: Controller/AppController.php:383
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr "Coś poszło nie tak. Konto, na które się zalogowałeś, już nie istnieje."
+
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
+msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+msgstr "Ten klucz uwierzytelniający nie może być wykorzystany do eksportu. Skontaktuj się z administratorem."
+
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
+msgid "You have to be logged in to do that."
+msgstr "Musisz być zalogowany, aby to zrobić."
+
+#: Controller/AppController.php:627
+msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
+msgstr "Proszę podać kryteria wyszukiwania w url albo przesłać metodą POST zapytanie json z parametrami filtrowania."
+
+#: Controller/AppController.php:752
+msgid "All done. attribute_count generated from scratch for "
+msgstr ""
+
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
+#: Controller/ShadowAttributesController.php:1276
+msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
+msgstr "Zadanie zostało zaplanowane. Możesz śledzić jego postęp w widoku aktywnych zadań (Administracja->Zadania)."
+
+#: Controller/AttributesController.php:116;1403
+#: Controller/EventGraphController.php:19;77
+msgid "No event ID set."
+msgstr "Nie ustawiono ID zdarzenia."
+
+#: Controller/AttributesController.php:119
+msgid "You don't have permissions to create attributes"
+msgstr "Nie masz wystarczających uprawnień aby tworzyć atrybuty"
+
+#: Controller/AttributesController.php:139;488;668
+#: Controller/EventGraphController.php:88
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
+msgid "You do not have permission to do that."
+msgstr "Nie masz do tego uprawnień."
+
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
+#: Controller/TagsController.php:491
+msgid "Invalid attribute"
+msgstr ""
+
+#: Controller/AttributesController.php:421
+#: Controller/ShadowAttributesController.php:499
+msgid "You do not have the permission to view this event."
+msgstr ""
+
+#: Controller/AttributesController.php:468
+msgid "Attribute not an attachment or malware-sample"
+msgstr ""
+
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
+msgid "Invalid Event."
+msgstr ""
+
+#: Controller/AttributesController.php:503;679
+#: Controller/ShadowAttributesController.php:546
+msgid "PHP says file was not uploaded. Are you attacking me?"
+msgstr ""
+
+#: Controller/AttributesController.php:682
+#: Controller/ShadowAttributesController.php:549;559
+msgid "There was a problem to upload the file."
+msgstr ""
+
+#: Controller/AttributesController.php:826
+msgid "The ThreatConnect data has been imported."
+msgstr ""
+
+#: Controller/AttributesController.php:829
+msgid "%s entries imported."
+msgstr ""
+
+#: Controller/AttributesController.php:833
+msgid "%s entries could not be imported."
+msgstr ""
+
+#: Controller/AttributesController.php:883;931;933
+#: Controller/ShadowAttributesController.php:829
+msgid "Invalid attribute."
+msgstr ""
+
+#: Controller/AttributesController.php:927
+msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
+msgstr ""
+
+#: Controller/AttributesController.php:960
+msgid "The attribute has been saved"
+msgstr ""
+
+#: Controller/AttributesController.php:995
+msgid "The attribute could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/AttributesController.php:1087
+msgid "Invalid event id."
+msgstr ""
+
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
+#: Controller/ShadowAttributesController.php:729
+msgid "Invalid input."
+msgstr ""
+
+#: Controller/AttributesController.php:1122
+msgid "Invalid field."
+msgstr ""
+
+#: Controller/AttributesController.php:1167
+msgid "Invalid attribute id."
+msgstr ""
+
+#: Controller/AttributesController.php:1242;1252
+msgid "Attribute deleted"
+msgstr ""
+
+#: Controller/AttributesController.php:1247;1249
+msgid "Attribute was not deleted"
+msgstr ""
+
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
+msgid "Invalid Attribute"
+msgstr ""
+
+#: Controller/AttributesController.php:1301
+msgid "Could not restore the attribute"
+msgstr ""
+
+#: Controller/AttributesController.php:1322;1329;1333
+msgid "Attribute not found or not authorised."
+msgstr ""
+
+#: Controller/AttributesController.php:1383
+msgid "This function is only accessible via POST requests."
+msgstr ""
+
+#: Controller/AttributesController.php:1438
+msgid "No matching attributes found."
+msgstr ""
+
+#: Controller/AttributesController.php:1472
+msgid "This method can only be accessed via AJAX."
+msgstr ""
+
+#: Controller/AttributesController.php:1482
+msgid "You are not authorized to edit this event."
+msgstr ""
+
+#: Controller/AttributesController.php:1580
+msgid "No event ID provided."
+msgstr ""
+
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
+msgid "Synonyms: "
+msgstr ""
+
+#: Controller/AttributesController.php:1997;2104
+msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
+msgstr ""
+
+#: Controller/AttributesController.php:2010
+msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
+msgstr ""
+
+#: Controller/AttributesController.php:2030
+msgid "You don't have access to that event."
+msgstr ""
+
+#: Controller/AttributesController.php:2093
+msgid "No matches."
+msgstr ""
+
+#: Controller/AttributesController.php:2115;2124
+msgid "Invalid attribute or no authorisation to view it."
+msgstr ""
+
+#: Controller/AttributesController.php:2192
+msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
+msgstr ""
+
+#: Controller/AttributesController.php:2256
+msgid "Invalid event ID format."
+msgstr ""
+
+#: Controller/AttributesController.php:2365
+#: Controller/ShadowAttributesController.php:1254
+msgid "All done. "
+msgstr ""
+
+#: Controller/AttributesController.php:2397;2444
+#: Controller/ShadowAttributesController.php:1062
+msgid "Invalid field requested."
+msgstr ""
+
+#: Controller/AttributesController.php:2400;2447
+msgid "This function can only be accessed via AJAX."
+msgstr ""
+
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
+msgid "Event not found or you don't have permissions to create attributes"
+msgstr ""
+
+#: Controller/AttributesController.php:2541
+msgid "This action can only be accessed via AJAX."
+msgstr ""
+
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
+msgid "You are not authorised to do that."
+msgstr ""
+
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
+msgid "This functionality requires API key access."
+msgstr ""
+
+#: Controller/AttributesController.php:2663
+msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
+msgstr ""
+
+#: Controller/AttributesController.php:2675
+msgid "No hash or event ID received. You need to set at least one of the two."
+msgstr ""
+
+#: Controller/AttributesController.php:2836
+msgid "Invalid script."
+msgstr ""
+
+#: Controller/AttributesController.php:2901
+msgid "No valid enrichment options found for this attribute."
+msgstr ""
+
+#: Controller/AttributesController.php:2964
+msgid "Invalid type requested."
+msgstr ""
+
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
+msgid "Disabling the correlation is not permitted on this instance."
+msgstr ""
+
+#: Controller/AttributesController.php:3243;3258
+#: Controller/ShadowAttributesController.php:677
+msgid "Invalid Attribute."
+msgstr ""
+
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
+msgid "You don't have permission to do that."
+msgstr ""
+
+#: Controller/EventBlacklistsController.php:15
+msgid "Event Blacklisting is not currently enabled on this instance."
+msgstr ""
+
+#: Controller/EventsController.php:848
+msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
+msgstr ""
+
+#: Controller/EventsController.php:850
+msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
+msgstr ""
+
+#: Controller/EventsController.php:856
+msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
+msgstr ""
+
+#: Controller/EventsController.php:858
+msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
+msgstr ""
+
+#: Controller/EventsController.php:1559
+msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
+msgstr ""
+
+#: Controller/EventsController.php:1769
+msgid "You don't have permissions to create events"
+msgstr ""
+
+#: Controller/EventsController.php:1775
+msgid "No valid event data received."
+msgstr ""
+
+#: Controller/EventsController.php:1811
+msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
+msgstr ""
+
+#: Controller/EventsController.php:1815;1819
+msgid "Invalid Sharing Group or not authorised."
+msgstr ""
+
+#: Controller/EventsController.php:1843
+msgid "Event blocked by local blacklist."
+msgstr ""
+
+#: Controller/EventsController.php:1856;1933;2197
+msgid "The event has been saved"
+msgstr ""
+
+#: Controller/EventsController.php:1864
+msgid "Event already exists, if you would like to edit it, use the url in the location header."
+msgstr ""
+
+#: Controller/EventsController.php:1870
+msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
+msgstr ""
+
+#: Controller/EventsController.php:1872;2200
+msgid "The event could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/EventsController.php:1912
+msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
+msgstr ""
+
+#: Controller/EventsController.php:1959
+msgid "You may only upload MISP XML or MISP JSON files."
+msgstr ""
+
+#: Controller/EventsController.php:1960
+msgid "File upload failed or file does not have the expected extension (.xml / .json)."
+msgstr ""
+
+#: Controller/EventsController.php:2009
+msgid "STIX document imported, event's created: "
+msgstr ""
+
+#: Controller/EventsController.php:2012
+msgid "STIX document imported."
+msgstr ""
+
+#: Controller/EventsController.php:2015
+msgid "Could not import STIX document: "
+msgstr ""
+
+#: Controller/EventsController.php:2022
+msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
+msgstr ""
+
+#: Controller/EventsController.php:2046;2131
+msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
+msgstr ""
+
+#: Controller/EventsController.php:2054
+msgid "Invalid event ID entered."
+msgstr ""
+
+#: Controller/EventsController.php:2059
+msgid "You are not authorised to read the selected event."
+msgstr ""
+
+#: Controller/EventsController.php:2349;2387;2450
+msgid "You don't have the permission to do that."
+msgstr ""
+
+#: Controller/EventsController.php:2358
+msgid "Event unpublished."
+msgstr ""
+
+#: Controller/EventsController.php:2537
+msgid "Email sent to the reporter."
+msgstr ""
+
+#: Controller/EventsController.php:2539
+msgid "Sending of email failed"
+msgstr ""
+
+#: Controller/EventsController.php:2678
+msgid "This feature is currently disabled"
+msgstr ""
+
+#: Controller/EventsController.php:2720;3986
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
+msgstr ""
+
+#: Controller/EventsController.php:2756
+msgid "Invalid Event ID."
+msgstr ""
+
+#: Controller/EventsController.php:2803
+msgid "No events found that match the passed parameters."
+msgstr ""
+
+#: Controller/EventsController.php:2828
+msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
+msgstr ""
+
+#: Controller/EventsController.php:2903
+msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
+msgstr ""
+
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
+msgid "Invalid hash type."
+msgstr ""
+
+#: Controller/EventsController.php:3025
+msgid "Filename not allowed."
+msgstr ""
+
+#: Controller/EventsController.php:3045
+msgid "Problem with writing the ioc file. Please report to administrator."
+msgstr ""
+
+#: Controller/EventsController.php:3139
+msgid "This is not a valid MISP XML file."
+msgstr ""
+
+#: Controller/EventsController.php:3291
+msgid "Not yet implemented"
+msgstr ""
+
+#: Controller/EventsController.php:3309;3313
+msgid "Invalid event or not authorised."
+msgstr ""
+
+#: Controller/EventsController.php:3333;3403
+msgid "You don't have the privileges to access this."
+msgstr ""
+
+#: Controller/EventsController.php:3610
+#: Controller/TagCollectionsController.php:307
+msgid "Invalid Tag."
+msgstr ""
+
+#: Controller/EventsController.php:3626
+#: Controller/TagCollectionsController.php:323
+msgid "Tag is already attached to this event."
+msgstr ""
+
+#: Controller/EventsController.php:3637;3643
+#: Controller/TagCollectionsController.php:330
+msgid "Tag(s) added."
+msgstr ""
+
+#: Controller/EventsController.php:3639
+msgid "Tag could not be added."
+msgstr ""
+
+#: Controller/EventsController.php:3645
+#: Controller/TagCollectionsController.php:338
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
+msgid "Invalid event."
+msgstr ""
+
+#: Controller/EventsController.php:3918
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
+msgstr ""
+
+#: Controller/EventsController.php:4049;4079;4095
+msgid "You do not have the permission to do that."
+msgstr ""
+
+#: Controller/EventsController.php:4160;4300
+msgid "Invalid ID"
+msgstr ""
+
+#: Controller/EventsController.php:4164;4304
+msgid "Event not found or you are not authorised to view it."
+msgstr ""
+
+#: Controller/EventsController.php:4405;4412
+msgid "Please POST the samples as described on the automation page."
+msgstr ""
+
+#: Controller/EventsController.php:4441
+msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
+msgstr ""
+
+#: Controller/EventsController.php:4449
+msgid "Event not found"
+msgstr ""
+
+#: Controller/EventsController.php:4472
+msgid "Event not found."
+msgstr ""
+
+#: Controller/EventsController.php:4482
+msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
+msgstr ""
+
+#: Controller/EventsController.php:4507
+msgid "The creation of a new event with the supplied information has failed."
+msgstr ""
+
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
+msgid "Invalid type."
+msgstr ""
+
+#: Controller/EventsController.php:4906
+msgid "Invalid method."
+msgstr ""
+
+#: Controller/EventsController.php:4989
+msgid "%s services are not enabled."
+msgstr ""
+
+#: Controller/EventsController.php:4993
+msgid "Attribute not found or you are not authorised to see it."
+msgstr ""
+
+#: Controller/EventsController.php:4999
+msgid "No valid %s options found for this attribute."
+msgstr ""
+
+#: Controller/EventsController.php:5016
+msgid "no valid %s options found for this attribute."
+msgstr ""
+
+#: Controller/EventsController.php:5038
+msgid "%s service not reachable."
+msgstr ""
+
+#: Controller/EventsController.php:5050
+msgid ": Enriched via the %s"
+msgstr ""
+
+#: Controller/EventsController.php:5184
+msgid "Import service not reachable."
+msgstr ""
+
+#: Controller/EventsController.php:5351
+msgid "Invalid ID."
+msgstr ""
+
+#: Controller/EventsController.php:5399
+#: Controller/ShadowAttributesController.php:311;316;532
+msgid "Invalid Event"
+msgstr ""
+
+#: Controller/EventsController.php:5420
+msgid "Enrichment task queued for background processing. Check back later to see the results."
+msgstr ""
+
+#: Controller/FeedsController.php:27
+msgid "You don't have the required privileges to do that."
+msgstr ""
+
+#: Controller/FeedsController.php:205;303
+msgid "Feed added."
+msgstr ""
+
+#: Controller/FeedsController.php:213
+msgid "Feed could not be added. Invalid field: %s"
+msgstr ""
+
+#: Controller/FeedsController.php:238;338;360;482;517;721
+msgid "Invalid feed."
+msgstr ""
+
+#: Controller/FeedsController.php:311
+msgid "Feed could not be updated. Invalid fields: %s"
+msgstr ""
+
+#: Controller/FeedsController.php:334
+msgid "This action requires a post request."
+msgstr ""
+
+#: Controller/FeedsController.php:367;486
+msgid "Feed is currently not enabled. Make sure you enable it."
+msgstr ""
+
+#: Controller/FeedsController.php:380;446
+msgid "Starting fetch from Feed."
+msgstr ""
+
+#: Controller/FeedsController.php:391
+msgid "Pull queued for background execution."
+msgstr ""
+
+#: Controller/FeedsController.php:396;398
+msgid "Fetching the feed has failed."
+msgstr ""
+
+#: Controller/FeedsController.php:402
+msgid "Fetching the feed has successfuly completed."
+msgstr ""
+
+#: Controller/FeedsController.php:463
+msgid "Fetching the feed has successfully completed."
+msgstr ""
+
+#: Controller/FeedsController.php:493
+msgid "Event added."
+msgstr ""
+
+#: Controller/FeedsController.php:496
+msgid "Event already up to date."
+msgstr ""
+
+#: Controller/FeedsController.php:498
+msgid "Event updated."
+msgstr ""
+
+#: Controller/FeedsController.php:502
+msgid "Could not %s event."
+msgstr ""
+
+#: Controller/FeedsController.php:505
+msgid "Download failed."
+msgstr ""
+
+#: Controller/FeedsController.php:597
+msgid "Feed could not be fetched. The HTTP error code returned was: "
+msgstr ""
+
+#: Controller/FeedsController.php:636;687
+msgid "Invalid feed type."
+msgstr ""
+
+#: Controller/FeedsController.php:753
+msgid "This event is blocked by the Feed filters."
+msgstr ""
+
+#: Controller/FeedsController.php:755
+msgid "Could not download the selected Event"
+msgstr ""
+
+#: Controller/FeedsController.php:791;795
+msgid "Invalid Feed."
+msgstr ""
+
+#: Controller/FeedsController.php:816
+msgid "Only POST requests are allowed."
+msgstr ""
+
+#: Controller/FeedsController.php:820
+msgid "Feed not found."
+msgstr ""
+
+#: Controller/FeedsController.php:829
+msgid "Data pulled."
+msgstr ""
+
+#: Controller/FeedsController.php:831
+msgid "Could not pull the selected data. Reason: %s"
+msgstr ""
+
+#: Controller/FeedsController.php:848
+msgid "Starting feed caching."
+msgstr ""
+
+#: Controller/FeedsController.php:863
+msgid "Caching the feeds has failed."
+msgstr ""
+
+#: Controller/FeedsController.php:866
+msgid "Caching the feeds has successfully completed."
+msgstr ""
+
+#: Controller/FeedsController.php:900
+msgid "Invalid feed list received."
+msgstr ""
+
+#: Controller/GalaxiesController.php:92
+msgid "All clusters"
+msgstr ""
+
+#: Controller/GalaxiesController.php:135
+msgid "All namespaces"
+msgstr ""
+
+#: Controller/GalaxiesController.php:250
+msgid "Failed to parse request."
+msgstr ""
+
+#: Controller/GalaxiesController.php:253
+msgid "No clusters picked."
+msgstr ""
+
+#: Controller/JobsController.php:156
+msgid "All completed jobs have been purged"
+msgstr ""
+
+#: Controller/JobsController.php:159
+msgid "All jobs have been purged"
+msgstr ""
+
+#: Controller/ObjectReferencesController.php:37
+msgid "Invalid object"
+msgstr ""
+
+#: Controller/ObjectReferencesController.php:188
+msgid "Invalid object reference"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:31
+msgid "All Objects"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:99
+msgid "Invalid object template"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:103
+msgid "Invalid object template id."
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:143
+msgid "ObjectTemplate deleted"
+msgstr ""
+
+#: Controller/ObjectsController.php:29
+msgid "This action can only be reached via POST requests"
+msgstr ""
+
+#: Controller/ObjectsController.php:69;82
+msgid "Invalid sharing group."
+msgstr ""
+
+#: Controller/ObjectsController.php:103
+msgid "You don't have permissions to create objects."
+msgstr ""
+
+#: Controller/ObjectsController.php:131
+#: Model/Template.php:25
+msgid "Invalid template."
+msgstr ""
+
+#: Controller/ObjectsController.php:311
+msgid "You don't have permissions to edit objects."
+msgstr ""
+
+#: Controller/ObjectsController.php:325;336;439
+msgid "Invalid object."
+msgstr ""
+
+#: Controller/ObjectsController.php:433
+msgid "You don't have permissions to delete objects."
+msgstr ""
+
+#: Controller/ObjectsController.php:543;550;554
+msgid "Object not found or not authorised."
+msgstr ""
+
+#: Controller/ObjectsController.php:811
+msgid "%s objects successfully reconstructed."
+msgstr ""
+
+#: Controller/OrgBlacklistsController.php:15
+msgid "Organisation Blacklisting is not currently enabled on this instance."
+msgstr ""
+
+#: Controller/OrganisationsController.php:251
+msgid "Organisation deleted"
+msgstr ""
+
+#: Controller/OrganisationsController.php:258
+msgid "Organisation could not be deleted. Generally organisations should never be deleted, instead consider moving them to the known remote organisations list. Alternatively, if you are certain that you would like to remove an organisation and are aware of the impact, make sure that there are no users or events still tied to this organisation before deleting it."
+msgstr ""
+
+#: Controller/PostsController.php:80
+msgid "Invalid thread"
+msgstr ""
+
+#: Controller/PostsController.php:176
+msgid "Post added"
+msgstr ""
+
+#: Controller/PostsController.php:208;256
+msgid "Invalid post"
+msgstr ""
+
+#: Controller/RegexpController.php:27
+msgid "The Regexp has been saved."
+msgstr ""
+
+#: Controller/RegexpController.php:31
+msgid "The Regexp could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/RegexpController.php:45;116
+msgid "The Regular expressions have been saved."
+msgstr ""
+
+#: Controller/RegexpController.php:48;123
+msgid "Could not create the Regex entry as no types were selected. Either check \"All\" or check the types that you wish the Regex to affect."
+msgstr ""
+
+#: Controller/RegexpController.php:211
+msgid "All done! Number of changed attributes: "
+msgstr ""
+
+#: Controller/RegexpController.php:231
+msgid "All done! Found and cleaned "
+msgstr ""
+
+#: Controller/RolesController.php:33
+msgid "Invalid role"
+msgstr ""
+
+#: Controller/RolesController.php:67;108
+msgid "The Role could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/RolesController.php:157
+msgid "Role deleted"
+msgstr ""
+
+#: Controller/ServersController.php:226;417
+msgid "The pull filter rules must be in valid JSON format."
+msgstr ""
+
+#: Controller/ServersController.php:236;427
+msgid "The push filter rules must be in valid JSON format."
+msgstr ""
+
+#: Controller/ServersController.php:291;457
+msgid "That organisation could not be created as the uuid is in use already."
+msgstr ""
+
+#: Controller/ServersController.php:303
+msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format? Also, make sure the organisation's name doesn't clash with an existing one."
+msgstr ""
+
+#: Controller/ServersController.php:332;513
+msgid "The server has been saved"
+msgstr ""
+
+#: Controller/ServersController.php:339;520
+msgid "The server could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/ServersController.php:392;589;614;623;683;1360
+msgid "Invalid server"
+msgstr ""
+
+#: Controller/ServersController.php:474
+msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
+msgstr ""
+
+#: Controller/ServersController.php:596
+msgid "Server deleted"
+msgstr ""
+
+#: Controller/ServersController.php:599
+msgid "Server was not deleted"
+msgstr ""
+
+#: Controller/ServersController.php:626
+msgid "Pull setting not enabled for this server."
+msgstr ""
+
+#: Controller/ServersController.php:659
+msgid "Pull queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:696
+msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
+msgstr ""
+
+#: Controller/ServersController.php:709
+msgid "Push complete. %s events pushed, %s events could not be pushed."
+msgstr ""
+
+#: Controller/ServersController.php:734
+msgid "Push queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:1257
+msgid "File not found."
+msgstr ""
+
+#: Controller/ServersController.php:1263
+msgid "File could not be deleted."
+msgstr ""
+
+#: Controller/ServersController.php:1286;1302
+msgid "Upload failed."
+msgstr ""
+
+#: Controller/ServersController.php:1294
+msgid "File already exists. If you would like to replace it, remove the old one first."
+msgstr ""
+
+#: Controller/ServersController.php:1748
+msgid "Starting server caching."
+msgstr ""
+
+#: Controller/ServersController.php:1763
+msgid "Caching the servers has failed."
+msgstr ""
+
+#: Controller/ServersController.php:1766
+msgid "Caching the servers has successfully completed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:211
+msgid "Moving of the file that this attachment references failed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:279
+msgid "Could not discard proposal."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:340
+msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:388;391;400
+msgid "The lines"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:440
+msgid "The proposal has been saved"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:452;761
+msgid "Could not save the proposal. Errors: %s"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:454
+msgid "The proposal could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:491
+msgid "Invalid Proposal"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:521
+msgid "Proposal not an attachment or malware-sample"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:617
+msgid "The attachment has been uploaded"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:619
+msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:622
+msgid "The attachment could not be saved, please contact your administrator."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:752
+msgid "The proposed Attribute has been saved"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:763
+msgid "The ShadowAttribute could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:894;904
+msgid "Invalid proposal."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:948
+msgid "No proposals found or invalid event."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:980;1016
+msgid "This feature is only available using the API to Sync users"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:983
+msgid "Invalid UUID"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:1019
+msgid "This feature is only available using POST requests"
+msgstr ""
+
+#: Controller/SharingGroupsController.php:237
+msgid "Sharing Group deleted"
+msgstr ""
+
+#: Controller/SharingGroupsController.php:242
+msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
+msgstr ""
+
+#: Controller/SightingsController.php:86
+msgid "Could not add the Sighting. Reason: "
+msgstr ""
+
+#: Controller/SightingsController.php:96;99
+msgid "Sighting added"
+msgstr ""
+
+#: Controller/SightingsController.php:152
+msgid "You are not authorised to remove sightings data as you don't have permission to modify your organisation's data."
+msgstr ""
+
+#: Controller/SightingsController.php:158
+msgid "Attribute not found"
+msgstr ""
+
+#: Controller/SightingsController.php:176
+msgid "Invalid request."
+msgstr ""
+
+#: Controller/SightingsController.php:185
+msgid "Sighting added."
+msgstr ""
+
+#: Controller/SightingsController.php:187
+msgid "Sighting could not be added"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:56;177
+msgid "The tag collection has been saved"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:64;185
+msgid "The tag collection could not be added. Reason: "
+msgstr ""
+
+#: Controller/TagCollectionsController.php:85
+msgid "%s new tag collections added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:154
+msgid "Invalid Tag Collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:161
+msgid "You don't have editing rights on this Tag Collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:201;380
+msgid "Invalid tag collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:207
+msgid "Tag collection deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:215
+msgid "Tag collection could not be deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:224
+msgid "You are not allowed to delete that."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:332
+msgid "Tag(s) could not be added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:384
+msgid "Insufficient privileges to remove the tag from the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:395
+msgid "Invalid tag or tag not associated with the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:399
+msgid "Failed to remove tag from the collection."
+msgstr ""
+
+#: Controller/TagsController.php:367
+msgid "Tag deleted"
+msgstr ""
+
+#: Controller/TagsController.php:372
+msgid "Tag was not deleted"
+msgstr ""
+
+#: Controller/TagsController.php:580
+msgid "Favourite Tags"
+msgstr ""
+
+#: Controller/TagsController.php:586
+msgid "Tag Collections"
+msgstr ""
+
+#: Controller/TagsController.php:591
+msgid "All Tags"
+msgstr ""
+
+#: Controller/TagsController.php:601
+#: View/Taxonomies/view.ctp:2
+msgid "Taxonomy Library"
+msgstr ""
+
+#: Controller/TagsController.php:756
+msgid "Includes: "
+msgstr ""
+
+#: Controller/TemplatesController.php:408
+msgid "Event populated, "
+msgstr ""
+
+#: Controller/TemplatesController.php:410
+msgid "Event populated, but "
+msgstr ""
+
+#: Controller/UsersController.php:42;247
+msgid "Invalid user or not authorised."
+msgstr ""
+
+#: Controller/UsersController.php:54;456;683;929
+msgid "Invalid user"
+msgstr ""
+
+#: Controller/UsersController.php:119;590;754
+msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
+msgstr ""
+
+#: Controller/UsersController.php:146
+msgid "The profile has been updated"
+msgstr ""
+
+#: Controller/UsersController.php:150
+msgid "The profile could not be updated. Please, try again."
+msgstr ""
+
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
+msgid "Password Changed."
+msgstr ""
+
+#: Controller/UsersController.php:222
+msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
+msgstr ""
+
+#: Controller/UsersController.php:601
+msgid "The user could not be saved. Invalid organisation."
+msgstr ""
+
+#: Controller/UsersController.php:623
+msgid "The user has been saved."
+msgstr ""
+
+#: Controller/UsersController.php:632;865
+msgid "The user could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/UsersController.php:857
+msgid "The user has been saved"
+msgstr ""
+
+#: Controller/UsersController.php:937
+msgid "User deleted"
+msgstr ""
+
+#: Controller/UsersController.php:941
+msgid "User was not deleted"
+msgstr ""
+
+#: Controller/UsersController.php:1019
+msgid "Invalid username or password, try again"
+msgstr ""
+
+#: Controller/UsersController.php:1106
+msgid "Good-Bye"
+msgstr ""
+
+#: Controller/UsersController.php:1147
+msgid "New authkey generated."
+msgstr ""
+
+#: Controller/UsersController.php:1256
+msgid "You accepted the Terms and Conditions."
+msgstr ""
+
+#: Controller/UsersController.php:1438
+msgid "Recipient email not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1443
+msgid "Recipient organisation not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1480
+msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
+msgstr ""
+
+#: Controller/UsersController.php:1482
+msgid "E-mails sent."
+msgstr ""
+
+#: Controller/Component/AdminCrudComponent.php:20
+msgid "The %s has been saved."
+msgstr ""
+
+#: Controller/Component/AdminCrudComponent.php:24;61
+msgid "The %s could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/Component/AdminCrudComponent.php:52;85
+msgid "Invalid %s"
+msgstr ""
+
+#: Controller/Component/AdminCrudComponent.php:57
+msgid "The %s has been saved"
+msgstr ""
+
+#: Controller/Component/AdminCrudComponent.php:88
+msgid "%s deleted"
+msgstr ""
+
+#: Controller/Component/AdminCrudComponent.php:91
+msgid "%s was not deleted"
+msgstr ""
+
+#: Controller/Component/BlackListComponent.php:75
+msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
+msgstr ""
+
+#: Controller/Component/BlackListComponent.php:126
+msgid "Blacklist item added."
+msgstr ""
+
+#: Controller/Component/BlackListComponent.php:155
+msgid "Invalid blacklist entry"
+msgstr ""
+
+#: Controller/Component/BlackListComponent.php:159
+msgid "Blacklist entry removed"
+msgstr ""
+
+#: Controller/Component/BlackListComponent.php:161
+msgid "Could not remove the blacklist entry"
+msgstr ""
+
+#: Model/Attribute.php:591
+msgid "Composite type, but value not explodable"
+msgstr ""
+
+#: Model/Attribute.php:703
+msgid "Delete of file attachment failed. Please report to administrator."
+msgstr ""
+
+#: Model/Attribute.php:828
+msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
+msgstr ""
+
+#: Model/Attribute.php:953
+msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:960
+msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:967
+msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
+msgstr ""
+
+#: Model/Attribute.php:978
+msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
+msgstr ""
+
+#: Model/Attribute.php:989
+msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
+msgstr ""
+
+#: Model/Attribute.php:996
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:1011
+msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
+msgstr ""
+
+#: Model/Attribute.php:1029
+msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:1034
+msgid "Invalid composite type. The format has to be %s."
+msgstr ""
+
+#: Model/Attribute.php:1045
+msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
+msgstr ""
+
+#: Model/Attribute.php:1053
+msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:1064
+msgid "Invalid CIDR notation value found."
+msgstr ""
+
+#: Model/Attribute.php:1071;1122
+msgid "IP address has an invalid format."
+msgstr ""
+
+#: Model/Attribute.php:1076
+msgid "Port numbers have to be positive integers between 1 and 65535."
+msgstr ""
+
+#: Model/Attribute.php:1105
+msgid " name has an invalid format. Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:1125
+msgid "Domain name has an invalid format."
+msgstr ""
+
+#: Model/Attribute.php:1138
+msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:1146
+msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
+msgstr ""
+
+#: Model/Attribute.php:1157
+msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
+msgstr ""
+
+#: Model/Attribute.php:1272
+msgid "Datetime has to be in the ISO 8601 format."
+msgstr ""
+
+#: Model/Attribute.php:1278
+msgid "The value has to be a number greater or equal 0."
+msgstr ""
+
+#: Model/Attribute.php:1285
+msgid "The value has to be a number between 0 and 10."
+msgstr ""
+
+#: Model/Attribute.php:1968;2036
+msgid "Could not read user."
+msgstr ""
+
+#: Model/Attribute.php:2616
+msgid "This field is mandatory."
+msgstr ""
+
+#: Model/Attribute.php:3069
+msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
+msgstr ""
+
+#: Model/Event.php:5392
+msgid "Issues while loading the stix file. "
+msgstr ""
+
+#: Model/Event.php:5394
+msgid "Issues with the maec library. "
+msgstr ""
+
+#: Model/Event.php:5396
+msgid "Issues executing the ingestion script or invalid input. "
+msgstr ""
+
+#: Model/Event.php:5399
+msgid "Please ask your administrator to "
+msgstr ""
+
+#: Model/Event.php:5401
+msgid "Please "
+msgstr ""
+
+#: Model/Event.php:5403
+msgid "check whether the dependencies for STIX are met via the diagnostic tool."
+msgstr ""
+
+#: Model/Event.php:5435
+msgid "#"
+msgstr ""
+
+#: Model/Event.php:5444
+msgid "%s not set"
+msgstr ""
+
+#: Model/Event.php:5667
+msgid "Could not add tags."
+msgstr ""
+
+#: Model/Galaxy.php:219;276;286;300
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
+msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
+msgstr ""
+
+#: Model/Server.php:122
+msgid "Administering MISP via the CLI"
+msgstr ""
+
+#: Model/Server.php:132
+msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
+msgstr ""
+
+#: Model/Server.php:133
+#: View/Tasks/index.ctp:6
+msgid "Automating certain console tasks"
+msgstr ""
+
+#: Model/Server.php:142
+msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
+msgstr ""
+
+#: Model/Server.php:144
+msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
+msgstr ""
+
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
+msgid "Unless set to true, the instance will only be accessible by site admins."
+msgstr ""
+
+#: Model/Server.php:166
+msgid "Select the language MISP should use. The default is english."
+msgstr ""
+
+#: Model/Server.php:176
+msgid "Enable some performance heavy correlations (currently CIDR correlation)"
+msgstr ""
+
+#: Model/Server.php:185
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:195
+msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
+msgstr ""
+
+#: Model/Server.php:204
+msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
+msgstr ""
+
+#: Model/Server.php:212
+msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
+msgstr ""
+
+#: Model/Server.php:221
+msgid "The message that users will see if the instance is not live."
+msgstr ""
+
+#: Model/Server.php:223
+msgid "If this is not set the default value will be used."
+msgstr ""
+
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
+msgid "This setting is deprecated and can be safely removed."
+msgstr ""
+
+#: Model/Server.php:245
+msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
+msgstr ""
+
+#: Model/Server.php:263
+msgid "Footer text prepending the \"Powered by MISP\" text."
+msgstr ""
+
+#: Model/Server.php:271
+msgid "Footer text following the \"Powered by MISP\" text."
+msgstr ""
+
+#: Model/Server.php:311
+msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
+msgstr ""
+
+#: Model/Server.php:319
+msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
+msgstr ""
+
+#: Model/Server.php:327
+msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
+msgstr ""
+
+#: Model/Server.php:335
+msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
+msgstr ""
+
+#: Model/Server.php:343
+msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
+msgstr ""
+
+#: Model/Server.php:352
+msgid "The MISP instance UUID. This UUID is used to identify this instance."
+msgstr ""
+
+#: Model/Server.php:354
+msgid "No valid UUID set"
+msgstr ""
+
+#: Model/Server.php:368
+msgid "Setting this setting to 'false' will hide all organisation names / logos."
+msgstr ""
+
+#: Model/Server.php:376
+msgid "Put the event threat level in the notification E-mail subject."
+msgstr ""
+
+#: Model/Server.php:384
+msgid "This is the TLP string for e-mails when email_subject_tag is not found."
+msgstr ""
+
+#: Model/Server.php:392
+msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
+msgstr ""
+
+#: Model/Server.php:400
+msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
+msgstr ""
+
+#: Model/Server.php:424
+msgid "Enables the use of MISP's background processing."
+msgstr ""
+
+#: Model/Server.php:432
+msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
+msgstr ""
+
+#: Model/Server.php:441
+msgid "Allow the XML caches to include the encoded attachments."
+msgstr ""
+
+#: Model/Server.php:449
+msgid "Always download attachments when loaded by a user in a browser"
+msgstr ""
+
+#: Model/Server.php:457
+msgid "The e-mail address that MISP should use for all notifications"
+msgstr ""
+
+#: Model/Server.php:465
+msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
+msgstr ""
+
+#: Model/Server.php:474
+msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
+msgstr ""
+
+#: Model/Server.php:490
+msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
+msgstr ""
+
+#: Model/Server.php:498
+msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
+msgstr ""
+
+#: Model/Server.php:506
+msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
+msgstr ""
+
+#: Model/Server.php:514
+msgid "The default distribution setting for events (0-3)."
+msgstr ""
+
+#: Model/Server.php:523
+msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
+msgstr ""
+
+#: Model/Server.php:532
+msgid "The default threat level setting when creating events."
+msgstr ""
+
+#: Model/Server.php:541
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:550
+msgid "Enable the tagging feature of MISP. This is highly recommended."
+msgstr ""
+
+#: Model/Server.php:558
+msgid "Show the full tag names on the event index."
+msgstr ""
+
+#: Model/Server.php:567
+msgid "Used on the login page, before the MISP logo"
+msgstr ""
+
+#: Model/Server.php:575
+msgid "Used on the login page, after the MISP logo"
+msgstr ""
+
+#: Model/Server.php:583
+msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
+msgstr ""
+
+#: Model/Server.php:591
+msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
+msgstr ""
+
+#: Model/Server.php:599
+msgid "Used in the page title, after the name of the page"
+msgstr ""
+
+#: Model/Server.php:607
+msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
+msgstr ""
+
+#: Model/Server.php:615
+msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
+msgstr ""
+
+#: Model/Server.php:623
+msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
+msgstr ""
+
+#: Model/Server.php:631
+msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
+msgstr ""
+
+#: Model/Server.php:639
+msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
+msgstr ""
+
+#: Model/Server.php:648
+msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
+msgstr ""
+
+#: Model/Server.php:657
+msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
+msgstr ""
+
+#: Model/Server.php:665
+msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
+msgstr ""
+
+#: Model/Server.php:672
+msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
+msgstr ""
+
+#: Model/Server.php:679
+msgid "If enabled, all log entries will include the IP address of the user."
+msgstr ""
+
+#: Model/Server.php:688
+msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
+msgstr ""
+
+#: Model/Server.php:696
+msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
+msgstr ""
+
+#: Model/Server.php:705
+msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
+msgstr ""
+
+#: Model/Server.php:714
+msgid "When enabled, the number of proposals for the events are shown on the index."
+msgstr ""
+
+#: Model/Server.php:723
+msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
+msgstr ""
+
+#: Model/Server.php:732
+msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
+msgstr ""
+
+#: Model/Server.php:741
+msgid "When enabled only Org and Site admins can edit a user's profile."
+msgstr ""
+
+#: Model/Server.php:751
+msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
+msgstr ""
+
+#: Model/Server.php:760
+msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
+msgstr ""
+
+#: Model/Server.php:769
+msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
+msgstr ""
+
+#: Model/Server.php:778
+msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
+msgstr ""
+
+#: Model/Server.php:787
+msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
+msgstr ""
+
+#: Model/Server.php:796
+msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
+msgstr ""
+
+#: Model/Server.php:805
+msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
+msgstr ""
+
+#: Model/Server.php:814
+msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
+msgstr ""
+
+#: Model/Server.php:823
+msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
+msgstr ""
+
+#: Model/Server.php:833
+msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
+msgstr ""
+
+#: Model/Server.php:842
+msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
+msgstr ""
+
+#: Model/Server.php:850
+msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
+msgstr ""
+
+#: Model/Server.php:858
+msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
+msgstr ""
+
+#: Model/Server.php:866
+msgid "The password on the redis server (if any) to be used for generic MISP tasks."
+msgstr ""
+
+#: Model/Server.php:875
+msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
+msgstr ""
+
+#: Model/Server.php:883
+msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
+msgstr ""
+
+#: Model/Server.php:891
+msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
+msgstr ""
+
+#: Model/Server.php:903
+msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
+msgstr ""
+
+#: Model/Server.php:911
+msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
+msgstr ""
+
+#: Model/Server.php:919
+msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
+msgstr ""
+
+#: Model/Server.php:927
+msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
+msgstr ""
+
+#: Model/Server.php:935
+msgid "The e-mail address that the instance's GnuPG key is tied to."
+msgstr ""
+
+#: Model/Server.php:943
+msgid "The password (if it is set) of the GnuPG key of the instance."
+msgstr ""
+
+#: Model/Server.php:952
+msgid "The location of the GnuPG homedir."
+msgstr ""
+
+#: Model/Server.php:963
+msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
+msgstr ""
+
+#: Model/Server.php:971
+msgid "The e-mail address that the instance's SMIME key is tied to."
+msgstr ""
+
+#: Model/Server.php:979
+msgid "The location of the public half of the signing certificate."
+msgstr ""
+
+#: Model/Server.php:987
+msgid "The location of the private half of the signing certificate."
+msgstr ""
+
+#: Model/Server.php:995
+msgid "The password (if it is set) of the SMIME key of the instance."
+msgstr ""
+
+#: Model/Server.php:1007
+msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
+msgstr ""
+
+#: Model/Server.php:1015
+msgid "The TCP port for the HTTP proxy."
+msgstr ""
+
+#: Model/Server.php:1023
+msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
+msgstr ""
+
+#: Model/Server.php:1031
+msgid "The authentication username for the HTTP proxy."
+msgstr ""
+
+#: Model/Server.php:1039
+msgid "The authentication password for the HTTP proxy."
+msgstr ""
+
+#: Model/Server.php:1050
+msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
+msgstr ""
+
+#: Model/Server.php:1059
+msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
+msgstr ""
+
+#: Model/Server.php:1068
+msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
+msgstr ""
+
+#: Model/Server.php:1076
+msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
+msgstr ""
+
+#: Model/Server.php:1084
+msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
+msgstr ""
+
+#: Model/Server.php:1093
+msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
+msgstr ""
+
+#: Model/Server.php:1102
+msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
+msgstr ""
+
+#: Model/Server.php:1111
+msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
+msgstr ""
+
+#: Model/Server.php:1113
+msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
+msgstr ""
+
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
+msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
+msgstr ""
+
+#: Model/Server.php:1149
+msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
+msgstr ""
+
+#: Model/Server.php:1160
+msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
+msgstr ""
+
+#: Model/Server.php:1168
+msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
+msgstr ""
+
+#: Model/Server.php:1176
+msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
+msgstr ""
+
+#: Model/Server.php:1185
+msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
+msgstr ""
+
+#: Model/Server.php:1193
+msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
+msgstr ""
+
+#: Model/Server.php:1204
+msgid "The default policy action for the values added to the RPZ."
+msgstr ""
+
+#: Model/Server.php:1213
+msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
+msgstr ""
+
+#: Model/Server.php:1221
+msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
+msgstr ""
+
+#: Model/Server.php:1229
+msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1237
+msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1245
+msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1253
+msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1261
+msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1277
+msgid "Alternate nameserver"
+msgstr ""
+
+#: Model/Server.php:1285
+msgid "The e-mail address specified in the SOA portion of the zone file."
+msgstr ""
+
+#: Model/Server.php:1293
+msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
+msgstr ""
+
+#: Model/Server.php:1302
+msgid "The port that the pub/sub feature will use."
+msgstr ""
+
+#: Model/Server.php:1311
+msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
+msgstr ""
+
+#: Model/Server.php:1320
+msgid "The port that Redis is listening on."
+msgstr ""
+
+#: Model/Server.php:1329
+msgid "The password, if set for Redis."
+msgstr ""
+
+#: Model/Server.php:1338
+msgid "The database to be used for queuing messages for the pub/sub functionality."
+msgstr ""
+
+#: Model/Server.php:1347
+msgid "The namespace to be used for queuing messages for the pub/sub functionality."
+msgstr ""
+
+#: Model/Server.php:1356
+msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
+msgstr ""
+
+#: Model/Server.php:1364
+msgid "Enables or disables the publishing of any event creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:1372
+msgid "Enables or disables the publishing of any object creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:1380
+msgid "Enables or disables the publishing of any object reference creations/deletions."
+msgstr ""
+
+#: Model/Server.php:1388
+msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
+msgstr ""
+
+#: Model/Server.php:1396
+msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
+msgstr ""
+
+#: Model/Server.php:1404
+msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
+msgstr ""
+
+#: Model/Server.php:1412
+msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
+msgstr ""
+
+#: Model/Server.php:1420
+msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
+msgstr ""
+
+#: Model/Server.php:1428
+msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
+msgstr ""
+
+#: Model/Server.php:1436
+msgid "Enabled logging to an ElasticSearch instance"
+msgstr ""
+
+#: Model/Server.php:1444
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
+msgstr ""
+
+#: Model/Server.php:1452
+msgid "The index in which to place logs"
+msgstr ""
+
+#: Model/Server.php:1460
+msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
+msgstr ""
+
+#: Model/Server.php:1468
+msgid "Bucket name to upload to"
+msgstr ""
+
+#: Model/Server.php:1476
+msgid "Region in which your S3 bucket resides"
+msgstr ""
+
+#: Model/Server.php:1484
+msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
+msgstr ""
+
+#: Model/Server.php:1492
+msgid "AWS secret key to use when uploading samples"
+msgstr ""
+
+#: Model/Server.php:1500
+msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
+msgstr ""
+
+#: Model/Server.php:1509
+msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
+msgstr ""
+
+#: Model/Server.php:1517
+msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
+msgstr ""
+
+#: Model/Server.php:1525
+msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
+msgstr ""
+
+#: Model/Server.php:1535
+msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
+msgstr ""
+
+#: Model/Server.php:1544
+msgid "Use a header namespace for the auth header - default setting is enabled"
+msgstr ""
+
+#: Model/Server.php:1553
+msgid "The default header namespace for the auth header - default setting is HTTP_"
+msgstr ""
+
+#: Model/Server.php:1562
+msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
+msgstr ""
+
+#: Model/Server.php:1571
+msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
+msgstr ""
+
+#: Model/Server.php:1580
+msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
+msgstr ""
+
+#: Model/Server.php:1589
+msgid "Disable the logout button for users authenticate with the external auth mechanism."
+msgstr ""
+
+#: Model/Server.php:1597
+msgid "Enable/disable the enrichment services"
+msgstr ""
+
+#: Model/Server.php:1605
+msgid "Set a timeout for the enrichment services"
+msgstr ""
+
+#: Model/Server.php:1613;1725
+msgid "Enable/disable the import services"
+msgstr ""
+
+#: Model/Server.php:1621;1742
+msgid "Set a timeout for the import services"
+msgstr ""
+
+#: Model/Server.php:1629
+msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:1637
+msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:1645
+msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:1653
+msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:1661
+msgid "Enable/disable the export services"
+msgstr ""
+
+#: Model/Server.php:1669
+msgid "Set a timeout for the export services"
+msgstr ""
+
+#: Model/Server.php:1677
+msgid "Enable/disable the hover over information retrieved from the enrichment modules"
+msgstr ""
+
+#: Model/Server.php:1685
+msgid "Set a timeout for the hover services"
+msgstr ""
+
+#: Model/Server.php:1693
+msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:1701
+msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:1709
+msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
+msgstr ""
+
+#: Model/Server.php:1717
+msgid "The port used to access Cortex. By default, this is port 9000"
+msgstr ""
+
+#: Model/Server.php:1733
+msgid "Set an authentication key to be passed to Cortex"
+msgstr ""
+
+#: Model/Server.php:1750
+msgid "Set to false to disable SSL verification. This is not recommended."
+msgstr ""
+
+#: Model/Server.php:1759
+msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
+msgstr ""
+
+#: Model/Server.php:1768
+msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
+msgstr ""
+
+#: Model/Server.php:1777
+msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
+msgstr ""
+
+#: Model/Server.php:1786
+msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
+msgstr ""
+
+#: Model/Server.php:1795
+msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
+msgstr ""
+
+#: Model/Server.php:1805
+msgid "The debug level of the instance, always use 0 for production instances."
+msgstr ""
+
+#: Model/Server.php:1814
+msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
+msgstr ""
+
+#: Model/Server.php:1947
+msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/Server.php:2054
+msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+msgstr ""
+
+#: Model/Server.php:2056
+msgid "Sorry, this is not yet implemented"
+msgstr ""
+
+#: Model/Server.php:2057
+msgid "Something went wrong while trying to pull"
+msgstr ""
+
+#: Model/Server.php:2069;2071
+msgid "Unknown issue."
+msgstr ""
+
+#: Model/Server.php:2535
+msgid "Enable or disable the %s module."
+msgstr ""
+
+#: Model/Server.php:2538
+msgid "Restrict the %s module to the given organisation."
+msgstr ""
+
+#: Model/Server.php:2546
+msgid "Set this required module specific setting."
+msgstr ""
+
+#: Model/Server.php:2661
+msgid "Value not set."
+msgstr ""
+
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
+msgid "Organisation logos"
+msgstr ""
+
+#: Model/Server.php:3476
+msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
+msgstr ""
+
+#: Model/Server.php:3478
+msgid "48x48 pixel .png files"
+msgstr ""
+
+#: Model/Server.php:3481;3496
+msgid "Filename must be in the following format: *.png"
+msgstr ""
+
+#: Model/Server.php:3485
+msgid "Additional image files"
+msgstr ""
+
+#: Model/Server.php:3486
+msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
+msgstr ""
+
+#: Model/Server.php:3493
+msgid "text/html if served inline, anything that conveys the terms of use if served as download"
+msgstr ""
+
+#: Model/Server.php:3665
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr ""
+
+#: Model/Server.php:4115
+msgid "Removing a dead worker."
+msgstr ""
+
+#: Model/Server.php:4116
+msgid "Removing dead worker data. Worker was of type %s with pid %s"
+msgstr ""
+
+#: Model/Server.php:4120
+msgid "Stopping a worker."
+msgstr ""
+
+#: Model/Server.php:4121
+msgid "Stopping a worker. Worker was of type %s with pid %s"
+msgstr ""
+
+#: Plugin/Assets/models/behaviors/LogableBehavior.php:361
+msgid "deleted"
+msgstr ""
+
+#: Plugin/Assets/models/behaviors/LogableBehavior.php:412
+#: Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php:40
+msgid "added"
+msgstr ""
+
+#: Plugin/Assets/models/behaviors/LogableBehavior.php:414
+#: Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php:42
+msgid "updated"
+msgstr ""
+
+#: Plugin/magic_tools/models/behaviors/orphans_protectable.php:104
+msgid "it has the following dependent items"
+msgstr ""
+
+#: View/Attributes/add.ctp:7
+#: View/Elements/eventattributecreation.ctp:9
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
+#: View/Pages/doc/using_the_system.ctp:84
+msgid "Add Attribute"
+msgstr ""
+
+#: View/Attributes/add.ctp:7
+#: View/Attributes/edit.ctp:4
+msgid "Edit Attribute"
+msgstr ""
+
+#: View/Attributes/add.ctp:14
+#: View/Attributes/attribute_replace.ctp:12
+#: View/Attributes/edit.ctp:8
+#: View/ShadowAttributes/add.ctp:10
+#: View/ShadowAttributes/edit.ctp:8
+msgid "(choose one)"
+msgstr ""
+
+#: View/Attributes/add.ctp:15
+#: View/Attributes/add_attachment.ctp:9
+#: View/Attributes/edit.ctp:9
+#: View/ShadowAttributes/add.ctp:12
+#: View/ShadowAttributes/add_attachment.ctp:9
+#: View/ShadowAttributes/edit.ctp:10
+msgid "Category "
+msgstr ""
+
+#: View/Attributes/add.ctp:18
+#: View/Attributes/attribute_replace.ctp:15
+#: View/Attributes/edit.ctp:12
+#: View/ShadowAttributes/add.ctp:15
+#: View/ShadowAttributes/edit.ctp:13
+msgid "(first choose category)"
+msgstr ""
+
+#: View/Attributes/add.ctp:19
+#: View/Attributes/edit.ctp:13
+#: View/ShadowAttributes/add.ctp:16
+#: View/ShadowAttributes/edit.ctp:14
+msgid "Type "
+msgstr ""
+
+#: View/Attributes/add.ctp:36
+#: View/Attributes/add_attachment.ctp:24
+#: View/Attributes/edit.ctp:24
+#: View/Events/add.ctp:20
+msgid "Distribution "
+msgstr ""
+
+#: View/Attributes/add.ctp:50
+#: View/Attributes/add_attachment.ctp:33
+#: View/Attributes/edit.ctp:32
+#: View/Attributes/ajax/attributeEditMassForm.ctp:24
+#: View/Events/add.ctp:30
+#: View/Events/edit.ctp:26
+#: View/Feeds/add.ctp:176
+#: View/Feeds/edit.ctp:172
+#: View/SharingGroups/view.ctp:2
+msgid "Sharing Group"
+msgstr ""
+
+#: View/Attributes/add.ctp:67
+#: View/Attributes/add_attachment.ctp:41
+#: View/Attributes/edit.ctp:46
+#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Elements/eventattributecreation.ctp:42
+#: View/Pages/doc/using_the_system.ctp:93;95;131
+#: View/ShadowAttributes/add.ctp:28
+#: View/ShadowAttributes/add_attachment.ctp:13
+#: View/ShadowAttributes/edit.ctp:32
+msgid "Contextual Comment"
+msgstr ""
+
+#: View/Attributes/add.ctp:76
+#: View/Attributes/edit.ctp:55
+#: View/Elements/eventattributecreation.ctp:53
+#: View/ShadowAttributes/add.ctp:38
+msgid "for Intrusion Detection System"
+msgstr ""
+
+#: View/Attributes/add.ctp:91
+#: View/Attributes/attribute_replace.ctp:38
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
+#: View/Attributes/ajax/attributeRestorationForm.ctp:11
+#: View/Elements/view_galaxy_matrix.ctp:76;199
+#: View/Events/contact.ctp:29
+#: View/Events/edit.ctp:59
+#: View/Events/free_text_import.ctp:27
+#: View/News/edit.ctp:34
+#: View/ObjectReferences/ajax/add.ctp:130
+#: View/Objects/add.ctp:147
+#: View/Objects/revise_object.ctp:85
+#: View/Organisations/admin_add.ctp:49
+#: View/Organisations/admin_edit.ctp:60
+#: View/Servers/add.ctp:115
+#: View/Servers/edit.ctp:162
+#: View/SharingGroups/add.ctp:115
+#: View/TagCollections/add.ctp:21
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
+#: View/TemplateElements/ajax/template_element_add_file.ctp:67
+#: View/TemplateElements/ajax/template_element_add_text.ctp:29
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:86
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:67
+#: View/TemplateElements/ajax/template_element_edit_text.ctp:29
+#: View/Users/admin_add.ctp:97
+#: View/Users/admin_edit.ctp:91
+#: View/Users/admin_email.ctp:54
+#: View/Users/admin_quick_email.ctp:23
+#: View/Users/change_pw.ctp:23
+#: View/Users/edit.ctp:41
+#: View/Whitelists/admin_edit.ctp:12
+msgid "Submit"
+msgstr ""
+
+#: View/Attributes/add.ctp:92
+#: View/Attributes/attribute_replace.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
+#: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/exportSearch.ctp:32
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
+#: View/Attributes/ajax/toggle_correlation.ctp:25
+#: View/Elements/eventattributecreation.ctp:89
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/view_galaxy_matrix.ctp:200
+#: View/Elements/serverRuleElements/pull.ctp:70
+#: View/Elements/serverRuleElements/push.ctp:72
+#: View/EventDelegations/ajax/accept_delegation.ctp:17
+#: View/EventDelegations/ajax/delegate_event.ctp:37
+#: View/EventDelegations/ajax/delete_delegation.ctp:17
+#: View/EventDelegations/ajax/view.ctp:24
+#: View/Events/filter_event_index.ctp:171
+#: View/Events/free_text_import.ctp:33
+#: View/Events/ajax/enrich_event.ctp:22
+#: View/Events/ajax/enrichmentChoice.ctp:15
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
+#: View/Events/ajax/exportChoice.ctp:51
+#: View/Events/ajax/importChoice.ctp:12
+#: View/Events/ajax/quick_edit.ctp:6
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
+#: View/Jobs/ajax/error.ctp:34
+#: View/Noticelists/ajax/delete_confirmation.ctp:25
+#: View/ObjectReferences/ajax/add.ctp:134
+#: View/ObjectReferences/ajax/delete.ctp:37
+#: View/Objects/add.ctp:153
+#: View/Objects/revise_object.ctp:87
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/ajax/fetch_orgs_for_sg.ctp:27
+#: View/Organisations/ajax/merge.ctp:71
+#: View/Servers/filter_event_index.ctp:22
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:27
+#: View/Servers/ajax/server_settings_edit.ctp:6
+#: View/Servers/ajax/update.ctp:16
+#: View/ShadowAttributes/add.ctp:58
+#: View/ShadowAttributes/edit.ctp:57
+#: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
+#: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/advanced.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
+#: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
+#: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:6
+#: View/TemplateElements/ajax/template_element_add_file.ctp:73
+#: View/TemplateElements/ajax/template_element_add_text.ctp:35
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:92
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:73
+#: View/TemplateElements/ajax/template_element_edit_text.ctp:35
+#: View/Templates/ajax/template_choices.ctp:15
+#: View/Users/admin_filter_user_index.ctp:107
+#: View/Users/ajax/emailConfirmTemplate.ctp:14
+#: View/Users/ajax/fetchpgpkey.ctp:24
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:32
+#: View/Warninglists/ajax/delete_confirmation.ctp:25
+msgid "Cancel"
+msgstr ""
+
+#: View/Attributes/add_attachment.ctp:4
+msgid "Add Attachment(s)"
+msgstr ""
+
+#: View/Attributes/add_attachment.ctp:64
+msgid "Is a malware sample (encrypt and hash)"
+msgstr ""
+
+#: View/Attributes/add_attachment.ctp:73
+msgid "Advanced extraction (if installed)"
+msgstr ""
+
+#: View/Attributes/add_threatconnect.ctp:4
+msgid "Import ThreatConnect CSV file"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:2
+msgid "Alternate Search Results"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:3
+msgid "This is a list of events that match the given search criteria sorted according to the percentage of matched attributes that are marked as IDS signatures (blue = IDS matches, red = non IDS matches)."
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:6
+msgid "Event id"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:7
+#: View/Elements/Users/userIndexTable.ctp:4
+#: View/Pages/doc/administration.ctp:90;119;182;196;227
+#: View/Pages/doc/using_the_system.ctp:161;205;268;280
+msgid "Org"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:8
+#: View/EventBlacklists/edit.ctp:17
+#: View/Events/add_misp_export_result.ctp:5
+msgid "Event info"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:9
+msgid "Event date"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:10
+#: View/Events/view.ctp:446
+msgid "Event graph"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:11
+msgid "Matches"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:12
+#: View/Elements/Events/eventIndexTable.ctp:39
+msgid "Attribute Count"
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:6
+#: View/Pages/doc/using_the_system.ctp:117;119
+msgid "Attribute Replace Tool"
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:8
+msgid "Choose a category and a type, then paste a list of IOCs that match the selection into the field below. This will delete all of the attributes not found in the new inserted list, whilst creating the attributes that are in the new list but don't exist as attributes. Found matches will be left untouched."
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:19
+msgid "Mark all new attributes as to IDS"
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:26
+#: View/Noticelists/view.ctp:36
+#: View/Warninglists/view.ctp:35
+msgid "Values"
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:33;41
+#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Elements/eventattributecreation.ctp:86
+#: View/Events/free_text_import.ctp:22
+#: View/ShadowAttributes/add.ctp:46
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:94
+#: View/TemplateElements/ajax/template_element_add_file.ctp:70
+#: View/TemplateElements/ajax/template_element_add_text.ctp:32
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:89
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:70
+#: View/TemplateElements/ajax/template_element_edit_text.ctp:32
+msgid "Warning: You are about to share data that is of a classified nature (Attribution / targeting data). Make sure that you are authorised to share this."
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:38
+msgid "Replace attributes"
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:38
+msgid "Replaceattributes"
+msgstr ""
+
+#: View/Attributes/check_composites.ctp:2
+msgid "Failed Composites"
+msgstr ""
+
+#: View/Attributes/check_composites.ctp:4
+msgid "No Failed Composites"
+msgstr ""
+
+#: View/Attributes/edit.ctp:16
+#: View/Pages/doc/using_the_system.ctp:368
+msgid "disabled"
+msgstr ""
+
+#: View/Attributes/edit.ctp:68
+#: View/ShadowAttributes/add.ctp:55
+#: View/ShadowAttributes/edit.ctp:45;54
+msgid "Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this."
+msgstr ""
+
+#: View/Attributes/index.ctp:2
+#: View/Elements/histogram.ctp:4
+#: View/Events/view.ctp:455
+#: View/Objects/orphaned_object_diagnostics.ctp:44
+#: View/Pages/doc/using_the_system.ctp:242
+#: View/Users/statistics.ctp:16
+#: View/Users/statistics_data.ctp:19
+msgid "Attributes"
+msgstr ""
+
+#: View/Attributes/index.ctp:8
+msgid " with the value containing "
+msgstr ""
+
+#: View/Attributes/index.ctp:9
+msgid " being tagged with "
+msgstr ""
+
+#: View/Attributes/index.ctp:10
+msgid " from the events "
+msgstr ""
+
+#: View/Attributes/index.ctp:11
+msgid " carrying the tag(s) "
+msgstr ""
+
+#: View/Attributes/index.ctp:12
+msgid " of type "
+msgstr ""
+
+#: View/Attributes/index.ctp:13
+msgid " of category "
+msgstr ""
+
+#: View/Attributes/index.ctp:14
+msgid " created by organisation "
+msgstr ""
+
+#: View/Attributes/index.ctp:26
+msgid "Results for all attributes"
+msgstr ""
+
+#: View/Attributes/index.ctp:39;132
+#: View/Elements/eventattribute.ctp:60;229
+#: View/Elements/eventdiscussion.ctp:15;126
+#: View/Elements/generic_table.ctp:16
+#: View/Elements/generic_table_row.ctp:16
+#: View/Elements/Feeds/eventattribute.ctp:20;86
+#: View/Elements/Servers/eventattribute.ctp:20;86
+#: View/EventBlacklists/index.ctp:13;54
+#: View/Events/index.ctp:12;115
+#: View/Events/proposal_event_index.ctp:12;95
+#: View/Events/ajax/index.ctp:13;39
+#: View/Feeds/freetext_index.ctp:22;86
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
+#: View/Galaxies/index.ctp:13;53
+#: View/GalaxyClusters/ajax/index.ctp:11;97
+#: View/GalaxyElements/ajax/index.ctp:11;44
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
+#: View/Logs/event_index.ctp:17;61
+#: View/News/index.ctp:39
+#: View/Noticelists/index.ctp:13;83
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
+#: View/ObjectTemplates/index.ctp:13;137
+#: View/OrgBlacklists/index.ctp:13;52
+#: View/Organisations/index.ctp:42;159
+#: View/Regexp/admin_index.ctp:13;51
+#: View/Regexp/index.ctp:13;45
+#: View/Roles/admin_index.ctp:13;82
+#: View/Roles/index.ctp:13;55
+#: View/Servers/index.ctp:13;156
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
+#: View/Tags/index.ctp:21;141
+#: View/Tasks/index.ctp:18;106
+#: View/Taxonomies/index.ctp:13;63
+#: View/Taxonomies/view.ctp:53;181
+#: View/Templates/index.ctp:13;61
+#: View/Threads/index.ctp:13;98
+#: View/Users/admin_index.ctp:12;86
+#: View/Users/ajax/admin_index.ctp:13;32
+#: View/Warninglists/index.ctp:13;76
+#: View/Whitelists/admin_index.ctp:14;47
+#: View/Whitelists/index.ctp:14;42
+msgid "previous"
+msgstr ""
+
+#: View/Attributes/index.ctp:41;134
+#: View/Elements/eventattribute.ctp:62;231
+#: View/Elements/eventdiscussion.ctp:17;128
+#: View/Elements/generic_table.ctp:18
+#: View/Elements/generic_table_row.ctp:18
+#: View/Elements/Feeds/eventattribute.ctp:22;88
+#: View/Elements/Servers/eventattribute.ctp:22;88
+#: View/EventBlacklists/index.ctp:15;56
+#: View/Events/index.ctp:14;117
+#: View/Events/proposal_event_index.ctp:14;97
+#: View/Events/ajax/index.ctp:15;41
+#: View/Feeds/freetext_index.ctp:24;88
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
+#: View/Galaxies/index.ctp:15;55
+#: View/GalaxyClusters/ajax/index.ctp:13;99
+#: View/GalaxyElements/ajax/index.ctp:13;46
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
+#: View/Logs/event_index.ctp:19;63
+#: View/News/index.ctp:41
+#: View/Noticelists/index.ctp:15;85
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
+#: View/ObjectTemplates/index.ctp:15;139
+#: View/OrgBlacklists/index.ctp:15;54
+#: View/Organisations/index.ctp:44;161
+#: View/Regexp/admin_index.ctp:15;53
+#: View/Regexp/index.ctp:15;47
+#: View/Roles/admin_index.ctp:15;84
+#: View/Roles/index.ctp:15;57
+#: View/Servers/index.ctp:15;158
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
+#: View/Tags/index.ctp:23;143
+#: View/Tasks/index.ctp:20;108
+#: View/Taxonomies/index.ctp:15;65
+#: View/Taxonomies/view.ctp:55;183
+#: View/Templates/index.ctp:15;63
+#: View/Threads/index.ctp:15;100
+#: View/Users/admin_index.ctp:14;88
+#: View/Users/ajax/admin_index.ctp:15;34
+#: View/Warninglists/index.ctp:15;78
+#: View/Whitelists/admin_index.ctp:16;49
+#: View/Whitelists/index.ctp:16;44
+msgid "next"
+msgstr ""
+
+#: View/Attributes/index.ctp:53
+#: View/Elements/eventattribute.ctp:152
+#: View/Elements/Events/eventIndexTable.ctp:37
+#: View/Elements/Feeds/eventattribute.ctp:45
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/view.ctp:117
+#: View/Feeds/preview_event.ctp:16
+#: View/Noticelists/view.ctp:43
+#: View/Pages/doc/using_the_system.ctp:164;207;318
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
+#: View/Tags/index.ctp:10
+#: View/Templates/add.ctp:12
+#: View/Templates/edit.ctp:12
+#: View/Templates/view.ctp:19
+msgid "Tags"
+msgstr ""
+
+#: View/Attributes/index.ctp:54
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/Galaxies/index.ctp:2
+msgid "Galaxies"
+msgstr ""
+
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:161
+msgid "Correlate"
+msgstr ""
+
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Events/view.ctp:314
+#: View/Feeds/preview_event.ctp:73
+#: View/Pages/doc/using_the_system.ctp:235
+#: View/Servers/preview_event.ctp:95
+msgid "Related Events"
+msgstr ""
+
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:163
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+msgid "Feed hits"
+msgstr ""
+
+#: View/Attributes/index.ctp:61
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
+msgid "Sightings"
+msgstr ""
+
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
+#: View/Tags/index.ctp:73
+msgid "Activity"
+msgstr ""
+
+#: View/Attributes/index.ctp:63
+#: View/Elements/eventattribute.ctp:168
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/healthElements/files.ctp:33
+#: View/Elements/healthElements/workers.ctp:60
+#: View/Elements/templateElements/templateRowAttribute.ctp:94
+#: View/Elements/templateElements/templateRowFile.ctp:71
+#: View/Elements/templateElements/templateRowText.ctp:28
+#: View/EventBlacklists/index.ctp:27
+#: View/Events/export.ctp:31
+#: View/Events/resolved_attributes.ctp:53
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:51
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:66
+#: View/OrgBlacklists/index.ctp:26
+#: View/Organisations/index.ctp:102
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:25
+#: View/Roles/admin_index.ctp:35
+#: View/Servers/index.ctp:37
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:27
+#: View/Templates/index.ctp:27
+#: View/Threads/index.ctp:28
+#: View/Warninglists/index.ctp:38
+#: View/Whitelists/admin_index.ctp:24
+msgid "Actions"
+msgstr ""
+
+#: View/Attributes/index.ctp:125
+#: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
+#: View/EventBlacklists/index.ctp:47
+#: View/Events/index.ctp:108
+#: View/Events/proposal_event_index.ctp:88
+#: View/Events/ajax/index.ctp:32
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
+#: View/Galaxies/index.ctp:46
+#: View/GalaxyClusters/ajax/index.ctp:91
+#: View/GalaxyElements/ajax/index.ctp:38
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
+#: View/Logs/event_index.ctp:54
+#: View/News/index.ctp:33
+#: View/Noticelists/index.ctp:76
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:66
+#: View/ObjectTemplates/index.ctp:130
+#: View/OrgBlacklists/index.ctp:45
+#: View/Organisations/index.ctp:152
+#: View/Regexp/admin_index.ctp:43
+#: View/Regexp/index.ctp:38
+#: View/Roles/admin_index.ctp:75
+#: View/Roles/index.ctp:48
+#: View/Servers/index.ctp:149
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
+#: View/Tags/index.ctp:134
+#: View/Tasks/index.ctp:99
+#: View/Taxonomies/index.ctp:56
+#: View/Taxonomies/view.ctp:174
+#: View/Templates/index.ctp:54
+#: View/Threads/index.ctp:91
+#: View/Users/admin_index.ctp:79
+#: View/Users/ajax/admin_index.ctp:25
+#: View/Warninglists/index.ctp:69
+#: View/Whitelists/admin_index.ctp:40
+#: View/Whitelists/index.ctp:35
+msgid "Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}"
+msgstr ""
+
+#: View/Attributes/report_validation_issues_attributes.ctp:2
+msgid "Listing invalid attribute validations"
+msgstr ""
+
+#: View/Attributes/report_validation_issues_attributes.ctp:6
+msgid "Validation errors for attribute: "
+msgstr ""
+
+#: View/Attributes/report_validation_issues_attributes.ctp:10
+msgid "Value found: "
+msgstr ""
+
+#: View/Attributes/report_validation_issues_attributes.ctp:10
+#: View/Elements/templateElements/populateTemplateFile.ctp:21
+#: View/Errors/error403.ctp:3
+msgid "Error"
+msgstr ""
+
+#: View/Attributes/report_validation_issues_attributes.ctp:13
+msgid "[Attribute details]"
+msgstr ""
+
+#: View/Attributes/search.ctp:4
+msgid "Search Attribute"
+msgstr ""
+
+#: View/Attributes/search.ctp:5
+msgid "You can search for attributes based on contained expression within the value, event ID, submitting organisation, category and type. <br />For the value, event ID and organisation, you can enter several search terms by entering each term as a new line. To exclude things from a result, use the NOT operator (!) in front of the term."
+msgstr ""
+
+#: View/Attributes/search.ctp:7
+msgid "For string searches (such as searching for an expression, tags, etc) - lookups are simple string matches. If you want a substring match encapsulate the lookup string between \"%\" characters."
+msgstr ""
+
+#: View/Attributes/search.ctp:10
+msgid "Containing the following expressions"
+msgstr ""
+
+#: View/Attributes/search.ctp:11
+msgid "Having tag or being an attribute of an event having the tag"
+msgstr ""
+
+#: View/Attributes/search.ctp:12
+msgid "Being attributes of the following event IDs, event UUIDs or attribute UUIDs"
+msgstr ""
+
+#: View/Attributes/search.ctp:15
+msgid "From the following organisation(s)"
+msgstr ""
+
+#: View/Attributes/search.ctp:29
+msgid "Only find IOCs flagged as to_ids"
+msgstr ""
+
+#: View/Attributes/search.ctp:33
+msgid "Alternate Search Result (Events)"
+msgstr ""
+
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:6
+msgid "Attribute Deletion"
+msgstr ""
+
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:9
+msgid "Are you sure you want to hard-delete Attribute #%s? The Attribute will be permanently deleted and unrecoverable. Also, this will prevent the deletion to be propagated to other instances."
+msgstr ""
+
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:10
+msgid "Are you sure you want to soft-delete Attribute #%s? The Attribute will only be soft deleted, meaning that it is not completely purged. Click on Include deleted attributes and delete the soft deleted attribute if you want to permanently remove it."
+msgstr ""
+
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:16
+#: View/Elements/eventdiscussion.ctp:90
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
+#: View/Elements/healthElements/files.ctp:73
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
+#: View/Events/view_graph.ctp:30
+#: View/Feeds/index.ctp:265
+#: View/ObjectReferences/ajax/delete.ctp:32
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:140
+#: View/Pages/doc/using_the_system.ctp:192
+#: View/Roles/admin_index.ctp:67
+#: View/Servers/index.ctp:138
+#: View/Tags/index.ctp:125
+msgid "Delete"
+msgstr ""
+
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:16
+#: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+#: View/Attributes/ajax/attributeRestorationForm.ctp:11
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
+#: View/Attributes/ajax/toggle_correlation.ctp:20
+#: View/Elements/Servers/View/row_attribute.ctp:142
+#: View/Elements/Users/userIndexTable.ctp:47;50;57;64;76;82
+#: View/Elements/templateElements/templateRowAttribute.ctp:63;74;86
+#: View/Elements/templateElements/templateRowFile.ctp:42;53;64
+#: View/EventDelegations/ajax/accept_delegation.ctp:10
+#: View/EventDelegations/ajax/delegate_event.ctp:35
+#: View/EventDelegations/ajax/delete_delegation.ctp:10
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
+#: View/Events/export.ctp:56
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Events/ajax/handleSelected.ctp:17
+#: View/Events/ajax/toggle_correlation.ctp:20
+#: View/Feeds/preview_event.ctp:56
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
+#: View/ObjectReferences/ajax/delete.ctp:32
+#: View/Objects/revise_object.ctp:67
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Servers/preview_event.ctp:79
+#: View/Servers/ajax/update.ctp:11
+#: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
+#: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
+#: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
+#: View/Taxonomies/view.ctp:26
+#: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+#: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
+#: View/Templates/view.ctp:41
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:27
+msgid "Yes"
+msgstr ""
+
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:21
+#: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
+#: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
+#: View/Attributes/ajax/toggle_correlation.ctp:25
+#: View/Elements/Servers/View/row_attribute.ctp:142
+#: View/Elements/Users/userIndexTable.ctp:47;50;57;64;76;82
+#: View/Elements/templateElements/templateRowAttribute.ctp:64;75;87
+#: View/Elements/templateElements/templateRowFile.ctp:43;54;65
+#: View/EventDelegations/ajax/accept_delegation.ctp:17
+#: View/EventDelegations/ajax/delegate_event.ctp:37
+#: View/EventDelegations/ajax/delete_delegation.ctp:17
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
+#: View/Events/export.ctp:58;176
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
+#: View/Events/ajax/handleSelected.ctp:22
+#: View/Events/ajax/toggle_correlation.ctp:25
+#: View/Feeds/preview_event.ctp:61;66
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
+#: View/Noticelists/ajax/delete_confirmation.ctp:25
+#: View/ObjectReferences/ajax/delete.ctp:37
+#: View/Objects/revise_object.ctp:67
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Servers/preview_event.ctp:89
+#: View/Servers/ajax/update.ctp:16
+#: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
+#: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
+#: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
+#: View/Taxonomies/view.ctp:26
+#: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
+#: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
+#: View/Templates/view.ctp:42
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:32
+#: View/Warninglists/ajax/delete_confirmation.ctp:25
+msgid "No"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
+#: View/Attributes/ajax/attributeEditCommentForm.ctp:5
+#: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
+#: View/Attributes/ajax/attributeEditTypeForm.ctp:5
+#: View/Attributes/ajax/attributeEditValueForm.ctp:6
+msgid "Accept change"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
+#: View/Attributes/ajax/attributeEditCommentForm.ctp:6
+#: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
+#: View/Attributes/ajax/attributeEditTypeForm.ctp:6
+#: View/Attributes/ajax/attributeEditValueForm.ctp:7
+msgid "Discard change"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:6
+msgid "Mass Edit Attributes"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:12;31
+msgid "Do not alter current settings"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:15
+#: View/Elements/eventattributecreation.ctp:30
+#: View/Events/resolved_attributes.ctp:50
+#: View/Events/view.ctp:145
+#: View/Feeds/add.ctp:167
+#: View/Feeds/edit.ctp:164
+#: View/Feeds/freetext_index.ctp:36
+#: View/Objects/add.ctp:41;99
+#: View/Objects/revise_object.ctp:27;50
+#: View/Pages/doc/using_the_system.ctp:34;90;126;186;211;237
+#: View/Servers/preview_event.ctp:53
+#: View/Templates/populate_event_from_template_attributes.ctp:11
+#: View/Threads/index.ctp:27
+msgid "Distribution"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:33
+#: View/Pages/doc/using_the_system.ctp:96
+msgid "For Intrusion Detection System"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+msgid "Tags to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+msgid "Tags to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+msgid "Clusters to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+msgid "Clusters to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
+#: View/Attributes/ajax/attributeRestorationForm.ctp:5
+msgid "Attribute Restoration"
+msgstr ""
+
+#: View/Attributes/ajax/attributeRestorationForm.ctp:7
+msgid "Are you sure you want to undelete Attribute #%s?"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:2
+msgid "Choose the format that you wish to download the search results in"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:10;23
+#: View/Events/ajax/exportChoice.ctp:17;18;27;28
+msgid "Export as %s"
+msgstr ""
+
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
+msgid "Remove Tag"
+msgstr ""
+
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:8
+msgid "Remove tag "
+msgstr ""
+
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:8
+msgid "from "
+msgstr ""
+
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
+msgid "Remove"
+msgstr ""
+
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+msgid "Toggle Correlation %s "
+msgstr ""
+
+#: View/Attributes/ajax/toggle_correlation.ctp:11
+msgid "Re-enable the correlation for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/toggle_correlation.ctp:13
+msgid "This will remove all correlations that already exist for this attribute and prevents any attributes to be related as long as this setting is disabled. Make sure you understand the downsides of disabling correlations."
+msgstr ""
+
+#: View/Attributes/ajax/toggle_correlation.ctp:20
+msgid "Toggle correlation for attribute"
+msgstr ""
+
+#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Elements/ajaxTagCollectionTags.ctp:16
+#: View/Elements/ajaxTags.ctp:14
+#: View/Elements/ajaxTemplateTag.ctp:10
+#: View/Elements/serverRuleElements/ajaxTags.ctp:17
+msgid "Remove tag"
+msgstr ""
+
+#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Pages/doc/using_the_system.ctp:303
+#: View/Templates/add.ctp:17
+#: View/Templates/edit.ctp:17
+msgid "Add tag"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:17
+msgid "Remove tag %s"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:27;30
+#: View/Templates/add.ctp:28
+#: View/Templates/edit.ctp:28
+msgid "Add a tag"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:71;240
+#: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
+#: View/Elements/Servers/eventattribute.ctp:28;31;94;97
+msgid "view all"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:134
+#: View/Elements/Events/eventIndexTable.ctp:5
+#: View/Feeds/index.ctp:89
+msgid "Select all"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:134
+msgid "Select all attributes/proposals on current page"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:209
+msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
+"a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
+"attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:213
+msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
+msgstr ""
+
+#: View/Elements/eventattributecreation.ctp:57
+msgid "Create multiple attributes one per line"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:34
+msgid "Date: "
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:52
+msgid "Deactivated user"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:89;97
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/View/row_attribute.ctp:380
+#: View/Elements/Users/userIndexTable.ctp:90
+#: View/Feeds/edit.ctp:193
+#: View/OrgBlacklists/edit.ctp:22
+#: View/Pages/doc/using_the_system.ctp:191
+#: View/Servers/index.ctp:137
+#: View/Tags/edit.ctp:36
+#: View/Templates/edit.ctp:49
+msgid "Edit"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:90;98
+msgid "Are you sure you want to delete this post?"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:93;100
+msgid "Reply"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:141
+#: View/Posts/add.ctp:32
+msgid "Insert a quote - just paste your quote between the [quote][/quote] tags."
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:141
+#: View/Posts/add.ctp:32
+msgid "Quote"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:142
+msgid "Insert a link to an event - just enter the event ID between the [event][/event] tags."
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:142
+#: View/Events/view.ctp:196;207
+#: View/Objects/orphaned_object_diagnostics.ctp:21
+#: View/Pages/doc/administration.ctp:167
+#: View/Pages/doc/using_the_system.ctp:200;279
+#: View/Posts/add.ctp:33
+#: View/ShadowAttributes/index.ctp:41
+msgid "Event"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:143
+#: View/Posts/add.ctp:34
+msgid "Insert a link to a discussion thread - enter the thread's ID between the [thread][/thread] tags."
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:143
+#: View/Posts/add.ctp:34
+msgid "Thread"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:144
+#: View/Posts/add.ctp:35
+msgid "Insert a link [link][/link] tags."
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:144
+#: View/Posts/add.ctp:35
+msgid "Link"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:145
+#: View/Posts/add.ctp:36
+msgid "Insert a code [code][/code] tags."
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:145
+#: View/Posts/add.ctp:36
+msgid "Code"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:156
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
+msgid "Send"
+msgstr ""
+
+#: View/Elements/flashErrorMessage.ctp:2
+msgid "Errors"
+msgstr ""
+
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Jobs/ajax/error.ctp:34
+msgid "Close"
+msgstr ""
+
+#: View/Elements/footer.ctp:5
+msgid "Keyboard shortcuts for this page"
+msgstr ""
+
+#: View/Elements/footer.ctp:6
+msgid "none"
+msgstr ""
+
+#: View/Elements/footer.ctp:15
+#: View/Users/admin_add.ctp:70
+#: View/Users/admin_edit.ctp:64
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
+msgid "GnuPG key"
+msgstr ""
+
+#: View/Elements/footer.ctp:17
+msgid "Could not locate the GnuPG public key."
+msgstr ""
+
+#: View/Elements/footer.ctp:24
+msgid "Could not locate SMIME certificate."
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:8
+msgid "View details about this galaxy"
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:19
+#: View/Elements/galaxyQuickViewMini.ctp:69
+msgid "View details about this cluster"
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:20
+#: View/Elements/galaxyQuickViewMini.ctp:70
+msgid "View all events containing this cluster."
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "Are you sure you want to detach %s from this event?"
+msgstr ""
+
+#: View/Elements/galaxyQuickViewMini.ctp:74
+msgid "Are you sure you want to detach %s from this %s?"
+msgstr ""
+
+#: View/Elements/galaxyQuickViewMini.ctp:89
+msgid "Add new cluster"
+msgstr ""
+
+#: View/Elements/galaxyQuickViewMini.ctp:89
+#: View/EventBlacklists/add.ctp:35
+#: View/EventBlacklists/edit.ctp:29
+#: View/Events/add.ctp:68
+#: View/Events/filter_event_index.ctp:125
+#: View/Feeds/add.ctp:198
+#: View/Feeds/import_feeds.ctp:19
+#: View/OrgBlacklists/add.ctp:28
+#: View/Regexp/admin_add.ctp:32
+#: View/Regexp/admin_edit.ctp:42
+#: View/Roles/admin_add.ctp:44
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
+#: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:19
+#: View/Tags/add.ctp:35
+#: View/Users/admin_filter_user_index.ctp:62
+#: View/Whitelists/admin_add.ctp:13
+msgid "Add"
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:205
+msgid "Due to the large number of options, no contextual information is provided."
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:273
+msgid "Nothing to pick"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:11
+#: View/Pages/doc/general.ctp:20
+msgid "Event Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
+#: View/Events/export_alternate.ctp:87
+#: View/Pages/doc/general.ctp:34
+msgid "List Events"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
+#: View/Events/add.ctp:4
+#: View/Events/export_alternate.ctp:89
+#: View/Pages/doc/general.ctp:35
+msgid "Add Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
+#: View/Events/export_alternate.ctp:92
+#: View/Pages/doc/general.ctp:36
+msgid "List Attributes"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
+#: View/Events/export_alternate.ctp:93
+#: View/Pages/doc/general.ctp:37
+msgid "Search Attributes"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
+#: View/Servers/rest.ctp:20
+msgid "REST client"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
+#: View/Pages/doc/general.ctp:38
+msgid "View Proposals"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
+#: View/Pages/doc/general.ctp:39
+msgid "Events with proposals"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
+#: View/Pages/doc/general.ctp:40
+msgid "List Tags"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
+msgid "List Tag Collections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
+#: View/Pages/doc/general.ctp:41
+#: View/Tags/add.ctp:4
+#: View/Tags/edit.ctp:4
+msgid "Add Tag"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
+msgid "List Taxonomies"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
+#: View/Pages/doc/general.ctp:42
+msgid "List Templates"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
+#: View/Pages/doc/general.ctp:43
+msgid "Add Template"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:78
+#: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
+#: View/Events/export.ctp:2
+#: View/Events/export_alternate.ctp:2;95
+#: View/Pages/doc/general.ctp:44
+msgid "Export"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
+#: View/Events/automation.ctp:2
+#: View/Events/export_alternate.ctp:97
+#: View/Events/legacy_automation.ctp:2
+#: View/Pages/doc/general.ctp:45
+#: View/Pages/doc/using_the_system.ctp:15;361
+msgid "Automation"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
+msgid "List Galaxies"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:101
+#: View/Pages/doc/general.ctp:21
+msgid "Input Filters"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:104;109
+#: View/Pages/doc/administration.ctp:12;64
+#: View/Pages/doc/general.ctp:50
+#: View/Pages/doc/user_management.ctp:69
+#: View/Regexp/admin_index.ctp:2
+#: View/Regexp/index.ctp:2
+msgid "Import Regexp"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:114;119
+#: View/Pages/doc/administration.ctp:13
+#: View/Pages/doc/general.ctp:51
+#: View/Pages/doc/user_management.ctp:70
+#: View/Whitelists/admin_index.ctp:2
+#: View/Whitelists/index.ctp:2
+msgid "Signature Whitelist"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
+msgid "List Warninglists"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:128
+msgid "List Noticelists"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:135
+#: View/Pages/doc/general.ctp:22;54
+msgid "Global Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:139
+#: View/News/index.ctp:2
+#: View/Pages/doc/general.ctp:56
+#: View/Pages/doc/user_management.ctp:51
+msgid "News"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
+#: View/Pages/doc/general.ctp:57
+msgid "My Profile"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
+#: View/Users/dashboard.ctp:2
+msgid "Dashboard"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/view.ctp:39
+#: View/Users/statistics.ctp:27
+#: View/Users/statistics_data.ctp:34
+msgid "Organisations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
+#: View/Pages/doc/general.ctp:59
+msgid "Role Permissions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
+msgid "List Object Templates"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
+msgid "List Sharing Groups"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
+msgid "Add Sharing Group"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
+#: View/Events/legacy_automation.ctp:42
+#: View/Pages/doc/general.ctp:60
+#: View/Pages/doc/user_management.ctp:53
+msgid "User Guide"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:186
+msgid "Categories & Types"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
+#: View/Pages/doc/general.ctp:62
+#: View/Pages/doc/user_management.ctp:55
+#: View/Users/statistics.ctp:7
+#: View/Users/statistics_attackmatrix.ctp:2
+#: View/Users/statistics_data.ctp:7
+#: View/Users/statistics_orgs.ctp:7
+#: View/Users/statistics_sightings.ctp:2
+#: View/Users/statistics_tags.ctp:7
+#: View/Users/statistics_users.ctp:2
+msgid "Statistics"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:201
+#: View/Pages/doc/general.ctp:92
+msgid "List Discussions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:205
+#: View/Pages/doc/general.ctp:93
+msgid "Start Discussion"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:212
+#: View/Pages/doc/general.ctp:23;66
+msgid "Sync Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
+#: View/Pages/doc/general.ctp:68
+msgid "List Servers"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
+msgid "List Feeds"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:229
+#: View/Pages/doc/administration.ctp:8
+#: View/Pages/doc/concepts.ctp:8
+#: View/Pages/doc/general.ctp:8;24;71
+#: View/Pages/doc/quickstart.ctp:8
+#: View/Pages/doc/user_management.ctp:14
+#: View/Pages/doc/using_the_system.ctp:21
+msgid "Administration"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
+#: View/Pages/doc/general.ctp:74
+msgid "List Users"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
+msgid "Add User"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
+#: View/Pages/doc/general.ctp:77
+msgid "Contact Users"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
+msgid "List Organisations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
+#: View/Pages/doc/general.ctp:76
+msgid "List Roles"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
+#: View/Jobs/index.ctp:2
+#: View/Pages/doc/general.ctp:80
+msgid "Jobs"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
+#: View/Pages/doc/concepts.ctp:36
+#: View/Pages/doc/general.ctp:81
+#: View/Tasks/index.ctp:3
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:300
+msgid "Blacklist Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
+msgid "Manage Event Blacklists"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:314
+msgid "Blacklist Organisation"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
+msgid "Manage Org Blacklists"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:327
+#: View/Pages/doc/general.ctp:25;84
+msgid "Audit"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
+#: View/Pages/doc/general.ctp:86
+msgid "List Logs"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
+#: View/Logs/admin_search.ctp:4
+#: View/Pages/doc/general.ctp:87
+msgid "Search Logs"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:362;367
+#: View/Pages/doc/general.ctp:28;63
+msgid "Log out"
+msgstr ""
+
+#: View/Elements/histogram.ctp:1
+msgid "Attribute Types Histogram"
+msgstr ""
+
+#: View/Elements/histogram.ctp:4
+msgid "you can also choose specific histogram items by clicking on attributes below"
+msgstr ""
+
+#: View/Elements/histogram.ctp:15
+msgid "Toggle histogram"
+msgstr ""
+
+#: View/Elements/histogram.ctp:31
+msgid "Attributes per organization"
+msgstr ""
+
+#: View/Elements/view_event_distribution_graph.ctp:9
+#: View/Layouts/default.ctp:87
+#: View/Layouts/graph.ctp:84
+msgid "Loading"
+msgstr ""
+
+#: View/Elements/view_event_distribution_graph.ctp:17
+msgid "Elements having lower distribution level than the event"
+msgstr ""
+
+#: View/Elements/view_event_distribution_graph.ctp:18
+msgid "Distribution of the event"
+msgstr ""
+
+#: View/Elements/view_event_distribution_graph.ctp:19
+msgid "Inconsistent distribution level, fallback on the event distribution"
+msgstr ""
+
+#: View/Elements/view_event_distribution_graph.ctp:23
+msgid "Sharing group"
+msgstr ""
+
+#: View/Elements/view_event_graph.ctp:9
+#: View/Noticelists/view.ctp:40
+msgid "Scope"
+msgstr ""
+
+#: View/Elements/view_event_graph.ctp:12
+msgid "Physics"
+msgstr ""
+
+#: View/Elements/view_event_graph.ctp:13
+msgid "Display"
+msgstr ""
+
+#: View/Elements/view_event_graph.ctp:14
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
+#: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
+msgid "Filters"
+msgstr ""
+
+#: View/Elements/view_event_graph.ctp:16
+msgid "History"
+msgstr ""
+
+#: View/Elements/view_event_graph.ctp:22
+#: View/Events/view_graph.ctp:16
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: View/Elements/view_galaxy_matrix.ctp:91
+msgid "Show all"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:5
+#: View/Feeds/index.ctp:89
+msgid "Select all events on current page"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:35
+msgid "Clusters"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:41
+msgid "Correlation Count"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:41
+msgid "#Corr."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:44
+msgid "Sigthing Count"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:44
+msgid "#Sightings"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:47
+msgid "Proposal Count"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:47
+msgid "#Prop"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:50
+msgid "Post Count"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:50
+msgid "#Posts"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/dashboard/dashboard_events.ctp:4;5
+#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
+#: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/preview_index.ctp:174
+#: View/Taxonomies/index.ctp:47
+#: View/Warninglists/index.ctp:60
+msgid "View"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
+msgid " proposal(s)"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:190
+msgid "NEW"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
+msgid "Are you sure this event is complete and everyone should be informed?"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:222
+msgid "Not published"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr ""
+
+#: View/Elements/Events/View/attribute_correlations.ctp:7
+msgid "Show "
+msgstr ""
+
+#: View/Elements/Events/View/attribute_correlations.ctp:7
+msgid " more..."
+msgstr ""
+
+#: View/Elements/Events/View/attribute_correlations.ctp:43
+#: View/Events/view.ctp:346
+msgid "Collapse…"
+msgstr ""
+
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr ""
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:343
+msgid "Restore attribute"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:344;384
+msgid "Permanently delete attribute"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:351
+msgid "Query enrichment"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:351
+msgid "Propose enrichment"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:356
+msgid "Query Cortex"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:356
+msgid "Propose enrichment through Cortex"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:360
+msgid "Propose Edit"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:361
+msgid "Propose Deletion"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:371;376
+msgid "Add enrichment"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:376
+msgid "Add enrichment via Cortex"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:388
+msgid "Soft-delete attribute"
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:65
+#: View/Elements/Feeds/View/row_object.ctp:16
+msgid "Name: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:66
+#: View/Elements/Events/View/row_object_reference.ctp:21
+#: View/Elements/Events/View/row_object_referenced_by.ctp:7
+#: View/Elements/Feeds/View/row_object.ctp:17
+#: View/Elements/Feeds/View/row_object_reference.ctp:7
+#: View/Elements/Feeds/View/row_object_referenced_by.ctp:7
+#: View/Elements/Servers/View/row_object.ctp:17
+#: View/Elements/Servers/View/row_object_reference.ctp:7
+#: View/Elements/Servers/View/row_object_referenced_by.ctp:7
+msgid "Expand or Collapse"
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:69
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:70
+msgid "Meta-category: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Feeds/View/row_object.ctp:21
+msgid "Description: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:72
+#: View/Elements/Feeds/View/row_object.ctp:22
+msgid "Template: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:125
+msgid "Permanently delete object"
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:125
+msgid "Soft delete object"
+msgstr ""
+
+#: View/Elements/Events/View/row_object_reference.ctp:1
+#: View/Elements/Feeds/View/row_object_reference.ctp:1
+msgid "References: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object_reference.ctp:28
+#: View/Elements/Servers/View/row_object_reference.ctp:11
+msgid "Add reference"
+msgstr ""
+
+#: View/Elements/Events/View/row_object_reference.ctp:51
+msgid "Delete object reference"
+msgstr ""
+
+#: View/Elements/Events/View/row_object_referenced_by.ctp:1
+#: View/Elements/Feeds/View/row_object_referenced_by.ctp:1
+msgid "Referenced by: "
+msgstr ""
+
+#: View/Elements/Events/View/row_proposal.ctp:183
+#: View/Elements/Events/View/row_proposal_delete.ctp:77
+msgid "Accept Proposal"
+msgstr ""
+
+#: View/Elements/Events/View/row_proposal.ctp:183
+#: View/Elements/Events/View/row_proposal_delete.ctp:77
+msgid "Accept proposal"
+msgstr ""
+
+#: View/Elements/Events/View/row_proposal.ctp:188
+#: View/Elements/Events/View/row_proposal_delete.ctp:82
+msgid "Discard proposal"
+msgstr ""
+
+#: View/Elements/Events/View/sighting_field.ctp:12
+#: View/Sightings/ajax/add_sighting.ctp:33
+#: View/Sightings/ajax/advanced.ctp:10
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
+msgid "Add sighting"
+msgstr ""
+
+#: View/Elements/Events/View/sighting_field.ctp:13
+msgid "Mark as false-positive"
+msgstr ""
+
+#: View/Elements/Events/View/sighting_field.ctp:14
+msgid "Advanced sightings"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:46
+#: View/Elements/Servers/View/value_field.ctp:43
+msgid "Hexadecimal representation"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:46
+#: View/Elements/Feeds/View/value_field.ctp:43
+#: View/Elements/Servers/View/value_field.ctp:43
+msgid "Switch to binary representation"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:51
+#: View/Elements/Feeds/View/value_field.ctp:48
+msgid "Warning, this doesn't seem to be a legitimate "
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:51
+#: View/Elements/Feeds/View/value_field.ctp:48
+#: View/Elements/Servers/View/value_field.ctp:48
+msgid " value"
+msgstr ""
+
+#: View/Elements/Feeds/View/row_object.ctp:20
+#: View/Elements/Servers/View/row_object.ctp:20
+#: View/ObjectTemplates/view.ctp:8
+#: View/Objects/revise_object.ctp:23
+msgid "Meta-category"
+msgstr ""
+
+#: View/Elements/Feeds/View/value_field.ctp:32
+#: View/Elements/Servers/View/value_field.ctp:32
+msgid "Cortex object"
+msgstr ""
+
+#: View/Elements/Servers/eventattribute.ctp:31;97
+msgid "all"
+msgstr ""
+
+#: View/Elements/Servers/eventattribute.ctp:41
+#: View/Events/view.ctp:131
+#: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
+#: View/Servers/preview_event.ctp:36
+#: View/Sightings/ajax/list_sightings.ctp:5
+msgid "Date"
+msgstr ""
+
+#: View/Elements/Servers/eventattribute.ctp:49
+#: View/Elements/templateElements/templateRowAttribute.ctp:82
+#: View/Events/resolved_attributes.ctp:49
+#: View/Feeds/freetext_index.ctp:34
+#: View/Objects/add.ctp:97
+#: View/Pages/doc/using_the_system.ctp:236;285
+#: View/Templates/populate_event_from_template_attributes.ctp:10
+msgid "IDS"
+msgstr ""
+
+#: View/Elements/Servers/Module/type.ctp:11
+#: View/Elements/healthElements/diagnostics.ctp:276
+#: View/Pages/doc/administration.ctp:56;228
+msgid "Status"
+msgstr ""
+
+#: View/Elements/Servers/View/row_attribute.ctp:93
+#: View/Elements/Users/userIndexTable.ctp:66;67;70
+#: View/Elements/healthElements/files.ctp:61
+#: View/Elements/healthElements/workers.ctp:66;67;68
+#: View/Events/automation.ctp:234;241;248;269;276
+#: View/Events/export.ctp:68;88
+#: View/Events/legacy_automation.ctp:403;410;417;438;445
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
+msgid "N/A"
+msgstr ""
+
+#: View/Elements/Servers/View/row_object.ctp:16
+#: View/Elements/templateElements/templateRowAttribute.ctp:12
+#: View/Elements/templateElements/templateRowFile.ctp:12
+#: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Galaxies/view.ctp:14
+#: View/ObjectTemplates/view.ctp:4
+#: View/Objects/revise_object.ctp:19
+#: View/Organisations/ajax/merge.ctp:57;64
+#: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
+#: View/SharingGroups/view.ctp:42;67
+#: View/Templates/view.ctp:9
+#: View/Users/statistics_orgs.ctp:31
+#: View/Warninglists/view.ctp:10
+msgid "Name"
+msgstr ""
+
+#: View/Elements/Servers/View/row_object.ctp:21
+#: View/Elements/healthElements/files.ctp:8
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:10
+#: View/Elements/templateElements/populateTemplateDescription.ctp:12
+#: View/Elements/templateElements/populateTemplateFile.ctp:10
+#: View/Elements/templateElements/templateRowAttribute.ctp:21
+#: View/Elements/templateElements/templateRowFile.ctp:21
+#: View/Events/export.ctp:27
+#: View/Galaxies/view.ctp:20
+#: View/ObjectTemplates/view.ctp:9
+#: View/Objects/add.ctp:16;94
+#: View/Organisations/view.ctp:15;58;59
+#: View/Pages/doc/administration.ctp:48;241
+#: View/Pages/doc/categories_and_types.ctp:44;61
+#: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
+#: View/Servers/preview_event.ctp:65
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
+#: View/Taxonomies/view.ctp:14
+#: View/Templates/view.ctp:14
+#: View/Warninglists/view.ctp:11
+msgid "Description"
+msgstr ""
+
+#: View/Elements/Servers/View/row_object.ctp:22
+#: View/Templates/view.ctp:2
+msgid "Template"
+msgstr ""
+
+#: View/Elements/Servers/View/row_object_reference.ctp:1
+#: View/Objects/orphaned_object_diagnostics.ctp:53
+msgid "References"
+msgstr ""
+
+#: View/Elements/Servers/View/row_object_referenced_by.ctp:1
+#: View/Objects/orphaned_object_diagnostics.ctp:62
+msgid "Referenced by"
+msgstr ""
+
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:5
+#: View/Roles/view.ctp:24
+#: View/Users/admin_add.ctp:55
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
+msgid "Role"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:16
+msgid "Last login"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:17
+#: View/Pages/doc/administration.ctp:183
+#: View/Pages/doc/using_the_system.ctp:272
+#: View/ShadowAttributes/index.ctp:64
+msgid "Created"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:88
+msgid "Initiate password refresh"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:88
+msgid "Create new credentials and inform user"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_events.ctp:2
+msgid "Changes since last visit"
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_events.ctp:4
+msgid "Events updated: "
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_events.ctp:5
+msgid "Events published: "
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_notifications.ctp:2
+msgid "Notifications"
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_notifications.ctp:4
+msgid "Proposals: "
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_notifications.ctp:5
+msgid "Events with proposals: "
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_notifications.ctp:9
+msgid "Delegation requests: "
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:5
+msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:9
+msgid "MISP version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:10
+msgid "Every version of MISP includes a json file with the current version. This is checked against the latest tag on github, if there is a version mismatch the tool will warn you about it. Make sure that you update MISP regularly."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:12
+msgid "Currently installed version…"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:18
+msgid "Upcoming development version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:22
+msgid "Outdated version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
+#: View/Elements/healthElements/workers.ctp:23;76
+#: View/Events/add_misp_export_result.ctp:23
+#: View/Servers/ajax/zeromqstatus.ctp:11
+msgid "OK"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:30
+msgid "Could not retrieve version from github"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:39
+msgid "Latest available version…"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:46
+msgid "Status…"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:53
+msgid "Current branch…"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:62
+msgid "Pull the latest MISP version from github"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:62
+msgid "Update MISP"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:64
+msgid "Writeable Directories and files"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:65
+msgid "The following directories and files have to be writeable for MISP to function properly. Make sure that the apache user has write privileges for the directories below."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:66
+msgid "Directories"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:73
+msgid "Directory "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:81
+msgid "Writeable Files"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:88;102
+msgid "File "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:95
+msgid "Readable Files"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:110
+msgid "PHP Settings"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:113;125
+msgid "Up to date"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:119
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
+msgid "Unknown"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:121
+msgid "Issues determining version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:128;137
+msgid "Update highly recommended"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:131;140
+msgid "Version unsupported, update ASAP"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:144
+msgid "PHP ini path"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:145
+msgid "PHP Version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:145;146
+msgid "recommended"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:146
+msgid "PHP CLI Version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
+msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:155
+#: View/Events/filter_event_index.ctp:32;190
+#: View/Pages/doc/using_the_system.ctp:66;171
+msgid "Low"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:159
+msgid "PHP Extensions"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:169
+msgid "Not loaded"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:174
+msgid "Issues reading PHP settings. This could be due to the test script not being readable."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:182
+msgid "Advanced attachment handler"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:183
+msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:188
+msgid "PyMISP"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:188
+msgid "Not installed or version outdated."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:200
+msgid "STIX and Cybox libraries"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:201
+msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:202
+msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:209
+msgid "Other versions might work but are not tested / recommended."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:218
+msgid "STIX and CyBox"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:218
+msgid "Could not read test script (stixtest.py)."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:232
+msgid " library version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:249
+msgid "GnuPG"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:250
+msgid "This tool tests whether your GnuPG is set up correctly or not."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:258
+msgid "GnuPG installation and settings"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:261
+msgid "ZeroMQ"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:262
+msgid "This tool tests whether the ZeroMQ extension is installed and functional."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:270
+msgid "ZeroMQ settings"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:274
+msgid "Start ZMQ service"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:274
+msgid "Start ZeroMQ service"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:274
+msgid "Start"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:275
+msgid "Stop ZeroMQ service"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:275
+msgid "Stop"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:276
+msgid "Check ZeroMQ service status"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:278
+msgid "Proxy"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:279
+msgid "This tool tests whether your HTTP proxy settings are correct."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:287
+#: View/Pages/doc/administration.ctp:35
+msgid "Proxy settings"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:290
+msgid "Module System"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:291
+msgid "This tool tests the various module systems and whether they are reachable based on the module settings."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:306
+msgid " module system"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:312
+msgid "Session table"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:313
+msgid "This tool checks how large your database's session table is. <br />Sessions in CakePHP rely on PHP's garbage collection for clean-up and in certain distributions this can be disabled by default resulting in an ever growing cake session table. <br />If you are affected by this, just click the clean session table button below."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:320
+msgid "Expired sessions"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:326
+msgid "Purge sessions"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:330
+msgid "Clean model cache"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:331
+msgid "If you ever run into issues with missing database fields / tables, please run the following script to clean the model cache."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:332
+msgid "Clean cache"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:333
+msgid "Overwritten objects"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:334
+msgid "Prior to 2.4.89, due to a bug a situation could occur where objects got overwritten on a sync pull. This tool allows you to inspect whether you are affected and if yes, remedy the issue."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:336;339
+msgid "Orphaned attributes"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:337
+msgid "In some rare cases attributes can remain in the database after an event is deleted becoming orphaned attributes. This means that they do not belong to any event, which can cause issues with the correlation engine (known cases include event deletion directly in the database without cleaning up the attributes and situations involving a race condition with an event deletion happening before all attributes are synchronised over)."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:339;355
+msgid "Run the test below"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:341
+msgid "Check for orphaned attribute"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:341
+msgid "Check for orphaned attributes"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:342
+msgid "Remove orphaned attributes"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:343;345
+#: View/Pages/administration.ctp:17
+msgid "Verify GnuPG keys"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:344
+msgid "Run a full validation of all GnuPG keys within this instance's userbase. The script will try to identify possible issues with each key and report back on the results."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:345
+#: View/Pages/administration.ctp:17
+msgid "Check whether every user's GnuPG key is usable"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:346
+msgid "Database cleanup scripts"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:347
+msgid "If you run into an issue with an infinite upgrade loop (when upgrading from version ~2.4.50) that ends up filling your database with upgrade script log messages, run the following script."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:348
+msgid "Prune upgrade logs"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:349;351
+msgid "Legacy Administrative Tools"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:350
+msgid "Click the following button to go to the legacy administrative tools page. There should in general be no need to do this unless you are upgrading a very old MISP instance (<2.4), all updates are done automatically with more current versions."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:352
+msgid "Verify bad link on attachments"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:353
+msgid "Verify each attachment referenced in database is accessible on filesystem."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:355
+msgid "Non existing attachments referenced in Database"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:357
+msgid "Check bad link on attachments"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:2
+msgid "Below you will find a list of the uploaded files based on type."
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:9
+msgid "Expected Format"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:10
+msgid "Path"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:14
+msgid "Files set for each relevant setting"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:29
+msgid "Filename"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:30
+msgid "Used by"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:31
+msgid "Size"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:32
+#: View/Roles/admin_edit.ctp:15
+msgid "Permissions"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:73
+#: View/Organisations/index.ctp:140
+#: View/Regexp/admin_index.ctp:35
+#: View/Roles/admin_index.ctp:67
+#: View/SharingGroups/index.ctp:87
+msgid "Are you sure you want to delete %s?"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:3
+msgid "Critical, your MISP instance requires immediate attention."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:4
+msgid "Issues found, it is recommended that you resolve them."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:5
+msgid "Good, but there are some optional settings that are incorrect / not set."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:6
+msgid "In perfect health."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:15
+msgid "Test"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
+#: View/Events/filter_event_index.ctp:134
+#: View/Events/resolved_attributes.ctp:45
+#: View/Events/show_i_o_c_results.ctp:13
+#: View/Feeds/freetext_index.ctp:33
+#: View/Noticelists/view.ctp:42
+#: View/Objects/add.ctp:96
+#: View/Objects/revise_object.ctp:46
+#: View/Pages/doc/administration.ctp:47
+#: View/Pages/doc/using_the_system.ctp:94;145;233;283
+#: View/Templates/populate_event_from_template_attributes.ctp:8
+#: View/Users/admin_filter_user_index.ctp:71
+msgid "Value"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:7
+#: View/Pages/doc/administration.ctp:49
+msgid "Error Message"
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:7
+#: View/Pages/doc/administration.ctp:32
+msgid "Overview"
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:34
+#: View/Pages/doc/administration.ctp:38
+msgid "Diagnostics"
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:45
+msgid "Manage files"
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:50;65
+#: View/Pages/doc/administration.ctp:40
+msgid "Download report"
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:5
+msgid "MISP cannot access your /proc directory to check the status of the worker processes, which means that dead workers will not be detected by the diagnostic tool. If you would like to regain this functionality, make sure that the open_basedir directive is not set, or that /proc is included in it."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "Note:"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "You have set the \"manage_workers\" variable to \"false\", therefore worker controls have been disabled."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:15
+msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:20
+msgid "Worker started with the correct user, but the current status is unknown."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:29
+msgid "There are issues with the worker(s), but at least one healthy worker is monitoring the queue."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:35
+msgid "Worker type: "
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:37
+msgid "Jobs in the queue: "
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:45
+msgid "Queue status: "
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:56
+msgid "Worker PID"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:57
+#: View/Pages/doc/administration.ctp:166
+#: View/Pages/doc/using_the_system.ctp:255
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
+msgid "User"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:58
+msgid "Worker process"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:59
+msgid "Information"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:69
+msgid "Worker not running!"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:77
+msgid "The worker appears to be healthy."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:80
+msgid "The worker was started with a user other than the apache user. MISP cannot check whether the worker is alive or not."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:86
+msgid "Cannot check whether the worker is alive or dead."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:90
+msgid "Dead"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:91
+msgid "The Worker appears to be dead."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:106
+msgid "Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:119
+msgid "Start a worker"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:130
+msgid "Restart all workers"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:3
+msgid "Set pull rules"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:9
+#: View/Elements/serverRuleElements/push.ctp:9
+msgid "Allowed Tags (OR)"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:14
+#: View/Elements/serverRuleElements/push.ctp:14
+msgid "Move tag to the list of tags to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:15
+#: View/Elements/serverRuleElements/push.ctp:15
+msgid "Remove tag from the list of tags to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:21
+#: View/Elements/serverRuleElements/push.ctp:23
+msgid "Remove tag from the list of tags to block"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:22
+#: View/Elements/serverRuleElements/push.ctp:24
+msgid "Move tag to the list of tags to block"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:25
+#: View/Elements/serverRuleElements/push.ctp:27
+msgid "Blocked Tags (AND NOT)"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:30
+#: View/Elements/serverRuleElements/push.ctp:32
+msgid "AND"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:34
+#: View/Elements/serverRuleElements/push.ctp:36
+msgid "AND NOT"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:43
+msgid "Move organisation to the list of tags to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:43
+#: View/Elements/serverRuleElements/push.ctp:45
+msgid "Move organisation to the list of organisations to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:44
+msgid "Remove organisation to the list of tags to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:44
+msgid "Remove organisation form the list of organisations to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:50
+msgid "Remove organisation from the list of tags to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:50
+#: View/Elements/serverRuleElements/push.ctp:54
+msgid "Remove organisation from the list of organisations to block"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:51
+msgid "Move organisation to the list of tags to block"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:51
+#: View/Elements/serverRuleElements/push.ctp:55
+msgid "Move organisation to the list of organisations to block"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:54
+#: View/Elements/serverRuleElements/push.ctp:58
+msgid "Blocked Orgs (AND NOT)"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:65
+msgid "Accept changes"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:65
+#: View/Elements/serverRuleElements/push.ctp:67
+msgid "Update"
+msgstr ""
+
+#: View/Elements/serverRuleElements/push.ctp:3
+msgid "Set push rules"
+msgstr ""
+
+#: View/Elements/serverRuleElements/push.ctp:18
+msgid "Available Tags"
+msgstr ""
+
+#: View/Elements/serverRuleElements/push.ctp:40
+msgid "Allowed Orgs (OR)"
+msgstr ""
+
+#: View/Elements/serverRuleElements/push.ctp:46
+msgid "Remove organisation from the list of organisations to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/push.ctp:49
+msgid "Available  Organisations"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:3
+#: View/Noticelists/view.ctp:41
+#: View/Pages/doc/using_the_system.ctp:107
+msgid "Field"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:13
+#: View/Events/export.ctp:25
+#: View/Events/resolved_attributes.ctp:48
+#: View/Events/show_i_o_c_results.ctp:12
+#: View/Feeds/freetext_index.ctp:32
+#: View/Objects/revise_object.ctp:45
+#: View/Organisations/ajax/merge.ctp:59;66
+#: View/Pages/doc/administration.ctp:237
+#: View/Pages/doc/categories_and_types.ctp:60
+#: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
+#: View/Sightings/ajax/list_sightings.ctp:7
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
+#: View/Templates/populate_event_from_template_attributes.ctp:7
+#: View/Users/statistics_orgs.ctp:35
+#: View/Warninglists/view.ctp:13
+msgid "Type"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:38
+msgid "Describe the %s using one or several (separated by a line-break) of the following types: %s"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:40
+msgid "Describe the %s using one or several %s\\s (separated by a line-break) "
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:52
+msgid "Describe the %s using one of the following types: %s"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:54
+msgid "Describe the %s using a %s"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:68
+msgid "Error: %s"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateDescription.ctp:3
+#: View/Templates/add.ctp:37
+#: View/Templates/edit.ctp:37
+msgid "Template Description"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateDescription.ctp:6
+msgid "Template ID"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateDescription.ctp:10
+#: View/Organisations/view.ctp:26
+#: View/SharingGroups/view.ctp:23
+msgid "Created by"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateDescription.ctp:14
+msgid "Tags automatically assigned"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateFile.ctp:13
+#: View/Elements/templateElements/templateRowFile.ctp:4
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:4
+msgid "File"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateFile.ctp:13
+msgid "s"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:4
+#: View/ObjectReferences/ajax/add.ctp:86
+#: View/Objects/revise_object.ctp:43
+#: View/Pages/doc/administration.ctp:168
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:3
+msgid "Attribute"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:30
+#: View/Elements/templateElements/templateRowFile.ctp:30
+#: View/Events/resolved_attributes.ctp:47
+#: View/Events/show_i_o_c_results.ctp:11
+#: View/Feeds/freetext_index.ctp:31
+#: View/Objects/add.ctp:95
+#: View/Objects/revise_object.ctp:44
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
+#: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
+#: View/ShadowAttributes/index.ctp:58
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
+#: View/TemplateElements/ajax/template_element_add_file.ctp:28
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:28
+#: View/Templates/populate_event_from_template_attributes.ctp:6
+msgid "Category"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:39
+#: View/Pages/doc/categories_and_types.ctp:57
+#: View/Pages/doc/using_the_system.ctp:109
+#: View/Pages/doc/md/categories_and_types.ctp:33
+msgid "Types"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:59
+msgid "Mandatory"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:70
+#: View/Elements/templateElements/templateRowFile.ctp:60
+msgid "Batch"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:101
+#: View/Elements/templateElements/templateRowFile.ctp:78
+#: View/Elements/templateElements/templateRowText.ctp:35
+msgid "Delete template element"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:105
+#: View/Elements/templateElements/templateRowFile.ctp:82
+#: View/Elements/templateElements/templateRowText.ctp:39
+msgid "Edit template element"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowFile.ctp:38
+#: View/Pages/doc/using_the_system.ctp:130;343
+#: View/TemplateElements/ajax/template_element_add_file.ctp:38
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:38
+msgid "Malware"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowFile.ctp:49
+msgid "Req."
+msgstr ""
+
+#: View/Elements/templateElements/templateRowText.ctp:4;20
+#: View/Pages/doc/using_the_system.ctp:352
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:5
+msgid "Text"
+msgstr ""
+
+#: View/Errors/error400.ctp:33
+msgid "You have tripped the cross-site request forgery protection of MISP"
+msgstr ""
+
+#: View/Errors/error400.ctp:35
+msgid "CSRF error"
+msgstr ""
+
+#: View/Errors/error400.ctp:36
+msgid "This happens usually when you try to resubmit the same form with invalidated CSRF tokens or you had a form open too long and the CSRF tokens simply expired. Just go back to the previous page and refresh the form (by reloading the same url) so that the tokens get refreshed."
+msgstr ""
+
+#: View/Errors/error400.ctp:39
+msgid "Alternatively, click <a href=\"%s\">here</a> to continue to the start page."
+msgstr ""
+
+#: View/Errors/error403.ctp:4
+msgid "%s"
+msgstr ""
+
+#: View/Errors/missing_connection.ctp:1
+#: View/Errors/missing_datasource_config.ctp:1
+msgid "Missing Database Connection"
+msgstr ""
+
+#: View/Errors/pdo_error.ctp:1
+msgid "PDO error"
+msgstr ""
+
+#: View/EventBlacklists/add.ctp:4
+#: View/EventBlacklists/edit.ctp:4
+#: View/OrgBlacklists/edit.ctp:4
+msgid "Add Event Blacklist Entries"
+msgstr ""
+
+#: View/EventBlacklists/add.ctp:5
+#: View/EventBlacklists/edit.ctp:5
+#: View/OrgBlacklists/edit.ctp:5
+msgid "Simply paste a list of all the event UUIDs that you wish to block from being entered."
+msgstr ""
+
+#: View/EventBlacklists/add.ctp:11
+#: View/OrgBlacklists/add.ctp:11
+msgid "Enter a single or a list of UUIDs"
+msgstr ""
+
+#: View/EventBlacklists/add.ctp:17
+msgid "(Optional) The organisation that the event is associated with"
+msgstr ""
+
+#: View/EventBlacklists/add.ctp:24
+msgid "(Optional) the event info of the event that you would like to block. It's best to leave this empty if you are adding a list of UUIDs."
+msgstr ""
+
+#: View/EventBlacklists/add.ctp:30
+#: View/OrgBlacklists/add.ctp:23
+msgid "(Optional) Any comments you would like to add regarding this (or these) entries."
+msgstr ""
+
+#: View/EventBlacklists/edit.ctp:10
+#: View/OrgBlacklists/edit.ctp:10
+msgid "Creating organisation"
+msgstr ""
+
+#: View/EventBlacklists/index.ctp:2
+msgid "Event Blacklists"
+msgstr ""
+
+#: View/EventBlacklists/index.ctp:39
+msgid "Are you sure you want to delete the blacklist entry for the event UUID %s?"
+msgstr ""
+
+#: View/EventDelegations/ajax/accept_delegation.ctp:4
+msgid "Are you sure you would like to accept the request by %s to take ownership of Event #%s"
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:2
+msgid "Delegate the publishing of the Event to another organisation"
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:3
+msgid "Warning: You are about to request another organisation to take ownership of this event."
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:8
+msgid "Target Organisation"
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:10
+msgid "Select organisation"
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:15
+msgid "Desired Distribution"
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:22
+msgid "Desired Sharing Group"
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:33
+msgid "Message to the recipient organisation"
+msgstr ""
+
+#: View/EventDelegations/ajax/delete_delegation.ctp:2
+msgid "Delete Delegation Request"
+msgstr ""
+
+#: View/EventDelegations/ajax/delete_delegation.ctp:4
+msgid "Are you sure you would like to discard the request by %s to take ownership of Event #%s"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:2
+msgid "Event Delegation"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:5
+msgid "your organisation"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:6
+msgid "Your organisation"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:9
+msgid "Request details</b><br /><span class=\"red bold\">%s</span> is requesting <span class=\"red bold\">%s</span> to take over this event."
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:12
+msgid "The desired distribution level is"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:14
+msgid "The desired sharing group to distribute the event to is"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:18
+msgid "Message from requester"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:21
+msgid "Accept delegation request"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:21
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/quick_edit.ctp:5
+#: View/Servers/ajax/server_settings_edit.ctp:5
+#: View/ShadowAttributes/ajax/attributeEditCategoryForm.ctp:5
+#: View/ShadowAttributes/ajax/attributeEditCommentForm.ctp:5
+#: View/ShadowAttributes/ajax/attributeEditTo_idsForm.ctp:5
+#: View/ShadowAttributes/ajax/attributeEditTypeForm.ctp:5
+#: View/ShadowAttributes/ajax/attributeEditValueForm.ctp:5
+msgid "Accept"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:23
+msgid "Decline and remove delegation request"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:23
+#: View/ShadowAttributes/ajax/attributeEditCategoryForm.ctp:6
+#: View/ShadowAttributes/ajax/attributeEditCommentForm.ctp:6
+#: View/ShadowAttributes/ajax/attributeEditTo_idsForm.ctp:6
+#: View/ShadowAttributes/ajax/attributeEditTypeForm.ctp:6
+#: View/ShadowAttributes/ajax/attributeEditValueForm.ctp:6
+msgid "Discard"
+msgstr ""
+
+#: View/EventGraph/ajax/eventGraph_add_form.ctp:6
+msgid "Add EventGraph"
+msgstr ""
+
+#: View/EventGraph/ajax/eventGraph_add_form.ctp:6
+msgid "Edit EventGraph"
+msgstr ""
+
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:5
+msgid "EventGraph Deletion"
+msgstr ""
+
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:8
+msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
+msgstr ""
+
+#: View/Events/add.ctp:44
+#: View/Events/edit.ctp:35
+msgid "Threat Level "
+msgstr ""
+
+#: View/Events/add.ctp:48
+#: View/Events/edit.ctp:38
+msgid "Analysis "
+msgstr ""
+
+#: View/Events/add.ctp:52
+#: View/Events/edit.ctp:43
+#: View/ShadowAttributes/index.ctp:52
+msgid "Event Info"
+msgstr ""
+
+#: View/Events/add.ctp:56
+#: View/Events/edit.ctp:47
+msgid "Quick Event Description or Tracking Info"
+msgstr ""
+
+#: View/Events/add.ctp:59
+#: View/Events/edit.ctp:50
+msgid "Extends event"
+msgstr ""
+
+#: View/Events/add.ctp:62
+#: View/Events/edit.ctp:53
+msgid "Event UUID or ID. Leave blank if not applicable."
+msgstr ""
+
+#: View/Events/add_i_o_c.ctp:4
+msgid "Import OpenIOC"
+msgstr ""
+
+#: View/Events/add_i_o_c.ctp:13
+#: View/Events/add_misp_export.ctp:27
+#: View/Events/upload_analysis_file.ctp:22
+#: View/Events/upload_stix.ctp:29
+msgid "Upload"
+msgstr ""
+
+#: View/Events/add_misp_export.ctp:4
+msgid "Import from MISP Export File"
+msgstr ""
+
+#: View/Events/add_misp_export.ctp:7
+msgid "MISP XML or JSON file"
+msgstr ""
+
+#: View/Events/add_misp_export.ctp:16
+msgid "Take ownership of the event"
+msgstr ""
+
+#: View/Events/add_misp_export.ctp:17
+msgid "Warning: This will change the creator organisation of the event, tampering with the event's ownership and releasability and can lead to unexpected behaviour when synchronising the event with instances that have another creator for the same event.)"
+msgstr ""
+
+#: View/Events/add_misp_export.ctp:22
+#: View/Events/upload_stix.ctp:17
+msgid "Publish imported events"
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:2
+msgid "Add From MISP Export Result"
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:6
+msgid "Result"
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:7
+msgid "Details"
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:15
+#: View/Jobs/index.ctp:124
+msgid "Failed"
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:24
+msgid "Event created."
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:26
+msgid "Event with this UUID already exists."
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:38
+#: View/Servers/preview_index.ctp:112
+msgid "Event "
+msgstr ""
+
+#: View/Events/automation.ctp:3
+msgid "Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.\n"
+"    To to make this functionality available for automated tools an authentication key is used."
+msgstr ""
+
+#: View/Events/automation.ctp:6
+msgid "Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP."
+msgstr ""
+
+#: View/Events/automation.ctp:9
+#: View/Events/legacy_automation.ctp:7
+msgid "Your current key is: <code>%s</code>.\n"
+"    You can %s this key."
+msgstr ""
+
+#: View/Events/automation.ctp:10
+#: View/Events/legacy_automation.ctp:8
+msgid "reset"
+msgstr ""
+
+#: View/Events/automation.ctp:14
+#: View/Logs/admin_index.ctp:20;21
+msgid "Search"
+msgstr ""
+
+#: View/Events/automation.ctp:16
+#: View/Events/legacy_automation.ctp:264
+msgid "It is possible to search the database for attributes based on a list of criteria."
+msgstr ""
+
+#: View/Events/automation.ctp:17
+#: View/Events/legacy_automation.ctp:265
+msgid "To return an event or a list of events in a desired format, use the following syntax"
+msgstr ""
+
+#: View/Events/automation.ctp:18
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
+msgstr ""
+
+#: View/Events/automation.ctp:21
+msgid "Set the return format of the search (Currently supported: json, xml, openioc, suricata, snort - more formats are being moved to restSearch with the goal being that all searches happen through this API). Can be passed as the first parameter after restSearch or via the JSON payload."
+msgstr ""
+
+#: View/Events/automation.ctp:22
+msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
+msgstr ""
+
+#: View/Events/automation.ctp:23
+msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
+msgstr ""
+
+#: View/Events/automation.ctp:24
+#: View/Events/legacy_automation.ctp:268;297
+msgid "Search for the given value in the attributes' value field."
+msgstr ""
+
+#: View/Events/automation.ctp:25
+#: View/Events/legacy_automation.ctp:62;199;269;298
+msgid "The attribute type, any valid MISP attribute type is accepted."
+msgstr ""
+
+#: View/Events/automation.ctp:26
+#: View/Events/legacy_automation.ctp:61;270;299
+msgid "The attribute category, any valid MISP attribute category is accepted."
+msgstr ""
+
+#: View/Events/automation.ctp:27
+#: View/Events/legacy_automation.ctp:271;300
+msgid "Search by the creator organisation by supplying the organisation identifier."
+msgstr ""
+
+#: View/Events/automation.ctp:28
+#: View/Events/legacy_automation.ctp:200
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'."
+msgstr ""
+
+#: View/Events/automation.ctp:29
+#: View/Events/legacy_automation.ctp:278
+msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
+msgstr ""
+
+#: View/Events/automation.ctp:30;151
+#: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:31;152
+#: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:32
+#: View/Events/legacy_automation.ctp:282;307
+msgid "The events that should be included / excluded from the search"
+msgstr ""
+
+#: View/Events/automation.ctp:33
+#: View/Events/legacy_automation.ctp:283;308
+msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
+msgstr ""
+
+#: View/Events/automation.ctp:34
+#: View/Events/legacy_automation.ctp:284
+msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
+msgstr ""
+
+#: View/Events/automation.ctp:35
+#: View/Events/legacy_automation.ctp:285;309
+msgid "Restrict the results by uuid."
+msgstr ""
+
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:37
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:38
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:39
+#: View/Events/legacy_automation.ctp:288;311
+msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
+msgstr ""
+
+#: View/Events/automation.ctp:40
+#: View/Events/legacy_automation.ctp:289;313
+msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
+msgstr ""
+
+#: View/Events/automation.ctp:41
+#: View/Events/legacy_automation.ctp:314
+msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
+msgstr ""
+
+#: View/Events/automation.ctp:42
+#: View/Events/legacy_automation.ctp:315
+msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
+msgstr ""
+
+#: View/Events/automation.ctp:43
+#: View/Events/legacy_automation.ctp:316
+msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:44
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:45
+msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
+msgstr ""
+
+#: View/Events/automation.ctp:46
+msgid "Filter on the event's info field."
+msgstr ""
+
+#: View/Events/automation.ctp:47
+msgid "Search for a full or a substring (delimited by % for substrings) in the event info, event tags, attribute tags, attribute values or attribute comment fields."
+msgstr ""
+
+#: View/Events/automation.ctp:48
+msgid "CSV only, select the fields that you wish to include in the CSV export. By setting event level fields additionally, includeContext is not required to get event metadata."
+msgstr ""
+
+#: View/Events/automation.ctp:49
+msgid "CSV only, add additional event level data to the export. The additional fields can be added via requested_attributes too with more granularity."
+msgstr ""
+
+#: View/Events/automation.ctp:79
+msgid "CSV specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:81
+msgid "Limit the list of fields to be returned in the CSV."
+msgstr ""
+
+#: View/Events/automation.ctp:82
+msgid "Include the event level meta-data with each attribute."
+msgstr ""
+
+#: View/Events/automation.ctp:83
+msgid "The CSV created when this setting is set to true will not contain the header row."
+msgstr ""
+
+#: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
+msgid "RPZ specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:95
+#: View/Events/legacy_automation.ctp:164
+msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
+msgstr ""
+
+#: View/Events/automation.ctp:98
+#: View/Events/legacy_automation.ctp:176
+msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
+msgstr ""
+
+#: View/Events/automation.ctp:102
+#: View/Events/legacy_automation.ctp:180
+msgid "To override the above values, either use the url parameters as described below"
+msgstr ""
+
+#: View/Events/automation.ctp:104
+#: View/Events/legacy_automation.ctp:182
+msgid "or POST an XML or JSON object with the above listed options"
+msgstr ""
+
+#: View/Events/automation.ctp:108
+#: View/Events/legacy_automation.ctp:211
+msgid "Bro IDS export"
+msgstr ""
+
+#: View/Events/automation.ctp:109
+#: View/Events/legacy_automation.ctp:212
+msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
+msgstr ""
+
+#: View/Events/automation.ctp:110
+#: View/Events/legacy_automation.ctp:213
+msgid "You can configure your tools to automatically download a file one of the Bro types."
+msgstr ""
+
+#: View/Events/automation.ctp:116
+#: View/Events/legacy_automation.ctp:219
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
+msgstr ""
+
+#: View/Events/automation.ctp:119
+#: View/Events/legacy_automation.ctp:222
+msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
+msgstr ""
+
+#: View/Events/automation.ctp:137
+#: View/Events/legacy_automation.ctp:240
+msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
+msgstr ""
+
+#: View/Events/automation.ctp:139
+#: View/Events/legacy_automation.ctp:242
+msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
+msgstr ""
+
+#: View/Events/automation.ctp:146
+#: View/Events/legacy_automation.ctp:249;301
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead)."
+msgstr ""
+
+#: View/Events/automation.ctp:149
+#: View/Events/legacy_automation.ctp:252
+msgid "Restrict the results to the given event IDs."
+msgstr ""
+
+#: View/Events/automation.ctp:150
+#: View/Events/legacy_automation.ctp:253
+msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
+msgstr ""
+
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:154
+#: View/Events/legacy_automation.ctp:95;120;174;206;257
+msgid "All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/automation.ctp:156
+#: View/Events/legacy_automation.ctp:41;70;97;122;259;290
+msgid "The keywords false or null should be used for optional empty parameters in the URL."
+msgstr ""
+
+#: View/Events/automation.ctp:157
+#: View/Events/legacy_automation.ctp:260
+msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
+msgstr ""
+
+#: View/Events/automation.ctp:160
+#: View/Events/legacy_automation.ctp:329
+msgid "Export attributes of event with specified type as XML"
+msgstr ""
+
+#: View/Events/automation.ctp:161
+#: View/Events/legacy_automation.ctp:330
+msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
+msgstr ""
+
+#: View/Events/automation.ctp:163
+#: View/Events/legacy_automation.ctp:332
+msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
+"    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
+"    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
+msgstr ""
+
+#: View/Events/automation.ctp:168
+#: View/Events/legacy_automation.ctp:337
+msgid "Download attachment or malware sample"
+msgstr ""
+
+#: View/Events/automation.ctp:169
+#: View/Events/legacy_automation.ctp:338
+msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
+msgstr ""
+
+#: View/Events/automation.ctp:171
+#: View/Events/legacy_automation.ctp:340
+msgid "Download malware sample by hash"
+msgstr ""
+
+#: View/Events/automation.ctp:172
+#: View/Events/legacy_automation.ctp:341
+msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
+msgstr ""
+
+#: View/Events/automation.ctp:173
+#: View/Events/legacy_automation.ctp:342
+msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
+msgstr ""
+
+#: View/Events/automation.ctp:174
+#: View/Events/legacy_automation.ctp:343
+msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
+msgstr ""
+
+#: View/Events/automation.ctp:176
+#: View/Events/legacy_automation.ctp:345
+msgid "POST message payload (XML)"
+msgstr ""
+
+#: View/Events/automation.ctp:180
+#: View/Events/legacy_automation.ctp:294;320;349
+msgid "POST message payload (json)"
+msgstr ""
+
+#: View/Events/automation.ctp:184
+#: View/Events/legacy_automation.ctp:353
+msgid "A quick description of all the parameters in the passed object"
+msgstr ""
+
+#: View/Events/automation.ctp:185
+#: View/Events/legacy_automation.ctp:354
+msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
+msgstr ""
+
+#: View/Events/automation.ctp:186
+#: View/Events/legacy_automation.ctp:355
+msgid "If set, it will return all samples from events that have a match for the hash provided above."
+msgstr ""
+
+#: View/Events/automation.ctp:187
+#: View/Events/legacy_automation.ctp:356
+msgid "If set, it will only fetch data from the given event ID."
+msgstr ""
+
+#: View/Events/automation.ctp:188
+#: View/Events/legacy_automation.ctp:357
+msgid "Upload malware samples using the \"Upload Sample\" API"
+msgstr ""
+
+#: View/Events/automation.ctp:190
+#: View/Events/legacy_automation.ctp:359
+msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
+msgstr ""
+
+#: View/Events/automation.ctp:191
+#: View/Events/legacy_automation.ctp:360
+msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:192
+#: View/Events/legacy_automation.ctp:361
+msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
+msgstr ""
+
+#: View/Events/automation.ctp:193
+#: View/Events/legacy_automation.ctp:362
+msgid "The general structure of the expected objects is as follows"
+msgstr ""
+
+#: View/Events/automation.ctp:202
+#: View/Events/legacy_automation.ctp:371
+msgid "The following optional parameters are expected"
+msgstr ""
+
+#: View/Events/automation.ctp:203
+#: View/Events/legacy_automation.ctp:372
+msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
+msgstr ""
+
+#: View/Events/automation.ctp:204
+#: View/Events/legacy_automation.ctp:373
+msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
+msgstr ""
+
+#: View/Events/automation.ctp:205
+#: View/Events/legacy_automation.ctp:374
+msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
+msgstr ""
+
+#: View/Events/automation.ctp:206
+#: View/Events/legacy_automation.ctp:375
+msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
+msgstr ""
+
+#: View/Events/automation.ctp:207
+#: View/Events/legacy_automation.ctp:376
+msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
+msgstr ""
+
+#: View/Events/automation.ctp:208
+#: View/Events/legacy_automation.ctp:377
+msgid "The analysis level of the newly created event, if applicable. [0-2]"
+msgstr ""
+
+#: View/Events/automation.ctp:209
+#: View/Events/legacy_automation.ctp:378
+msgid "The threat level ID of the newly created event, if applicable. [0-3]"
+msgstr ""
+
+#: View/Events/automation.ctp:210
+#: View/Events/legacy_automation.ctp:379
+msgid "This will populate the comment field of any attribute created using this API."
+msgstr ""
+
+#: View/Events/automation.ctp:211
+#: View/Events/legacy_automation.ctp:380
+msgid "Add or remove tags from events"
+msgstr ""
+
+#: View/Events/automation.ctp:212
+#: View/Events/legacy_automation.ctp:381
+msgid "You can add or remove an existing tag from an event in the following way"
+msgstr ""
+
+#: View/Events/automation.ctp:215
+#: View/Events/legacy_automation.ctp:384
+msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
+msgstr ""
+
+#: View/Events/automation.ctp:217
+#: View/Events/legacy_automation.ctp:386
+msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
+msgstr ""
+
+#: View/Events/automation.ctp:219
+#: View/Events/legacy_automation.ctp:388
+msgid "Proposals and the API"
+msgstr ""
+
+#: View/Events/automation.ctp:220
+#: View/Events/legacy_automation.ctp:389
+msgid "You can interact with the proposals via the API directly since version 2.3.148"
+msgstr ""
+
+#: View/Events/automation.ctp:224
+#: View/Events/legacy_automation.ctp:393
+msgid "HTTP"
+msgstr ""
+
+#: View/Events/automation.ctp:225
+#: View/Events/legacy_automation.ctp:394
+#: View/Pages/doc/using_the_system.ctp:445
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
+msgid "URL"
+msgstr ""
+
+#: View/Events/automation.ctp:226
+#: View/Events/legacy_automation.ctp:395
+msgid "Explanation"
+msgstr ""
+
+#: View/Events/automation.ctp:227
+#: View/Events/legacy_automation.ctp:396
+msgid "Expected Payload"
+msgstr ""
+
+#: View/Events/automation.ctp:228
+#: View/Events/legacy_automation.ctp:397
+#: View/Servers/rest.ctp:115
+msgid "Response"
+msgstr ""
+
+#: View/Events/automation.ctp:233
+#: View/Events/legacy_automation.ctp:402
+msgid "View a proposal"
+msgstr ""
+
+#: View/Events/automation.ctp:235;255;256;262;263
+#: View/Events/legacy_automation.ctp:404;424;425;431;432
+msgid "ShadowAttribute object"
+msgstr ""
+
+#: View/Events/automation.ctp:240
+#: View/Events/legacy_automation.ctp:409
+msgid "View all proposal of my org's events"
+msgstr ""
+
+#: View/Events/automation.ctp:242;249
+#: View/Events/legacy_automation.ctp:411;418
+msgid "ShadowAttribute objects"
+msgstr ""
+
+#: View/Events/automation.ctp:247
+#: View/Events/legacy_automation.ctp:416
+msgid "View all proposals of an event"
+msgstr ""
+
+#: View/Events/automation.ctp:254
+#: View/Events/legacy_automation.ctp:423
+msgid "Propose a new attribute to an event"
+msgstr ""
+
+#: View/Events/automation.ctp:261
+#: View/Events/legacy_automation.ctp:430
+msgid "Propose an edit to an attribute"
+msgstr ""
+
+#: View/Events/automation.ctp:268
+#: View/Events/legacy_automation.ctp:437
+msgid "Accept a proposal"
+msgstr ""
+
+#: View/Events/automation.ctp:270;277
+#: View/Events/legacy_automation.ctp:439;446
+#: View/Noticelists/view.ctp:44
+#: View/Pages/doc/administration.ctp:226;242
+#: View/Pages/doc/using_the_system.ctp:254
+msgid "Message"
+msgstr ""
+
+#: View/Events/automation.ctp:275
+#: View/Events/legacy_automation.ctp:444
+msgid "Discard a proposal"
+msgstr ""
+
+#: View/Events/automation.ctp:280
+#: View/Events/legacy_automation.ctp:449
+msgid "When posting a shadow attribute object, use the following formats"
+msgstr ""
+
+#: View/Events/automation.ctp:285
+#: View/Events/legacy_automation.ctp:454
+msgid "None of the above fields are mandatory, but at least one of them has to be provided."
+msgstr ""
+
+#: View/Events/automation.ctp:287
+#: View/Events/legacy_automation.ctp:456
+msgid "Filtering event metadata"
+msgstr ""
+
+#: View/Events/automation.ctp:288
+#: View/Events/legacy_automation.ctp:457
+msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
+msgstr ""
+
+#: View/Events/automation.ctp:292
+#: View/Events/legacy_automation.ctp:461
+msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
+"    An example for a valid lookup"
+msgstr ""
+
+#: View/Events/automation.ctp:303
+#: View/Events/legacy_automation.ctp:472
+msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
+msgstr ""
+
+#: View/Events/automation.ctp:304
+#: View/Events/legacy_automation.ctp:473
+msgid "The list of valid parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:305
+#: View/Events/legacy_automation.ctp:474
+msgid "Filters on published or unpublished events [0,1] - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:306
+#: View/Events/legacy_automation.ctp:475
+msgid "Filters on strings found in the event info - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:307
+#: View/Events/legacy_automation.ctp:476
+msgid "Filters on attached tag names - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:308
+#: View/Events/legacy_automation.ctp:477
+msgid "Filters on specific event IDs - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:309
+#: View/Events/legacy_automation.ctp:478
+msgid "Filters on a given event threat level [1,2,3,4] - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:310
+#: View/Events/legacy_automation.ctp:479
+msgid "Filters on the distribution level [0,1,2,3] - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:311
+#: View/Events/legacy_automation.ctp:480
+msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:312
+#: View/Events/legacy_automation.ctp:481
+msgid "Filters on a contained attribute value - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:313
+#: View/Events/legacy_automation.ctp:482
+msgid "Filters on the creator organisation - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:314
+#: View/Events/legacy_automation.ctp:483
+msgid "Filters on the creator user's email address (admin only) - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:315
+#: View/Events/legacy_automation.ctp:484
+msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:316
+#: View/Events/legacy_automation.ctp:485
+msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:319
+msgid "Freetext Import API"
+msgstr ""
+
+#: View/Events/automation.ctp:321
+msgid "The freetext import tool is also exposed to the API."
+msgstr ""
+
+#: View/Events/automation.ctp:322
+msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
+msgstr ""
+
+#: View/Events/automation.ctp:323
+msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:324
+msgid "The contents of the POST body should be the text to be parsed."
+msgstr ""
+
+#: View/Events/contact.ctp:8
+msgid "Contact organization reporting event "
+msgstr ""
+
+#: View/Events/contact.ctp:9
+msgid "You are about to contact the organization that reported event %s.<br/>\n"
+"                Feel free to add a custom message that will be sent to the reporting organization. <br/>\n"
+"                Your email address and details about the event will be added automagically to the message."
+msgstr ""
+
+#: View/Events/contact.ctp:21
+msgid "Submit only to the person that created the event"
+msgstr ""
+
+#: View/Events/export.ctp:3
+#: View/Events/export_alternate.ctp:3
+msgid "Export functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"        Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artifacts. Support for more attribute types is planned."
+msgstr ""
+
+#: View/Events/export.ctp:6
+#: View/Events/export_alternate.ctp:6
+msgid "Simply click on any of the following buttons to download the appropriate data."
+msgstr ""
+
+#: View/Events/export.ctp:26
+#: View/Pages/doc/using_the_system.ctp:378
+msgid "Last Update"
+msgstr ""
+
+#: View/Events/export.ctp:28
+#: View/Pages/doc/using_the_system.ctp:380
+msgid "Outdated"
+msgstr ""
+
+#: View/Events/export.ctp:29
+msgid "Filesize"
+msgstr ""
+
+#: View/Events/export.ctp:30
+#: View/Pages/doc/administration.ctp:230
+#: View/Pages/doc/using_the_system.ctp:381
+msgid "Progress"
+msgstr ""
+
+#: View/Events/export.ctp:43
+msgid "Attachments are enabled on this instance"
+msgstr ""
+
+#: View/Events/export.ctp:47
+msgid "Attachments are disabled on this instance"
+msgstr ""
+
+#: View/Events/export.ctp:81
+msgid "Loading…"
+msgstr ""
+
+#: View/Events/export.ctp:100;104
+msgid "Generate"
+msgstr ""
+
+#: View/Events/export.ctp:158
+msgid "Warning, the background worker is not responding!"
+msgstr ""
+
+#: View/Events/export.ctp:172
+msgid "0 seconds ago"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:10
+msgid "Download all as XML"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:12
+msgid "Click this to download all events and attributes that you have access to <small>(except file attachments)</small> in a custom XML format."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:17
+msgid "Download all signatures as CSV"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:19
+msgid "Click this to download all attributes that are indicators and that you have access to <small>(except file attachments)</small> in CSV format."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:24
+msgid "Download all as CSV"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:26
+msgid "Click this to download all attributes that you have access to <small>(except file attachments)</small> in CSV format."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:31
+msgid "Download Suricata signatures"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:32
+msgid "Download Snort signatures"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:34
+msgid "Click these to download all network related attributes that you\n"
+"                        have access to under the Suricata or Snort rule format. Only <em>published</em>\n"
+"                        events and attributes marked as <em>IDS Signature</em> are exported.\n"
+"                        Administration is able to maintain a whitelist containing host,\n"
+"                        domain name and IP numbers to exclude from the NIDS export."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:43
+msgid "Download Bro signatures"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:45
+msgid "Click these to download all network related attributes that you\n"
+"                have access to under the Bro rule format. Only <em>published</em>\n"
+"                events and attributes marked as <em>IDS Signature</em> are exported.\n"
+"                Administration is able to maintain a whitelist containing host,\n"
+"                domain name and IP numbers to exclude from the NIDS export."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:54
+msgid "Download RPZ Zone File"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:56
+msgid "Click this to download an RPZ Zone file generated from all ip-src/ip-dst, hostname, domain attributes. This can be useful for DNS level firewalling. Only published events and attributes marked as IDS Signature are exported."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:61
+msgid "Download all MD5 hashes"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:62
+msgid "Download all SHA1 hashes"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:64
+msgid "Click on one of these two buttons to download all MD5 or SHA1\n"
+"                        checksums contained in file-related attributes. This list can be\n"
+"                        used to feed forensic software when searching for susipicious files.\n"
+"                        Only <em>published</em> events and attributes marked as <em>IDS\n"
+"                            Signature</em> are exported."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:72
+msgid "Click on one of these buttons to download all the attributes with the matching type. This list can be used to feed forensic software when searching for susipicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:4
+#: View/Servers/filter_event_index.ctp:4
+msgid "Filter Event Index"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:17;211
+msgid "OR"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:17;211
+msgid "NOT"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+msgid "Any"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:32;188
+#: View/Pages/doc/using_the_system.ctp:68;173
+msgid "High"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:32;189
+#: View/Pages/doc/using_the_system.ctp:67;172
+msgid "Medium"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:32;191
+#: View/Pages/doc/using_the_system.ctp:174
+#: View/Users/statistics_sightings.ctp:21
+msgid "Undefined"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:39;194
+#: View/Pages/doc/using_the_system.ctp:72;180
+msgid "Initial"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:39;195
+#: View/Pages/doc/using_the_system.ctp:73;181
+msgid "Ongoing"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:39;196
+#: View/Jobs/index.ctp:9;136
+#: View/Pages/doc/using_the_system.ctp:74;182
+msgid "Completed"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:46;182
+msgid "Your organisation only"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:46;183
+msgid "This community only"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:46;184
+#: View/Pages/doc/using_the_system.ctp:51
+msgid "Connected communities"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:46;185
+#: View/Pages/doc/using_the_system.ctp:58
+msgid "All communities"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:133
+#: View/Feeds/index.ctp:103
+#: View/Users/admin_filter_user_index.ctp:70
+msgid "Target"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:145
+msgid "Delete filter"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:153
+#: View/Users/admin_filter_user_index.ctp:89
+msgid "No filters set - add filter terms above."
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:168
+#: View/Users/admin_filter_user_index.ctp:104
+msgid "Save this URL if you would like to use the same filter settings again"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:170
+#: View/Servers/filter_event_index.ctp:21
+#: View/Users/admin_filter_user_index.ctp:106
+msgid "Apply"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:179
+msgid "\"No\""
+msgstr ""
+
+#: View/Events/free_text_import.ctp:6
+#: View/Pages/doc/using_the_system.ctp:112
+msgid "Freetext Import Tool"
+msgstr ""
+
+#: View/Events/free_text_import.ctp:8
+msgid "Paste a list of IOCs into the field below for automatic detection."
+msgstr ""
+
+#: View/Events/get_event_info_by_id.ctp:5
+msgid "No matching events found."
+msgstr ""
+
+#: View/Events/get_event_info_by_id.ctp:6
+msgid "This will still allow you to store the UUID. It will extend the assigned event as soon as it is created / becomes visible."
+msgstr ""
+
+#: View/Events/import_module.ctp:89
+msgid "Input File"
+msgstr ""
+
+#: View/Events/index.ctp:2
+#: View/Events/ajax/index.ctp:3
+#: View/Organisations/view.ctp:66;67
+#: View/Users/statistics.ctp:11
+#: View/Users/statistics_data.ctp:14
+#: View/Users/statistics_orgs.ctp:33
+msgid "Events"
+msgstr ""
+
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
+msgstr ""
+
+#: View/Events/index.ctp:45
+msgid "Delete selected Events"
+msgstr ""
+
+#: View/Events/index.ctp:73
+msgid "My events only"
+msgstr ""
+
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr ""
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr ""
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr ""
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
+#: View/Tags/index.ctp:56
+#: View/Taxonomies/view.ctp:65
+msgid "Filter"
+msgstr ""
+
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:3
+msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
+"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:6
+msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:10
+msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:11
+msgid "Please use the use the following header"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:12
+msgid "Authorization"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:13
+msgid "XML Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:14
+msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:15;47;76
+msgid "You can configure your tools to automatically download the following file"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:17
+msgid "If you only want to fetch a specific event append the eventid number"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:19;144
+msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:26
+msgid "The xml download also accepts two additional the following optional parameters in the URL"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:29;52;85
+msgid "Restrict the download to a single event"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:30
+msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:31;54;87;112;134
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:43
+msgid "Also check out the %s to read about the REST API."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:45
+msgid "CSV Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:46
+msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:49
+msgid "You can specify additional flags for CSV exports as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:53
+msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:58
+msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:63
+msgid "Include the event data with each attribute."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:66
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:67
+msgid "The CSV created when this setting is set to true will not contain the header row.\n"
+"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:71
+msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:74
+msgid "NIDS rules export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:75
+msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:81
+msgid "The full API syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:84
+msgid "The export format, can be \"suricata\" or \"snort\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:86
+msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:93
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:94
+msgid "Restrict the export to only use the given types."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:96
+msgid "All tags will be included even if not exportable."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:98
+msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:100
+msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:102
+msgid "Hash database export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:103
+msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:104;188
+msgid "You can configure your tools to automatically download the following files"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:109
+msgid "The API's full format is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:111
+msgid "The export format, can be \"md5\" or \"sha1\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:123
+msgid "For example, to only show sha1 values from events tagged tag1, use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:126
+msgid "STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:127
+msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:129
+msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:132;171
+msgid "The event's ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:133
+msgid "Encode attachments where applicable"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:151
+msgid "Various ways to narrow down the search results of the STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:152
+msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:154
+msgid "To export the same events using a POST request use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:156
+msgid "Together with this JSON object in the POST message"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:158
+msgid "XML is automagically assumed when using the stix export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:160
+msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:163
+msgid "RPZ export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:165
+msgid "It is possible to further restrict the exported values using the following filters"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:167
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
+"        "
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:170
+msgid "Use semicolons instead (the search will automatically search for colons instead)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:172
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:173
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:186
+msgid "Text export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:187
+msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:194
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:197
+msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:201
+msgid "Only export the attributes of the given event ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:202
+msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:207
+msgid "Include not published Events."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:208;275
+msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:263
+msgid "Searches with JSON/XML/OpenIOC results"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:267
+msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:272
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:291
+msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:296
+msgid "To just return a list of attributes, use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:304
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:305
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:312
+msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:322
+msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:324
+msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
+"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:327
+msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
+msgstr ""
+
+#: View/Events/merge.ctp:4
+msgid "Merge events"
+msgstr ""
+
+#: View/Events/merge.ctp:9
+msgid "Event id to copy the attributes from"
+msgstr ""
+
+#: View/Events/merge.ctp:20
+msgid "copy only IDS attributes"
+msgstr ""
+
+#: View/Events/proposal_event_index.ctp:2
+msgid "Event with proposals"
+msgstr ""
+
+#: View/Events/proposal_event_index.ctp:24
+#: View/Pages/doc/concepts.ctp:28
+#: View/ShadowAttributes/index.ctp:2
+msgid "Proposals"
+msgstr ""
+
+#: View/Events/proposal_event_index.ctp:25
+#: View/Events/view.ctp:106
+#: View/Pages/doc/using_the_system.ctp:206
+msgid "Contributors"
+msgstr ""
+
+#: View/Events/proposal_event_index.ctp:27
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
+#: View/Logs/admin_search.ctp:6
+#: View/Pages/doc/administration.ctp:87;104;116;181;195
+#: View/Pages/doc/using_the_system.ctp:166
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
+msgid "Email"
+msgstr ""
+
+#: View/Events/report_validation_issues_events.ctp:2
+msgid "Listing invalid event validations"
+msgstr ""
+
+#: View/Events/report_validation_issues_events.ctp:3
+msgid "Events analysed: %s"
+msgstr ""
+
+#: View/Events/report_validation_issues_events.ctp:7
+msgid "Validation errors for event: %s"
+msgstr ""
+
+#: View/Events/report_validation_issues_events.ctp:9
+msgid "Attribute details"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:4
+msgid "Below you can see the %s that are to be created. Make sure that the categories and the types are correct, often several options will be offered based on an inconclusive automatic resolution."
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:8
+msgid "Warning: You are missing warninglist(s) that are used to recognise TLDs. Make sure your MISP has the warninglist submodule enabled and updated or else this tool might end up missing valid domains/hostnames/urls. The missing lists are: %s"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:26
+msgid "Proposals instead of attributes"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:46
+msgid "Similar Attributes"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:51
+#: View/ObjectReferences/ajax/add.ctp:30
+#: View/Objects/add.ctp:61;100
+#: View/Objects/revise_object.ctp:37;48
+#: View/Pages/doc/using_the_system.ctp:234;284
+#: View/Templates/populate_event_from_template_attributes.ctp:9
+msgid "Comment"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:191
+msgid "Remove resolved attribute"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:208
+msgid "Submit %s"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:233
+msgid "Apply changes to all applicable resolved attributes"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:233;236
+msgid "Change all"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:235
+msgid "Update all comment fields"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:2
+msgid ">Results of the import"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:3
+msgid "%s attributes created successfully, %s  indicators could not be mapped and saved."
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:7
+msgid "Successfully added attributes"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:10;32
+#: View/Feeds/preview_event.ctp:11
+#: View/Galaxies/view.ctp:18
+#: View/Organisations/ajax/merge.ctp:58
+#: View/Pages/doc/using_the_system.ctp:204
+#: View/Servers/preview_event.ctp:17
+msgid "Uuid"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:29
+msgid "Failed indicators"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:33
+msgid "Search term"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:34
+msgid "Content"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:45
+msgid "Visualisation"
+msgstr ""
+
+#: View/Events/upload_analysis_file.ctp:6
+msgid "Import analysis file"
+msgstr ""
+
+#: View/Events/upload_analysis_file.ctp:61
+msgid "Create Objects"
+msgstr ""
+
+#: View/Events/upload_stix.ctp:6
+msgid "Import %s file"
+msgstr ""
+
+#: View/Events/upload_stix.ctp:9
+msgid "%s file"
+msgstr ""
+
+#: View/Events/upload_stix.ctp:24
+msgid "Include the original imported file as attachment"
+msgstr ""
+
+#: View/Events/view.ctp:53
+#: View/Servers/preview_event.ctp:12
+#: View/Sightings/ajax/list_sightings.ctp:9
+msgid "Event ID"
+msgstr ""
+
+#: View/Events/view.ctp:57
+msgid "Source Organisation"
+msgstr ""
+
+#: View/Events/view.ctp:66
+msgid "Member Organisation"
+msgstr ""
+
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
+msgid "Owner org"
+msgstr ""
+
+#: View/Events/view.ctp:135
+#: View/Feeds/preview_event.ctp:30
+#: View/Pages/doc/using_the_system.ctp:64;168;209
+#: View/Servers/preview_event.ctp:41
+msgid "Threat Level"
+msgstr ""
+
+#: View/Events/view.ctp:140
+#: View/Feeds/preview_event.ctp:37
+#: View/Pages/doc/using_the_system.ctp:70;177;210
+#: View/Servers/preview_event.ctp:48
+msgid "Analysis"
+msgstr ""
+
+#: View/Events/view.ctp:161
+#: View/Feeds/preview_event.ctp:42
+#: View/Pages/doc/using_the_system.ctp:185;212
+msgid "Info"
+msgstr ""
+
+#: View/Events/view.ctp:165
+#: View/Feeds/preview_event.ctp:55;60;65
+#: View/Pages/doc/using_the_system.ctp:160;213
+#: View/Servers/preview_event.ctp:78;88
+#: View/Servers/preview_index.ctp:112
+msgid "Published"
+msgstr ""
+
+#: View/Events/view.ctp:173
+msgid "#Attributes"
+msgstr ""
+
+#: View/Events/view.ctp:177
+msgid "First recorded change"
+msgstr ""
+
+#: View/Events/view.ctp:181
+msgid "Last change"
+msgstr ""
+
+#: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
+msgid "Extends"
+msgstr ""
+
+#: View/Events/view.ctp:210
+msgid "Extended by"
+msgstr ""
+
+#: View/Events/view.ctp:217
+msgid "extended"
+msgstr ""
+
+#: View/Events/view.ctp:217
+msgid "atomic"
+msgstr ""
+
+#: View/Events/view.ctp:265
+msgid "Delegation request"
+msgstr ""
+
+#: View/Events/view.ctp:277
+msgid "View request details"
+msgstr ""
+
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
+msgid "Disabled"
+msgstr ""
+
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
+#: View/Taxonomies/view.ctp:24
+msgid "Enabled"
+msgstr ""
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr ""
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "disable"
+msgstr ""
+
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr ""
+
+#: View/Events/view.ctp:328
+msgid "Show (%s more)"
+msgstr ""
+
+#: View/Events/view.ctp:386;415
+msgid "This event has "
+msgstr ""
+
+#: View/Events/view.ctp:387;416
+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:424
+msgid "Warning: Potential false positives"
+msgstr ""
+
+#: View/Events/view.ctp:440
+msgid "Toggle pivot graph"
+msgstr ""
+
+#: View/Events/view.ctp:440
+msgid "Pivots"
+msgstr ""
+
+#: View/Events/view.ctp:443
+msgid "Toggle galaxies"
+msgstr ""
+
+#: View/Events/view.ctp:443
+msgid "Galaxy"
+msgstr ""
+
+#: View/Events/view.ctp:446
+msgid "Toggle Event graph"
+msgstr ""
+
+#: View/Events/view.ctp:449
+msgid "Toggle Correlation graph"
+msgstr ""
+
+#: View/Events/view.ctp:449
+msgid "Correlation graph"
+msgstr ""
+
+#: View/Events/view.ctp:452
+msgid "Toggle ATT&CK matrix"
+msgstr ""
+
+#: View/Events/view.ctp:452
+msgid "ATT&CK matrix"
+msgstr ""
+
+#: View/Events/view.ctp:455
+msgid "Toggle attributes"
+msgstr ""
+
+#: View/Events/view.ctp:458
+msgid "Toggle discussions"
+msgstr ""
+
+#: View/Events/view.ctp:458
+msgid "Discussion"
+msgstr ""
+
+#: View/Events/view_graph.ctp:19
+msgid "Hover target"
+msgstr ""
+
+#: View/Events/view_graph.ctp:24
+msgid "Selected"
+msgstr ""
+
+#: View/Events/view_graph.ctp:29
+msgid "Expand"
+msgstr ""
+
+#: View/Events/ajax/enrich_event.ctp:4
+msgid "Select the enrichments you wish to run"
+msgstr ""
+
+#: View/Events/ajax/enrichmentChoice.ctp:7
+msgid "Choose the enrichment module that you wish to use for the expansion"
+msgstr ""
+
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:6
+msgid "Event Deletion"
+msgstr ""
+
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:9
+msgid "Are you sure you want to delete "
+msgstr ""
+
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:13
+msgid " Event #"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:6
+msgid "Publish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:8
+msgid "Unpublish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:20
+msgid "Publish but do NOT send alert email? Only for minor changes!"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Feeds/index.ctp:104
+#: View/Pages/doc/using_the_system.ctp:190
+#: View/Servers/ajax/update.ctp:11
+msgid "Publish"
+msgstr ""
+
+#: View/Events/ajax/exportChoice.ctp:2
+msgid "Choose the format that you wish to download the event in"
+msgstr ""
+
+#: View/Events/ajax/importChoice.ctp:2
+msgid "Choose the format that you would like to use for the import"
+msgstr ""
+
+#: View/Events/ajax/importChoice.ctp:7
+msgid "Import %s"
+msgstr ""
+
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "Toggle Correlation %s"
+msgstr ""
+
+#: View/Events/ajax/toggle_correlation.ctp:11
+msgid "Re-enable the correlation for this event. This will automatically re-correlate all contained attributes."
+msgstr ""
+
+#: View/Events/ajax/toggle_correlation.ctp:13
+msgid "This will remove all correlations that already exist for the event and prevent any events to be related via correlations as long as this setting is disabled. Make sure you understand the downsides of disabling correlations."
+msgstr ""
+
+#: View/Events/ajax/toggle_correlation.ctp:20
+msgid "Toggle correlation"
+msgstr ""
+
+#: View/Feeds/add.ctp:4
+msgid "Add MISP Feed"
+msgstr ""
+
+#: View/Feeds/add.ctp:5
+msgid "Add a new MISP feed source."
+msgstr ""
+
+#: View/Feeds/add.ctp:15
+#: View/Feeds/edit.ctp:15
+msgid "Feed name"
+msgstr ""
+
+#: View/Feeds/add.ctp:20
+#: View/Feeds/edit.ctp:20
+msgid "Name of the content provider"
+msgstr ""
+
+#: View/Feeds/add.ctp:24
+msgid "Input Source"
+msgstr ""
+
+#: View/Feeds/add.ctp:34
+#: View/Feeds/edit.ctp:60
+msgid "Remove input after ingestion"
+msgstr ""
+
+#: View/Feeds/add.ctp:42
+#: View/Feeds/edit.ctp:68
+msgid "URL of the feed"
+msgstr ""
+
+#: View/Feeds/add.ctp:46
+#: View/Feeds/edit.ctp:72
+msgid "Source Format"
+msgstr ""
+
+#: View/Feeds/add.ctp:55
+#: View/Feeds/edit.ctp:32
+msgid "Any headers to be passed with requests (for example: Authorization)"
+msgstr ""
+
+#: View/Feeds/add.ctp:59
+#: View/Feeds/edit.ctp:36
+msgid "Line break separated list of headers in the \"headername: value\" format"
+msgstr ""
+
+#: View/Feeds/add.ctp:63
+#: View/Feeds/edit.ctp:40
+msgid "Add Basic Auth"
+msgstr ""
+
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:44
+msgid "Username"
+msgstr ""
+
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:48
+#: View/Pages/doc/administration.ctp:88;117
+#: View/Users/admin_add.ctp:40
+#: View/Users/admin_edit.ctp:40
+#: View/Users/change_pw.ctp:9
+msgid "Password"
+msgstr ""
+
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:52
+msgid "Add basic auth header"
+msgstr ""
+
+#: View/Feeds/add.ctp:82
+#: View/Feeds/edit.ctp:81
+msgid "Target Event"
+msgstr ""
+
+#: View/Feeds/add.ctp:92
+#: View/Feeds/edit.ctp:91
+msgid "Target Event ID"
+msgstr ""
+
+#: View/Feeds/add.ctp:94
+#: View/Feeds/edit.ctp:93
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr ""
+
+#: View/Feeds/add.ctp:102
+#: View/Feeds/edit.ctp:101
+msgid "Value field(s) in the CSV"
+msgstr ""
+
+#: View/Feeds/add.ctp:103
+#: View/Feeds/edit.ctp:102
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
+msgstr ""
+
+#: View/Feeds/add.ctp:105
+#: View/Feeds/edit.ctp:104
+msgid "2,3,4 (column position separated by commas)"
+msgstr ""
+
+#: View/Feeds/add.ctp:113
+#: View/Feeds/edit.ctp:112
+msgid "Delimiter"
+msgstr ""
+
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:113
+msgid "Set the default CSV delimiter (default = \",\")"
+msgstr ""
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:123
+msgid "Exclusion Regex"
+msgstr ""
+
+#: View/Feeds/add.ctp:126
+#: View/Feeds/edit.ctp:124
+msgid "Add a regex pattern for detecting iocs that should be skipped (this can be useful to exclude any references to the actual report / feed for example)"
+msgstr ""
+
+#: View/Feeds/add.ctp:128
+msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
+msgstr ""
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:134
+msgid "Auto Publish"
+msgstr ""
+
+#: View/Feeds/add.ctp:137
+msgid "Publish events directly after pulling the feed - if you would like to review the event before publishing uncheck this"
+msgstr ""
+
+#: View/Feeds/add.ctp:146
+#: View/Feeds/edit.ctp:143
+msgid "Override IDS Flag"
+msgstr ""
+
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:144
+msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
+msgstr ""
+
+#: View/Feeds/add.ctp:156
+#: View/Feeds/edit.ctp:153
+#: View/Feeds/index.ctp:105
+msgid "Delta Merge"
+msgstr ""
+
+#: View/Feeds/add.ctp:157
+#: View/Feeds/edit.ctp:154
+msgid "Merge attributes (only add new attributes, remove revoked attributes)"
+msgstr ""
+
+#: View/Feeds/add.ctp:185
+#: View/Feeds/edit.ctp:181
+msgid "Default Tag"
+msgstr ""
+
+#: View/Feeds/add.ctp:191
+#: View/Feeds/edit.ctp:186
+msgid "Filter rules"
+msgstr ""
+
+#: View/Feeds/add.ctp:192
+#: View/Feeds/edit.ctp:187
+msgid "Events with the following tags allowed"
+msgstr ""
+
+#: View/Feeds/add.ctp:193
+#: View/Feeds/edit.ctp:188
+msgid "Events with the following tags blocked"
+msgstr ""
+
+#: View/Feeds/add.ctp:194
+#: View/Feeds/edit.ctp:189
+msgid "Events with the following organisations allowed"
+msgstr ""
+
+#: View/Feeds/add.ctp:195
+#: View/Feeds/edit.ctp:190
+msgid "Events with the following organisations blocked"
+msgstr ""
+
+#: View/Feeds/add.ctp:196
+#: View/Feeds/edit.ctp:191
+#: View/Servers/add.ctp:102
+#: View/Servers/edit.ctp:147;153
+msgid "Modify"
+msgstr ""
+
+#: View/Feeds/compare_feeds.ctp:66
+msgid "None or less than 1% of the data of %s is contained in %s (%s matching values)"
+msgstr ""
+
+#: View/Feeds/compare_feeds.ctp:67
+msgid "%s\\% of the data of %s is contained in %s (%s matching values)"
+msgstr ""
+
+#: View/Feeds/edit.ctp:4
+msgid "Edit MISP Feed"
+msgstr ""
+
+#: View/Feeds/edit.ctp:5
+msgid "Edit a new MISP feed source."
+msgstr ""
+
+#: View/Feeds/edit.ctp:126
+msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
+msgstr ""
+
+#: View/Feeds/edit.ctp:206
+msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
+msgstr ""
+
+#: View/Feeds/edit.ctp:207
+#: View/Servers/add.ctp:132
+#: View/Servers/edit.ctp:181
+msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
+msgstr ""
+
+#: View/Feeds/edit.ctp:208
+#: View/Servers/add.ctp:133
+#: View/Servers/edit.ctp:180
+msgid "The organization having the external server you want to sync with. Example: BE"
+msgstr ""
+
+#: View/Feeds/edit.ctp:209
+#: View/Servers/add.ctp:134
+#: View/Servers/edit.ctp:182
+msgid "You can find the authentication key on your profile on the external server."
+msgstr ""
+
+#: View/Feeds/edit.ctp:210
+#: View/Servers/add.ctp:135
+#: View/Servers/edit.ctp:183
+msgid "Allow the upload of events and their attributes."
+msgstr ""
+
+#: View/Feeds/edit.ctp:211
+#: View/Servers/add.ctp:136
+#: View/Servers/edit.ctp:184
+msgid "Allow the download of events and their attributes from the server."
+msgstr ""
+
+#: View/Feeds/edit.ctp:212
+#: View/Servers/edit.ctp:185
+msgid "Unpublish new event (working with Push event)."
+msgstr ""
+
+#: View/Feeds/edit.ctp:213
+#: View/Servers/edit.ctp:186
+msgid "Publish new event without email (working with Pull event)."
+msgstr ""
+
+#: View/Feeds/edit.ctp:214
+#: View/Servers/edit.ctp:187
+msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority."
+msgstr ""
+
+#: View/Feeds/edit.ctp:215
+#: View/Servers/add.ctp:140
+#: View/Servers/edit.ctp:189
+msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
+msgstr ""
+
+#: View/Feeds/freetext_index.ctp:2
+msgid "Parsed attributes from feed "
+msgstr ""
+
+#: View/Feeds/freetext_index.ctp:7
+msgid "Fetch selected"
+msgstr ""
+
+#: View/Feeds/freetext_index.ctp:35
+msgid "Correlations"
+msgstr ""
+
+#: View/Feeds/import_feeds.ctp:4
+msgid "Paste feed data"
+msgstr ""
+
+#: View/Feeds/import_feeds.ctp:5
+msgid "Paste a MISP feed metadata JSON below to add feeds."
+msgstr ""
+
+#: View/Feeds/import_feeds.ctp:10
+msgid "Feed metadata JSON"
+msgstr ""
+
+#: View/Feeds/index.ctp:2
+msgid "Feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:3
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
+msgstr ""
+
+#: View/Feeds/index.ctp:5
+msgid "Cache all feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:6
+msgid "Cache freetext/CSV feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:7
+msgid "Cache MISP feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:8
+msgid "Fetch and store all feed data"
+msgstr ""
+
+#: View/Feeds/index.ctp:33
+msgid "Enable selected"
+msgstr ""
+
+#: View/Feeds/index.ctp:39
+msgid "Disable selected"
+msgstr ""
+
+#: View/Feeds/index.ctp:45
+msgid "Enable caching for selected"
+msgstr ""
+
+#: View/Feeds/index.ctp:51
+msgid "Disable caching for selected"
+msgstr ""
+
+#: View/Feeds/index.ctp:61
+msgid "Default feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:66
+msgid "Custom feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:71
+msgid "All feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:76
+msgid "Enabled feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:95
+msgid "Enable pulling the feed into your MISP as events/attributes."
+msgstr ""
+
+#: View/Feeds/index.ctp:96
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:98
+msgid "Feed Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
+msgstr ""
+
+#: View/Feeds/index.ctp:106
+msgid "Override IDS"
+msgstr ""
+
+#: View/Feeds/index.ctp:110
+msgid "Caching"
+msgstr ""
+
+#: View/Feeds/index.ctp:158
+#: View/Servers/index.ctp:74;75
+msgid "Rules"
+msgstr ""
+
+#: View/Feeds/index.ctp:185
+msgid "Error: Invalid event!"
+msgstr ""
+
+#: View/Feeds/index.ctp:190
+msgid "Fixed event %s"
+msgstr ""
+
+#: View/Feeds/index.ctp:193
+msgid "New fixed event"
+msgstr ""
+
+#: View/Feeds/index.ctp:245
+#: View/Servers/index.ctp:94
+msgid "Age: "
+msgstr ""
+
+#: View/Feeds/index.ctp:247
+#: View/Servers/index.ctp:102
+msgid "Not cached"
+msgstr ""
+
+#: View/Feeds/index.ctp:258
+msgid "Explore the events remotely"
+msgstr ""
+
+#: View/Feeds/index.ctp:260
+msgid "Fetch all events"
+msgstr ""
+
+#: View/Feeds/index.ctp:265
+msgid "Are you sure you want to permanently remove the feed (%s)?"
+msgstr ""
+
+#: View/Feeds/index.ctp:267
+msgid "Download feed metadata as JSON"
+msgstr ""
+
+#: View/Feeds/preview_event.ctp:6
+msgid "You are currently viewing an event from a feed (%s by %s)"
+msgstr ""
+
+#: View/Feeds/preview_index.ctp:2
+msgid "You are currently viewing the event index of a feed (%s by %s)."
+msgstr ""
+
+#: View/Galaxies/view.ctp:12
+msgid "Galaxy ID"
+msgstr ""
+
+#: View/Galaxies/view.ctp:16
+#: View/Taxonomies/view.ctp:9
+msgid "Namespace"
+msgstr ""
+
+#: View/Galaxies/view.ctp:22
+#: View/ObjectTemplates/view.ctp:7
+#: View/Taxonomies/view.ctp:19
+#: View/Warninglists/view.ctp:12
+msgid "Version"
+msgstr ""
+
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "Galaxy Cluster Deletion"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies."
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:82
+msgid "Delete galaxy cluster"
+msgstr ""
+
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
+msgstr ""
+
+#: View/Jobs/index.ctp:12
+msgid "Are you sure you want to purge all completed job entries? Job entries are considered as log entries and have no impact on actual job execution."
+msgstr ""
+
+#: View/Jobs/index.ctp:18
+msgid "Are you sure you want to purge all job entries? Job entries are considered as log entries and have no impact on actual job execution."
+msgstr ""
+
+#: View/Jobs/index.ctp:52
+msgid "Completed."
+msgstr ""
+
+#: View/Jobs/index.ctp:68;98
+msgid "Show all queues"
+msgstr ""
+
+#: View/Jobs/index.ctp:74;99
+msgid "Show default queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:99
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr ""
+
+#: View/Jobs/index.ctp:101
+msgid "Cache"
+msgstr ""
+
+#: View/Jobs/index.ctp:127
+msgid "No worker active"
+msgstr ""
+
+#: View/Jobs/index.ctp:159
+msgid "View stacktrace"
+msgstr ""
+
+#: View/Jobs/ajax/error.ctp:2
+msgid "Background Job Error Browser"
+msgstr ""
+
+#: View/Jobs/ajax/error.ctp:21
+msgid "Click to show stack trace"
+msgstr ""
+
+#: View/Jobs/ajax/error.ctp:22
+msgid "Click to hide stack trace"
+msgstr ""
+
+#: View/Jobs/ajax/error.ctp:29
+msgid "No error data found. Generally job error data is purged from Redis after 24 hours, however, you can still view the errors in the log files in \"/app/tmp/logs\"."
+msgstr ""
+
+#: View/Logs/admin_index.ctp:2
+#: View/Logs/event_index.ctp:6
+msgid "Logs"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:5
+msgid "Results for all log entries"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:8
+msgid "for user"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:9
+msgid "of organisation"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:10
+msgid "for model"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:11
+msgid "for model ID"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:12
+msgid "of type"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:13
+msgid "with the title"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:14
+msgid "including the change"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:15
+msgid "from IP"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:75
+#: View/Logs/admin_search.ctp:14
+msgid "Model ID"
+msgstr ""
+
+#: View/Logs/admin_search.ctp:8
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
+#: View/Sightings/ajax/list_sightings.ctp:6
+#: View/Templates/view.ctp:33
+#: View/Users/admin_add.ctp:51
+#: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
+msgid "Organisation"
+msgstr ""
+
+#: View/Logs/admin_search.ctp:19
+#: View/Pages/doc/administration.ctp:185;198
+#: View/Pages/doc/using_the_system.ctp:271
+#: View/Threads/index.ctp:22
+msgid "Title"
+msgstr ""
+
+#: View/Logs/admin_search.ctp:21
+#: View/Pages/doc/administration.ctp:186;199
+msgid "Change"
+msgstr ""
+
+#: View/Logs/test_for_stolen_attributes.ctp:2
+msgid "Stolen attribute validation"
+msgstr ""
+
+#: View/Logs/test_for_stolen_attributes.ctp:6
+msgid "Nothing to see here, move along."
+msgstr ""
+
+#: View/Logs/test_for_stolen_attributes.ctp:9
+msgid "Attribute (%s) associated to events: %s"
+msgstr ""
+
+#: View/News/add.ctp:28
+#: View/News/edit.ctp:29
+msgid "Create anonymously"
+msgstr ""
+
+#: View/News/index.ctp:22
+msgid "Edit news message"
+msgstr ""
+
+#: View/News/index.ctp:24
+msgid "Are you sure you want to delete news item # %s?"
+msgstr ""
+
+#: View/News/index.ctp:47
+msgid "There are currently no news messages."
+msgstr ""
+
+#: View/Noticelists/index.ctp:2
+msgid "Noticelists"
+msgstr ""
+
+#: View/Noticelists/index.ctp:33
+msgid "ref"
+msgstr ""
+
+#: View/Noticelists/index.ctp:34
+msgid "geographical_area"
+msgstr ""
+
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr ""
+
+#: View/Noticelists/index.ctp:36
+#: View/Pages/doc/using_the_system.ctp:371
+msgid "enabled"
+msgstr ""
+
+#: View/Noticelists/ajax/delete_confirmation.ctp:9
+msgid "Noticelist Deletion"
+msgstr ""
+
+#: View/Noticelists/ajax/delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Noticelist #%s?"
+msgstr ""
+
+#: View/ObjectReferences/ajax/add.ctp:4
+msgid "Add Object Reference"
+msgstr ""
+
+#: View/ObjectReferences/ajax/add.ctp:10;17
+msgid "Relationship type"
+msgstr ""
+
+#: View/ObjectReferences/ajax/add.ctp:42
+msgid "Target UUID"
+msgstr ""
+
+#: View/ObjectReferences/ajax/add.ctp:54
+#: View/Objects/orphaned_object_diagnostics.ctp:38
+msgid "Object"
+msgstr ""
+
+#: View/ObjectReferences/ajax/add.ctp:120
+msgid "Target Details"
+msgstr ""
+
+#: View/ObjectReferences/ajax/delete.ctp:10
+msgid "Object reference Deletion"
+msgstr ""
+
+#: View/ObjectReferences/ajax/delete.ctp:14
+msgid "Are you sure you want to soft delete Object reference #%s?%s"
+msgstr ""
+
+#: View/ObjectReferences/ajax/delete.ctp:17
+msgid "Are you sure you want to hard delete Object reference #%s?%s"
+msgstr ""
+
+#: View/ObjectReferences/ajax/delete.ctp:25
+msgid " The Attribute will be permanently deleted and unrecoverable. Also, this will prevent the deletion to be propagated to other instances."
+msgstr ""
+
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:24
+#: View/Pages/doc/categories_and_types.ctp:40
+#: View/Pages/doc/md/categories_and_types.ctp:23
+msgid "Categories"
+msgstr ""
+
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:25
+msgid "Sane defaults"
+msgstr ""
+
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:26
+msgid "List of valid Values"
+msgstr ""
+
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:27
+msgid "Disable correlation"
+msgstr ""
+
+#: View/ObjectTemplates/index.ctp:2
+msgid "Object Template index"
+msgstr ""
+
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
+msgid "Requirements"
+msgstr ""
+
+#: View/ObjectTemplates/index.ctp:118
+msgid "Are you sure you want to force an update for template # %s?"
+msgstr ""
+
+#: View/ObjectTemplates/index.ctp:119
+msgid "Are you sure you want to delete template # %s?"
+msgstr ""
+
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/ObjectTemplates/view.ctp:33
+msgid " Object Template"
+msgstr ""
+
+#: View/Objects/add.ctp:6
+msgid " Object"
+msgstr ""
+
+#: View/Objects/add.ctp:9
+msgid "Object Template"
+msgstr ""
+
+#: View/Objects/add.ctp:37
+msgid "Meta category"
+msgstr ""
+
+#: View/Objects/add.ctp:79
+msgid "Warning, issues found with the template"
+msgstr ""
+
+#: View/Objects/add.ctp:92
+msgid "Save"
+msgstr ""
+
+#: View/Objects/add.ctp:93
+msgid "Name :: type"
+msgstr ""
+
+#: View/Objects/add.ctp:98
+msgid "Disable Correlation"
+msgstr ""
+
+#: View/Objects/add.ctp:150;161
+msgid "Warning: You are about to share data that is of a classified nature. Make sure that you are authorised to share this."
+msgstr ""
+
+#: View/Objects/add.ctp:178;188
+msgid "Enter value manually"
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:3
+msgid "Object reconstruction"
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:5
+msgid "Due to a bug prior to version 2.4.89, a condition could cause objects to be overwritten on a pull, leading to orphaned object attributes. This script reconstructs the missing objects if any exist."
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:6
+msgid " Please create a backup of your mysql database before executing the script."
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:9
+msgid "No unmapped data found, everything is working as expected."
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:16
+msgid "Unmapped Attributes"
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:17
+msgid "Keep in mind that some of the unmapped attributes can get reconstructed on a second pass of this script."
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:30
+msgid "Reconstructable objects"
+msgstr ""
+
+#: View/Objects/revise_object.ctp:2
+msgid "Object pre-save review"
+msgstr ""
+
+#: View/Objects/revise_object.ctp:3
+msgid "Make sure that the below Object reflects your expectation before submiting it."
+msgstr ""
+
+#: View/Objects/revise_object.ctp:47
+msgid "To IDS"
+msgstr ""
+
+#: View/Objects/ajax/delete.ctp:6
+msgid "Object Deletion"
+msgstr ""
+
+#: View/Objects/ajax/delete.ctp:12
+msgid "The Object will be permanently deleted and unrecoverable. Also, this will prevent the deletion to be propagated to other instances."
+msgstr ""
+
+#: View/Objects/ajax/delete.ctp:15
+msgid "Are you sure you want to %sdelete Object #%s? %s"
+msgstr ""
+
+#: View/OrgBlacklists/add.ctp:4
+msgid "Add Organisation Blacklist Entries"
+msgstr ""
+
+#: View/OrgBlacklists/add.ctp:5
+msgid "Simply paste a list of all the organisation UUIDs that you wish to block from being entered."
+msgstr ""
+
+#: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
+msgid "Organisation name"
+msgstr ""
+
+#: View/OrgBlacklists/add.ctp:17
+msgid "(Optional) The organisation name that the organisation is associated with"
+msgstr ""
+
+#: View/OrgBlacklists/index.ctp:2
+msgid "Organisation Blacklists"
+msgstr ""
+
+#: View/OrgBlacklists/index.ctp:37
+msgid "Are you sure you want to delete the blacklist entry for the organisation UUID %s?"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:4
+msgid "New Organisation"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:5
+#: View/Organisations/admin_edit.ctp:5
+msgid "If the organisation should have access to this instance, make sure that the Local organisation setting is checked. <br />If you would only like to add a known external organisation for inclusion in sharing groups, uncheck the Local organisation setting."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:7
+msgid "Local organisation"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:11
+msgid "Mandatory fields."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:15
+#: View/Organisations/admin_edit.ctp:14
+msgid "Organisation Identifier"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:15
+#: View/Organisations/admin_edit.ctp:14
+msgid "Brief organisation identifier"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:18
+#: View/Organisations/admin_edit.ctp:17
+msgid "No image uploaded for this identifier"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+msgid "Paste UUID or click generate"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:25
+#: View/Organisations/admin_edit.ctp:24
+msgid "Generate UUID"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:25
+#: View/Organisations/admin_edit.ctp:24
+msgid "Generate a new UUID for the organisation"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:27
+#: View/Organisations/admin_edit.ctp:38
+msgid "A brief description of the organisation"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:27
+#: View/Organisations/admin_edit.ctp:38
+msgid "A description of the organisation that is purely informational."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:30
+#: View/Organisations/admin_edit.ctp:41
+msgid "Bind user accounts to domains (line separated)"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:30
+#: View/Organisations/admin_edit.ctp:41
+msgid "Enter a (list of) domain name(s) to enforce when creating users."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:33
+#: View/Organisations/admin_edit.ctp:44
+msgid "The following fields are all optional."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:38
+#: View/Organisations/admin_edit.ctp:49
+msgid "Logo (48x48 png)"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:44
+#: View/Organisations/admin_edit.ctp:55
+msgid "For example \"financial\"."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:45
+#: View/Organisations/admin_edit.ctp:56
+msgid "Type of organisation"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:45
+#: View/Organisations/admin_edit.ctp:56
+msgid "Freetext description of the org."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:46
+#: View/Organisations/admin_edit.ctp:57
+msgid "You can add some contact details for the organisation here, if applicable."
+msgstr ""
+
+#: View/Organisations/admin_edit.ctp:11
+msgid "Mandatory fields. Leave the UUID field empty if the organisation doesn't have a UUID from another instance."
+msgstr ""
+
+#: View/Organisations/admin_edit.ctp:30
+msgid "An organisation with the above uuid already exists. Would you like to merge this organisation into the existing one?"
+msgstr ""
+
+#: View/Organisations/admin_edit.ctp:32
+msgid "Click here"
+msgstr ""
+
+#: View/Organisations/index.ctp:5;67
+#: View/Users/statistics.ctp:46
+#: View/Users/statistics_data.ctp:57
+#: View/Users/statistics_orgs.ctp:13
+msgid "All organisations"
+msgstr ""
+
+#: View/Organisations/index.ctp:6
+msgid ", both local and remote"
+msgstr ""
+
+#: View/Organisations/index.ctp:9;62
+#: View/Users/statistics_orgs.ctp:12
+msgid "Known remote organisations"
+msgstr ""
+
+#: View/Organisations/index.ctp:10
+msgid " on other instances"
+msgstr ""
+
+#: View/Organisations/index.ctp:13;57
+#: View/Users/statistics_orgs.ctp:11
+msgid "Local organisations"
+msgstr ""
+
+#: View/Organisations/index.ctp:14
+msgid " having a presence on this instance"
+msgstr ""
+
+#: View/Organisations/index.ctp:25
+msgid "Paginate"
+msgstr ""
+
+#: View/Organisations/index.ctp:27
+msgid "View all"
+msgstr ""
+
+#: View/Organisations/index.ctp:86
+#: View/Users/login.ctp:8
+#: View/Users/statistics_orgs.ctp:30
+msgid "Logo"
+msgstr ""
+
+#: View/Organisations/index.ctp:97
+msgid "Added by"
+msgstr ""
+
+#: View/Organisations/index.ctp:138
+#: View/Posts/add.ctp:33
+msgid ""
+msgstr ""
+""
+
+#: View/Organisations/view.ctp:8
+msgid "Local or remote"
+msgstr ""
+
+#: View/Organisations/view.ctp:12
+#: View/SharingGroups/view.ctp:43
+msgid "Local"
+msgstr ""
+
+#: View/Organisations/view.ctp:12
+msgid "Remote"
+msgstr ""
+
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
+msgstr ""
+
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr ""
+
+#: View/Organisations/view.ctp:62;63
+msgid "Members"
+msgstr ""
+
+#: View/Organisations/ajax/fetch_orgs_for_sg.ctp:2
+msgid "Select organisations to add"
+msgstr ""
+
+#: View/Organisations/ajax/fetch_orgs_for_sg.ctp:7
+msgid "Available Organisations"
+msgstr ""
+
+#: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
+msgid "Added Organisations"
+msgstr ""
+
+#: View/Organisations/ajax/fetch_orgs_for_sg.ctp:26
+msgid "Submit organisations"
+msgstr ""
+
+#: View/Organisations/ajax/landingpage.ctp:2
+msgid "Landing page for %s"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:3
+msgid "This will remove the selected organisation and hand over all objects belonging to it to the target organisation. This process is irreversible. Are you sure you want to proceed?"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:6
+msgid "Warning: Merging an organisation into another will be transfer all users and data belonging to the organisation to another."
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:19
+msgid "Organisation type"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:33
+msgid "Target Local Organisation"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:45
+msgid "Target External Organisation"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:55
+msgid "Organisation to be merged"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:56;63
+#: View/Pages/doc/using_the_system.ctp:163;203
+msgid "ID"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:62
+msgid "Organisation to be merged into"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:70
+msgid "Merge"
+msgstr ""
+
+#: View/Organisations/ajax/sg_org_row_empty.ctp:10
+msgid "Mark organisation as sharing group extender"
+msgstr ""
+
+#: View/Pages/administration.ctp:10
+msgid "Administrative actions"
+msgstr ""
+
+#: View/Pages/administration.ctp:14
+msgid "Reset the attribute counts"
+msgstr ""
+
+#: View/Pages/administration.ctp:14
+msgid "Events need to have no validation issues"
+msgstr ""
+
+#: View/Pages/administration.ctp:15
+msgid "Recorrelate attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:16
+msgid "Recorrelate proposals"
+msgstr ""
+
+#: View/Pages/administration.ctp:18
+msgid "Verify Certificates"
+msgstr ""
+
+#: View/Pages/administration.ctp:18
+msgid "Check whether every user's certificate is usable"
+msgstr ""
+
+#: View/Pages/administration.ctp:19
+msgid "Extend Organization length"
+msgstr ""
+
+#: View/Pages/administration.ctp:19
+msgid "Hotfix 2.3.57: Increase the max length of the organization field when adding a new server connection."
+msgstr ""
+
+#: View/Pages/administration.ctp:20
+msgid "Convert log fields to text"
+msgstr ""
+
+#: View/Pages/administration.ctp:20
+msgid "Hotfix 2.3.78: Some of the log fields that were varchar(255) ended up truncating the data. This function will change them to \"text\""
+msgstr ""
+
+#: View/Pages/administration.ctp:21
+msgid "Fix duplicate UUIDs"
+msgstr ""
+
+#: View/Pages/administration.ctp:21
+msgid "Hotfix 2.3.107: it was previously possible to get duplicate attribute UUIDs in the database, this script will remove all duplicates and ensure that duplicates will not be entered into the database in the future."
+msgstr ""
+
+#: View/Pages/administration.ctp:22
+msgid "Remove duplicate events (with the same UUID)"
+msgstr ""
+
+#: View/Pages/administration.ctp:22
+msgid "Hotfix 2.3.115: In some rare situations it could occur that a duplicate of an event was created on an instance, with the exact same uuid. This action will remove any such duplicates and make sure that this cannot happen again."
+msgstr ""
+
+#: View/Pages/administration.ctp:23
+msgid "Prune orphaned attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:23
+msgid "In some rare occasions it can happen that you end up with some attributes in your database that do not belong to an event - for example during a race condition between an event insert and a delete. This tool will collect and delete any such orphaned attributes. If you ever run into an issue where you cannot add an attribute with a specific valid value, this is probably the reason."
+msgstr ""
+
+#: View/Pages/administration.ctp:24
+msgid "Clean regex table of potentially malicious entries"
+msgstr ""
+
+#: View/Pages/administration.ctp:24
+msgid "Hotfix 2.3.160: Prior to this version it was possible for a user/admin with Regex permission to create a malicious regular expression that could be used to execute arbitrary code. Since this version it is no longer possible to input such expressions, but already existing malicious entries still have to be cleaned using this tool."
+msgstr ""
+
+#: View/Pages/administration.ctp:25
+msgid "Remove URL type attribute sanitisation"
+msgstr ""
+
+#: View/Pages/administration.ctp:25
+msgid "Hotfix 2.3.173: Sanitised URLs can cause issues with the NIDS exports and as of this version attributes will be modified on entry to correct this. To correct existing entries, run this script."
+msgstr ""
+
+#: View/Pages/administration.ctp:26
+msgid "Index tables"
+msgstr ""
+
+#: View/Pages/administration.ctp:26
+msgid "This script will create indeces for all of the tables in MISP (other than primary keys)"
+msgstr ""
+
+#: View/Pages/administration.ctp:27
+msgid "Fix non-empty sharing group IDs"
+msgstr ""
+
+#: View/Pages/administration.ctp:27
+msgid "This script will change the sharing_group_id to 0 in all non sharing group setting events and attributes)"
+msgstr ""
+
+#: View/Pages/administration.ctp:29
+msgid "Upgrading a 2.3 instance to 2.4"
+msgstr ""
+
+#: View/Pages/administration.ctp:30
+msgid "Warning: Running this scripts below can result in the loss of data. Make sure that you back your database up before running them."
+msgstr ""
+
+#: View/Pages/administration.ctp:31
+msgid "The order for the 2.4 upgrade procedure is"
+msgstr ""
+
+#: View/Pages/administration.ctp:33
+msgid "%s - run this to migrate the 2.3 data to the 2.4 format"
+msgstr ""
+
+#: View/Pages/administration.ctp:33
+msgid "Upgrade to 2.4"
+msgstr ""
+
+#: View/Pages/administration.ctp:34
+msgid "If it completes successful, run the %s to remove the fields that are specific to 2.3. Make sure that the migration of the data to the 2.4 format was successful (you can check the result in the audit logs). If you have run the 2.4 upgrade script previously but are running into SQL errors on the column 'org', run this script."
+msgstr ""
+
+#: View/Pages/administration.ctp:34
+msgid "2.3->2.4 clean-up script"
+msgstr ""
+
+#: View/Pages/administration.ctp:34
+msgid "If the migration of your data from 2.4 is not complete this will lead to the loss of data. Backing your DB up is highly recommended. Are you ready to start removing the obsolete fields?"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:3
+#: View/Pages/doc/concepts.ctp:3
+#: View/Pages/doc/general.ctp:3
+#: View/Pages/doc/quickstart.ctp:3;14
+#: View/Pages/doc/user_management.ctp:3
+#: View/Pages/doc/using_the_system.ctp:3
+msgid "Quick Start"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:4
+#: View/Pages/doc/concepts.ctp:4
+#: View/Pages/doc/general.ctp:4;14
+#: View/Pages/doc/quickstart.ctp:4
+#: View/Pages/doc/user_management.ctp:4
+#: View/Pages/doc/using_the_system.ctp:4
+msgid "General Layout"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:5
+#: View/Pages/doc/concepts.ctp:5;14
+#: View/Pages/doc/general.ctp:5
+#: View/Pages/doc/quickstart.ctp:5
+#: View/Pages/doc/user_management.ctp:5
+#: View/Pages/doc/using_the_system.ctp:5
+msgid "General Concepts"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:6
+#: View/Pages/doc/concepts.ctp:6
+#: View/Pages/doc/general.ctp:6
+#: View/Pages/doc/quickstart.ctp:6
+#: View/Pages/doc/user_management.ctp:6
+#: View/Pages/doc/using_the_system.ctp:6
+msgid "User Management and Global actions"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:7
+#: View/Pages/doc/concepts.ctp:7
+#: View/Pages/doc/general.ctp:7
+#: View/Pages/doc/quickstart.ctp:7
+#: View/Pages/doc/user_management.ctp:13
+#: View/Pages/doc/using_the_system.ctp:7;26
+msgid "Using the system"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:10
+msgid "Settings and Diagnostics"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:11;171
+msgid "Blacklist"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:14
+msgid "User Management"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:15
+msgid "Role Management"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:16
+msgid "Logging"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:17;202
+#: View/Pages/doc/general.ctp:78
+msgid "Administrative Tools"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:18;205
+msgid "Background Processing"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:19
+msgid "FAQ"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:22
+#: View/Pages/doc/categories_and_types.ctp:3
+#: View/Pages/doc/concepts.ctp:9
+#: View/Pages/doc/general.ctp:9
+#: View/Pages/doc/quickstart.ctp:9
+#: View/Pages/doc/user_management.ctp:15
+#: View/Pages/doc/using_the_system.ctp:22
+msgid "Categories and Types"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:27
+msgid "Server settings and diagnostics"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:28
+msgid "Since version 2.3, MISP has a settings and diagnostics tool that allows site-admins to manage and diagnose their MISP installation. You can access this by navigating to Administration - Server settings"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:29
+msgid "Server settings overview with all of the tabs explained."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:30
+msgid "The settings and diagnostics tool is split up into several aspects, all accessible via the tabs on top of the tool. For any unset or incorrectly set setting, or failed diagnostic a number next to the tab name will indicate the number and severity of the issues. If the number is written with a red font, it means that the issue is critical. First, let's look at the various tabs"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:32
+msgid "General overview of the current state of your MISP installation"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:33
+msgid "MISP settings"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:33
+msgid "Basic MISP settings. This includes the way MISP handles the default settings for distribution settings, whether background jobs are enabled, etc"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:34
+msgid "GnuPG settings"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:34
+msgid "GnuPG related settings."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:35
+msgid "HTTP proxy related settings."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:36
+msgid "Security settings"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:36
+msgid "Settings controlling the brute-force protection and the application's salt key."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:37
+#: View/Servers/edit.ctp:82
+msgid "Misc settings"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:37
+msgid "You change the debug options here, but make sure that debug is always disabled on a production system."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:38
+msgid "The diagnostics tool checks if all directories that MISP uses to store data are writeable by the apache user. Also, the tool checks whether the STIX libraries and GnuPG are working as intended."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:39
+msgid "Shows the background workers (if enabled) and shows a warning if they are not running. Admins can also restart the workers here."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:40
+msgid "Download a report in JSON format, compiled of all of the settings visible in the tool."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:42
+msgid "The settings tabs explained."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:43
+msgid "Each of the setting pages is a table with each row representing a setting. Coloured rows indicate that the setting is incorrect / not set and the colour determines the severity (red = critical, yellow = recommended, green = optional). The columns are as follows"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:45
+msgid "The severity of the setting."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:46
+msgid "The setting name."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:47
+msgid "The current value of the setting."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:48
+msgid "A description of what the setting does."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:49
+msgid "If the setting is incorrect / not set, then this field will let the user know what is wrong."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:51
+msgid "The workers tab."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:52
+msgid "The workers tab shows a list of the workers that MISP can use. You can restart the workers using the restart all workers, If the button doesn't work, make sure that the workers were started using the apache user. This can however only be done using the command line, refer to the INSTALL.txt documentation on how to let the workers automatically start on each boot."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:54
+msgid "Worker Type"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:54
+msgid "The worker type is determined by the queue it monitors. MISP currently has 5 queues (cache, default, prio, email and a special _schdlr_ queue)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:55
+msgid "Worker Id"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:55
+msgid "The ID is made up of the machine name, the PID of the worker and the queue it monitors."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:56
+msgid "Displays OK if the worker is running. If the _schdlr_ worker is the only one not running make sure that you copy the config file into the cakeresque directory as described in the INSTALL.txt documentation."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:59
+msgid "Import Blacklist"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:60
+msgid "It is possible to ban certain values from ever being entered into the system via an event info field or an attribute value. This is done by blacklisting the value in this section."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:61;69
+msgid "Adding and modifying entries"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:62
+msgid "Administrators can add, edit or delete blacklisted items by using the appropriate functions in the list's action menu and the menu on the left."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:65
+msgid "The system allows administrators to set up rules for regular expressions that will automatically alter newly entered or imported events."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:66
+msgid "The purpose of Import Regexp entries"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:67
+msgid "They can be used for several things, such as unifying the capitalisation of file paths for more accurate event correlation or to automatically censor the usernames and use system path variable names (changing C:\\Users\\UserName\\Appdata\\Roaming\\file.exe to %APPDATA%\\file.exe).<br />\n"
+"        The second use is blocking, if a regular expression is entered with a blank replacement, any event info or attribute value containing the expression will not be added. Please make sure the entered regexp expression follows the preg_replace pattern rules as described <a href=\"http://php.net/manual/en/function.preg-replace.php\">here</a>."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:70
+msgid "Administrators can add, edit or delete regular expression rules, which are made up of a regex pattern that the system searches for and a replacement for the detected pattern."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:71
+msgid "Add, edit or remove Regexp entries that will affect all newly created attributes here."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:73
+msgid "Managing the Signature whitelist"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:74
+msgid "The signature whitelist view, accessible through the administration menu on the left, allows administrators to create and maintain a list of addresses that are whitelisted from ever being added to the NIDS signatures. Addresses listed here will be commented out when exporting the NIDS list."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:75
+msgid "Whitelisting an address"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:76
+msgid "While in the whitelist view, click on New Whitelist on the left to bring up the add whitelist view to add a new address."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:77
+msgid "Managing the list"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:78
+msgid "When viewing the list of whitelisted addresses, the following pieces of information are shown: The ID of the whitelist entry (assigned automatically when a new address is added), the address itself that is being whitelisted and a set of controls allowing you to delete the entry or edit the address."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:79
+msgid "You can edit or delete currently white-listed addresses using the action buttons on this list."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:81
+msgid "Managing the users"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:82
+msgid "As an admin, you can set up new accounts for users, edit the profiles of users, delete them, or just have a look at all the viewers' profiles. Organisation admins are restricted to executing the same actions on their organisation's users only."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:83
+msgid "Adding a new user"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:84;114
+msgid "To add a new user, click on the New User button in the administration menu to the left and fill out the following fields in the view that is loaded"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:85
+msgid "Add user"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:85
+msgid "Fill this form out to add a new user. Keep in mind that the drop-down menu titled Role controls the privileges the user will have."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:87;116
+msgid "The user's e-mail address, this will be used as his/her login name and as an address to send all the automatic e-mails and e-mails sent by contacting the user as the reporter of an event."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:88
+msgid "A temporary password for the user that he/she should change after the first login. Make sure that it is at least 6 characters long, includes a digit or a special character and contains at least one upper-case and at least one lower-case character."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:89;118
+msgid "Confirm Password"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:89;118
+msgid "This should be an exact copy of the Password field."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:90;119
+msgid "The organisation of the user. Entering ADMIN into this field will give administrator privileges to the user. If you are an organisation admin, then this field will be unchangeable and be set to your own organisation."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:91;120;170
+#: View/Roles/admin_index.ctp:2
+#: View/Roles/index.ctp:2
+msgid "Roles"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:91;120
+msgid "A drop-down list allows you to choose a role-group that the user should belong to. Roles define the privileges of the user. To learn more about roles, <a href=#roles>click here</a>."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:92;121
+#: View/Users/admin_add.ctp:76
+#: View/Users/admin_edit.ctp:71
+#: View/Users/edit.ctp:28
+msgid "Receive alerts when events are published"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:92
+msgid "This option will subscribe the new user to automatically generated e-mails whenever an event is published."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:93;122
+#: View/Users/admin_add.ctp:81
+#: View/Users/admin_edit.ctp:72
+#: View/Users/edit.ctp:29
+msgid "Receive alerts from \"contact reporter\" requests"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:93
+msgid "This option will subscribe the new user to e-mails that are generated when another user tries to get in touch with an event's reporting organisation that matches that of the new user."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:94;123
+#: View/Pages/doc/using_the_system.ctp:399
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
+msgid "Authkey"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:94
+msgid "This is assigned automatically and is the unique authentication key of the user (he/she will be able to reset this and receive a new key). It is used for exports and for connecting one server to another, but it requires the user to be assigned to a role that has auth permission enabled."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:95;124
+msgid "NIDS Sid"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:95;124
+msgid "Nids ID, not yet implemented."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:96;127
+msgid "GnuPGkey"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:96;127
+msgid "The key used for encrypting e-mails sent through the system."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:98
+msgid "Listing all users"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:99
+msgid "To list all current users of the system, just click on List Users under the administration menu to the left. A view will be loaded with a list of all users and the following columns of information"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:100
+msgid "List users"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:100
+msgid "View, Edit or Delete a user using the action buttons to the right."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:102
+msgid "The user's automatically assigned ID number."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:103
+msgid "The organisation that the user belongs to."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:104
+msgid "The e-mail address (and login name) of the user."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
+msgid "Autoalert"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:105
+msgid "Shows whether the user has subscribed to auto-alerts and is always receiving the mass-emails regarding newly published events that he/she is eligible for."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:106
+msgid "Shows whether the user has the subscription to contact reporter e-mails directed at his/her organisation turned on or off."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:107
+msgid "Shows whether the user has entered a GnuPGkey yet."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:108
+msgid "Shows the currently assigned NIDS ID."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:109;125
+msgid "Termsaccepted"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:109
+msgid "This flag indicates whether the user has accepted the terms of use or not."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:110
+#: View/Users/admin_view.ctp:84
+msgid "Newsread"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:110
+msgid "The last point in time when the user has looked at the news section of the system."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:111
+msgid "Action Buttons"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:111
+msgid "Here you can view a detailed view of a user, edit the basic details of a user (same view as the one used for creating a new user, but all the fields come filled out by default) or remove a user completely."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:113
+msgid "Editing a user"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:117
+msgid "It is possible to assign a new password manually for a user. For example, in case that he/she forgot the old one a new temporary one can be assigned. Make sure to check the \"Change password\" field if you do give out a temporary password, so that the user will be forced to change it after login."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:121
+msgid "This option will subscribe the user to automatically generated e-mails whenever an event is published."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:122
+msgid "This option will subscribe the user to e-mails that are generated when another user tries to get in touch with an event's reporting organisation that matches that of the user."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:123
+msgid "It is possible to request a new authentication key for the user."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:125
+msgid "Indicates whether the user has accepted the terms of use already or not."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:126
+msgid "Setting this flag will require the user to change password after the next login."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:129
+msgid "Contacting a user"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:130
+msgid "Site admins can use the \"Contact users\" feature to send all or an individual user an e-mail. Users that have a GnuPG key set will receive their e-mails encrypted. When clicking this button on the left, you'll be presented with a form that allows you to specify the type of the e-mail, who it should reach and what the content is using the following options"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:131
+msgid "Contact"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:131
+msgid "Contact your users here."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:133;184;197
+#: View/Pages/doc/using_the_system.ctp:269
+#: View/Taxonomies/view.ctp:89
+msgid "Action"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:133
+msgid "This defines the type of the e-mail, which can be a custom message or a password reset. Password resets automatically include a new temporary password at the bottom of the message and will automatically change the user's password accordingly."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:134
+msgid "Recipient"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:134
+msgid "The recipient toggle lets you contact all your users, a single user (which creates a second drop-down list with all the e-mail addresses of the users) and potential future users (which opens up a text field for the e-mail address and a text area field for a GnuPG public key)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:135;136
+#: View/Users/admin_email.ctp:24
+#: View/Users/admin_quick_email.ctp:15
+msgid "Subject"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:135;136
+msgid "In the case of a custom e-mail, you can enter a subject line here."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:137
+msgid "Custom message checkbox"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:137
+msgid "This is available for password resets, you can either write your own message (which will be appended with a temporary key and the signature), or let the system generate one automatically."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:139
+msgid "Keep in mind that all e-mails sent through this system will, in addition to your own message, will be signed in the name of the instance's host organisation's support team, will include the e-mail address of the instance's support (if the contact field is set in the bootstrap file), and will include the instance's GnuPG signature for users that have a GnuPG key set (and thus are eligible for an encrypted e-mail)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:141
+msgid "Managing the roles"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:142
+msgid "Privileges are assigned to users by assigning them to rule groups, which use one of four options determining what they can do with events and four additional privilege elevating settings. The four options for event manipulation are: Read Only, Manage My Own Events, Manage Organisation Events, Manage &amp; Publish Organisation Events. The extra privileges are admin, sync, authentication key usage and audit permission"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:144
+msgid "Read Only"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:144
+msgid "This allows the user to browse events that his organisation has access to, but doesn't allow any changes to be made to the database."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:145
+msgid "Manage My Own Events"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:145
+msgid "The second option, gives its users rights to create, modify or delete their own events, but they cannot publish them."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:146
+msgid "Manage Organization Events"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:146
+msgid "Allows users to create events or modify and delete events created by a member of their organisation."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:147
+msgid "Manage &amp; Publish Organisation Events"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:147
+msgid "This last setting, gives users the right to do all of the above and also to publish the events of their organisation."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:148
+msgid "Perm sync"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:148
+msgid "This setting allows the users of the role to be used as a synchronisation user. The authentication key of this user can be handed out to the administrator of a remote MISP instance to allow the synchronisation features to work."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:149
+msgid "Perm auth"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:149
+msgid "This setting enables the authentication key of the role's users to be used for rest requests."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:150
+msgid "Perm admin"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:150
+msgid "Gives the user limited administrator privileges, this setting is used for the organisation admins"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:151
+msgid "Perm site admin"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:151
+msgid "Gives the user full administrator privileges, this setting is used for the site admins."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:152
+msgid "Perm audit"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:152
+msgid "Grants access to the logs. With the exception of site admins, only logs generated by the user's own org are visible."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:153
+msgid "Perm regexp access"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:153
+msgid "Allows the users with this permission enabled to edit the regular expression table. Be careful when giving out this permission, incorrect regular expressions can be very harmful (infinite loops, loss of data, etc.)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:154
+msgid "Perm tagger"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:154
+msgid "Allows the user with this permission to create custom tags and assign them to events."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:156
+msgid "Creating roles"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:157
+msgid "When creating a new role, you will have to enter a name for the role to be created and set up the permissions (as described above) using the radio toggle and the four check-boxes."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:158
+msgid "Listing roles"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:159
+msgid "By clicking on the List Roles button, you can view a list of all the currently registered roles and a list of the permission flags turned on for each. In addition, you can find buttons that allow you to edit and delete the roles. Keep in mind that you will need to first remove every member from a role before you can delete it."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:160
+msgid "List roles"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:160
+msgid "You can View, Edit or Delete roles using the action buttons to the right in each row. Keep in mind that a role has to be devoid of members before it can be deleted."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:162
+msgid "Using the logs of MISP"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:163
+msgid "Users with audit permissions are able to browse or search the logs that MISP automatically appends each time certain actions are taken (actions that modify data or if a user logs in and out)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:164
+msgid "Generally, the following actions are logged"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:166
+msgid "Creation, deletion, modification, Login / Logout"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:167
+msgid "Creation, deletion, modification, publishing"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:168;170;171;172;173
+msgid "Creation, deletion, modification"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:169
+msgid "ShadowAttribute"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:169
+msgid "Creation, deletion, Accept, Discard"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:172
+msgid "Whitelist"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:173
+msgid "Regexp"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:176
+msgid "Browsing the logs"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:177
+msgid "Listing all the log entries will show the following columns generated by the users of your organisation (or all organisations in the case of site admins)"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:178
+msgid "List logs"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:178
+msgid "Here you can view a list of all logged actions."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:180
+msgid "The automatically assigned ID number of the entry."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:181
+msgid "The e-mail address of the user whose actions triggered the entry."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:182
+msgid "The organisation of the above mentioned user."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:183
+msgid "The date and time when the entry originated."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:184
+msgid "The action's type. This can include: login/logout for users, add, edit, delete for events, attributes, users and servers."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:185
+msgid "The title of an event always includes the target type (Event, User, Attribute, Server), the target's ID and the target's name (for example: e-mail address for users, event description for events)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:186
+msgid "This field is only filled out for entries with the action being add or edit. The changes are detailed in the following format"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:188
+msgid "When the entry is about the creation of a new item (such as adding a new event) then the change will look like this for example"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:191
+msgid "Search log"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:191
+msgid "You can search the logs using this form, narrow down your search by filling out several fields."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:192
+msgid "Searching the Logs"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:193
+msgid "Another way to browse the logs is to search it by filtering the results according to the following fields (the search is a sub-string search, the sub-string has to be an exact match for the entry in the field that is being searched for)"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:195
+msgid "By searching by Email, it is possible to view the log entries of a single user."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:196
+msgid "Searching for an organisation allows you to see all actions taken by any member of the organisation."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:197
+msgid "With the help of this drop down menu, you can search for various types of actions taken (such as logins, deletions, etc)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:198
+msgid "There are several ways in which to use this field, since the title fields contain several bits of information and the search searches for any substrings contained within the field, it is possible to just search for the ID number of a logged event, the username / server's name / event's name / attribute's name of the event target."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:199
+msgid "With the help of this field, you can search for various specific changes or changes to certain variables (such as published will find all the log entries where an event has gotten published, ip-src will find all attributes where a source IP address has been entered / edited, etc)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:203
+msgid "MISP has a couple of administrative tools that help administrators keep their instance up to date and healthy. The list of these small tools can change rapidly with each new version, but they should be self-explanatory. Make sure to check this section after upgrading to a new version, just in case there is a new upgrade script in there - though if this is the case it will be mentioned in the upgrade instructions."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:206
+msgid "If enabled, MISP can delegate a lot of the time intensive tasks to the background workers. These will then be executed in order, allowing the users of the instance to keep using the system without a hiccup and without having to wait for the process to finish. It also allows for certain tasks to be scheduled and automated."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:207
+msgid "Command Line Tools for the Background Workers"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:208
+msgid "The background workers are powered by <a href=\"https://github.com/kamisama/Cake-Resque\">CakeResque</a>, so all of the CakeResque commands work.\n"
+"        To start all of the workers needed by MISP go to your <code>/var/www/MISP/app/Console/worker</code> (assuming a standard installation path) and execute start.sh.\n"
+"        To interact with the workers, here is a list of useful commands. Go to your <code>/var/www/MISP/app/Console</code> (assuming a standard installation path) and execute one of the following commands as a parameter to <code>./cake CakeResque.CakeResque</code> (for example: <code>./cake CakeResque.CakeResque tail</code>)"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:212
+msgid "tail"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:212
+msgid "tail the various log files that CakeResque creates, just choose the one from the list that you are interested in."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:213
+msgid "cleanup"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:213
+msgid "terminate the job that a worker is working on immediately. You will be presented with a choice of workers to choose from when executing this command."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:214
+msgid "clear"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:214
+msgid "Clear the queue of a worker immediately."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:215
+msgid "stats"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:215
+msgid "shows some statistics about your workers including the count of successful and failed jobs."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:217
+msgid "The other commands should not be needed, instead of starting / stopping or restarting workers use the supplied start.sh (it stops all workers and starts them all up again). For further instructions on how to use the console commands for the workers, visit the <a href=\"http://cakeresque.kamisama.me/commands#cleanup\">CakeResque list of commands</a>."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:218
+msgid "Monitoring the Background Processes"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:219
+msgid "The \"Jobs\" menu item within the Administration menu allows site admins to get an overview of all of the currently and in the past scheduled jobs. Admins can see the status of each job, and what the queued job is trying to do. If a job fails, it will try to set an error message here too. The following columns are shown in the jobs table"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:221
+msgid "The job's ID (this is the ID of the job's meta-data stored in the default data-store, not to be confused with the process ID stored in the redis database and used by the workers.)"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:222
+msgid "Process"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:222
+msgid "The process's ID."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:223
+msgid "Worker"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:223
+msgid "The name of the worker queue. There are 3+1 workers running if background jobs are enabled: default, cache, email, and a special Scheduler (this should never show up in the jobs table)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:224
+msgid "Job Type"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:224
+msgid "The name of the queued job."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:225
+msgid "Shows a basic input handled by the job - such as \"Event:50\" for a publish email alert job for event 50."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:226
+msgid "This will show what the job is currently doing or alternatively an error message describing why a job failed."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:227
+msgid "The string identifier of the organisation that has scheduled the job."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:228
+msgid "The status reported by the worker."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:229
+msgid "Retries"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:229
+msgid "Currently unused, it is planned to introduced automatic delayed retries for the background processing to add resilience."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:230
+msgid "A progress bar showing how the job is coming along."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:233
+msgid "Scheduling Jobs and Recurring Jobs"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:234
+msgid "Apart from off-loading long-lasting jobs to the background workers, there is a second major benefit of enabling the background workers: Site-administrators can schedule recurring tasks for the jobs that generally take the longest to execute. At the moment this includes pushing / pulling other instances and generating a full export cache for every organisation and export type. MISP comes with these 3 tasks pre-defined, but further tasks are planned. The following fields make up the scheduled tasks table"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:236
+msgid "The ID of the task."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:237
+msgid "The type of the task."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:238
+msgid "Frequency"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:238
+msgid "This number sets how often the job should be executed in hours. Setting this to 168 and picking the next execution on Sunday at 01:00 would execute the task every Sunday at 1 AM. Setting this value to 0 will make the task only run once on the scheduled date / time without rescheduling it afterwards."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:239
+msgid "Scheduled Time"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:239
+msgid "The time (in 24h format) when the task should be executed the next time it runs (and all consecutive times if a multiple of 24 is chosen for frequency)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:240
+#: View/Tasks/index.ctp:38
+msgid "Next Run"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:240
+msgid "The date on which the task should be executed."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:241
+msgid "A brief description of the task."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:242
+msgid "This field shows when the job was queued by the scheduler for execution."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:244
+msgid "Site administrators can schedule reccuring tasks on this page."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:245
+msgid "Frequently asked questions"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:246
+msgid "Losing access to the platform and resetting the password"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:247
+msgid "If you ever lock yourself out of MISP as a site admin, there is a command line tool to reset your password. This can also be handy if you have changed the salt key and invalidated all of the passwords."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:248
+msgid "Simply run the command"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:249
+msgid "my_new_password"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:250
+msgid "This will create a new password hash using the currently set salt."
+msgstr ""
+
+#: View/Pages/doc/categories_and_types.ctp:7
+msgid "Attribute Categories and Types"
+msgstr ""
+
+#: View/Pages/doc/categories_and_types.ctp:8
+#: View/Pages/doc/md/categories_and_types.ctp:1
+msgid "Attribute Categories vs. Types"
+msgstr ""
+
+#: View/Pages/doc/categories_and_types.ctp:74
+msgid "Click here to get the .md version for gitbook generation."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:15
+msgid "Admins and Site Admins"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:16
+msgid "There are two types of admins in MISP: Admins (also referred to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:17
+msgid "Background Jobs"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:18
+msgid "A lot of the heavier tasks are a burden to users, in that their actions can cause long delays (and in some cases timeouts) while the application logic is executing. To alleviate this, long processes have been (if enabled) moved to background jobs, meaning that their execution happens asynchronously in the background, allowing the user to freely interact with the platform whilst the request is being processed."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:19
+msgid "MISP Instance"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:20
+msgid "A MISP instance is an installation of the MISP software and the connected database. All the data visible to the users is stored locally in the database and data that is shareable (based on the distribution settings) can be synchronised with other instances via the Sync actions. The instance that you are reading this manual on will be refered to as \"this instance\" or \"your instance\". The instances that your instance synchronises with will be refered to as \"remote instances\"."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:21
+msgid "Organisation administrators and Site administrators"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:22
+msgid "We have two types of administrators, site and organisation admins. The former has access to every administrator feature for all the data located on the system including global features such as the creation and modification of user roles and instance links, whilst organisation admins can administer users, events and logs of their own respective organisations."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:23
+msgid "Pivot path"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:24
+msgid "The (branching) path taken by a user from event to event while following correlation links. This is represented by the branching graph in the event view."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:25
+msgid "Pivoting"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:26
+msgid "The act of navigating from event to event through correlation links.\n"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:29
+msgid "Each event can only be directly edited by users of the original creator organisation (and site admins). However, if another organisation would like to amend an event with extra information on an event, or if they'd like to correct a mistake in an attribute, they can create a Proposal. These proposals could then be accepted by the original creator organisation. These proposals can be pulled to another server, allowing users on connected instances to propose changes which then could be accepted by the original creators on another instance (and subsequently pushed back)."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:30
+msgid "Publishing"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:31
+msgid "When an event is first created by a user, it is visible to everyone on the instance based on the access rights (\"Your organisation only\" events will not be visible to users of other organisations), but they will not be synchronised and they won't be exportable. For this, a user with publishing permission of the organisation that created the event has to publish the event. The system will then inform all the users of the instance that are subscribing to e-mail notifications and who have access to view the published event via an e-mail."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:32
+#: View/Pages/doc/using_the_system.ctp:401
+msgid "Pull"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:33
+msgid "Pulling is the process of using the configured sync user on a remote instance to REST GET all of the accessible data (based on the distribution rights) to your instance and store it."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:34
+#: View/Pages/doc/using_the_system.ctp:400
+msgid "Push"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:35
+msgid "Pushing is the process of using a configured instance link to send an event or all accessible events (limited by the distribution rights) through the REST interface to a remote instance."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:37
+msgid "Certain common tasks can be scheduled for a later execution or for regular recurring executions. These tasks currently include caching all of the export formats, pulling from all eligible instances and pushing to all eligible instances."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:38
+msgid "Sync User"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:39
+msgid "A user of a role that grants sync permissions, these users (and their authentication keys) are used to serve as the points of connection between instances. Events pushed to an instance are pushed to a sync user, who then creates the events on the remote instance. Events pulled are added by the sync user that is used to connect the remote instance to your instance. As an administrator, keep in mind that a sync user needs auth key and publish permissions, has to have undergone the mandatory password change and has to have accepted the Terms of Use in order for the sync to work. Please make sure that all of these steps are taken before attempting to push or pull."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:40
+msgid "Synchronisation"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:41
+msgid "What we call synchronisation is an exchange of data between two (or more) MISP instances through our pull and push mechanisms."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:42
+#: View/Pages/doc/using_the_system.ctp:13;301
+msgid "Tagging"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:43
+msgid "Users with tagging rights can assigned various dynamically created tags to events, allowing an arbitrary link between events to be created. It is possible to filter events based on these tags and they can also be used to filter events for the automation."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:44
+#: View/Pages/doc/using_the_system.ctp:14;310
+msgid "Templating"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:45
+msgid "Users with templating rights can create easy to fill forms that help with the event creation process."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:15
+msgid "The top bar"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:16
+msgid "This is the main menu that will be accessible from all of the views. In some instances, some additional buttons that will appear on top of these when a view provides it."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:17
+msgid "This menu contains all of the main functions of the site as a series of dropdown menus. These contains all (from the current user's perspective) accessible functions sorted into several groups."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:19
+msgid "Home button"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:19
+msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:20
+msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:21
+msgid "Input filters alter what and how data can be entered into this instance. Apart from the basic validation of attribute entry by type, it is possible for the site administrators to define regular expression replacements and blacklists for certain values in addition to blocking certain values from being exportable. Users can view these replacement and blacklist rules here whilst administrator can alter them."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:22
+msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:23
+msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:24
+msgid "Administrators can add, edit or remove user accounts and user roles. Roles define the access rights to certain features such as publishing of events, usage of the REST interface or synchronisation of any user belonging to the given role. Site administrators can also access a contact form, through which it is possible to reset the passwords of users, or to just get in touch with them via encrypted e-mails."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:25
+msgid "If you have audit permissions, you can view the logs for your organisation (or for site admins for the entire system) here or even search the logs if you are interested in something specific."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:26;90
+#: View/Threads/index.ctp:2
+msgid "Discussions"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:26
+msgid "Link to the discussion threads."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:27
+msgid "Proposal Notifications"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:27
+msgid "This shows how many proposals your organisation has received and across how many events they are spread out. Clicking this will take you to the list of proposals."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:28
+msgid "Logs you out of the system."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:31
+msgid "A list of the contents of each of the above drop-down menus"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:32
+msgid "Event actions"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:34
+msgid "Lists all the events in the system that are not private or belong to your organisation. You can add, modify, delete, publish or view individual events from this view."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:35
+msgid "Allows you to fill out an event creation form and create the event object, which you can start populating with attributes."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:36
+msgid "Lists all the attributes in the system that are not private or belong to your organisation. You can modify, delete or view each individual attribute from this view."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:37
+msgid "You can set search terms for a filtered attribute index view here."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:38
+msgid "Shows a list of all proposals that you are eligible to see."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:39
+msgid "Shows all of the events created by your organsiation that has pending proposals."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:40
+msgid "List all the tags that have been created by users with tag creation rights on this instance."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:41
+msgid "Create a new tag."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:42
+msgid "List all of the templates created by users with template creation rights on this instance."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:43
+msgid "Create a new template."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:44
+msgid "Export the data accessible to you in various formats."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:45
+msgid "If you have authentication key access, you can view how to use your key to use the REST interface for automation here."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:48
+msgid "Input filters"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:50
+msgid "You can view the Regular Expression rules, which modify the data that can be entered into the system. This can and should be used to help filter out personal information from automatic imports (such as removing the username from windows file paths), having unified representation for certain common values for easier correlation or simply standardising certain input. It is also possible to block certain values from being inserted. As a site administrator or a user with regex permission, you can also edit these rules."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:51
+msgid "You can view the whitelist rules, which contain the values that are blocked from being used for exports and automation on this instance. Site administrators have access to editing this list."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:56
+msgid "Read about the latest news regarding the MISP system."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:57
+msgid "Manage your user account."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:58
+msgid "Attribute Histogram"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:58
+msgid "View some statistics about the currently stored attributes."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:59
+msgid "You can view the role permissions here."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:60
+msgid "A link to this user guide."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:61
+msgid "View the terms &amp; conditions again."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:62
+msgid "View a series of statistics about the users and the data on this instance."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:63
+msgid "Logs the current user out."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:68
+msgid "Connect your MISP instance to other instances, or view and modify the currently established connections."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:73
+msgid "New User"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:73
+msgid "Create an account for a new user for your organisation. Site administrators can create users for any organisation."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:74
+msgid "View, modify or delete the currently registered users."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:75
+msgid "New Role"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:75
+msgid "Create a new role group for the users of this instance, controlling their privileges to create, modify, delete and to publish events and to access certain features such as the logs or automation."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:76
+msgid "List, modify or delete currently existing roles."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:77
+msgid "You can use this view to send messages to your current or future users or send them a new temporary password."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:78
+msgid "Various tools, upgrade scripts that can help a site-admin run the instance."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:79
+msgid "Server Settings"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:79
+msgid "Set up and diagnose your MISP installation."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:80
+msgid "View the background jobs and their progress."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:81
+msgid "Schedule the pre-defined tasks for your instance (this currently includes export caching, server pull and server push)."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:86
+msgid "View the logs of the instance."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:87
+msgid "Search the logs by various attributes."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:92
+msgid "List all of the discussion threads."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:93
+msgid "Create a new discussion thread."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:95
+msgid "The left bar"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:96
+msgid "This bar changes based on each page-group. The blue selection shows you what page you are on."
+msgstr ""
+
+#: View/Pages/doc/quickstart.ctp:15
+msgid "The Malware Information Sharing Platform (MISP) is the tool which will be used to facilitate the exchange of Indicator of Compromise (IOC) about\n"
+"targeted malware and attacks within your community of trusted members. It is a central Indicator of Compromise (IOC) database with technical and\n"
+"non-technical information. Exchanging this information should result in faster detection of targeted attacks and improve the detection ratio,\n"
+"while also reducing the number of false positives."
+msgstr ""
+
+#: View/Pages/doc/quickstart.ctp:19
+msgid "Create an Event"
+msgstr ""
+
+#: View/Pages/doc/quickstart.ctp:21
+msgid "Browsing past Events"
+msgstr ""
+
+#: View/Pages/doc/quickstart.ctp:23
+msgid "Export Events for logsearches"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:8;21
+msgid "First run of the system"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:9;34
+msgid "Managing your account"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:10;48
+msgid "Staying up to date"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:19
+msgid "User Management and Global Actions"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:22
+msgid "When first logging into MISP with the username and password provided by your administrator, there are a number of things that need to be done, before you can start using the system."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:24
+msgid "Accepting the Terms of use"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:24
+msgid "The terms of use are shown immediately after logging in for the first time, make sure to read through this page before clicking \"Accept Terms\" at the bottom of the page."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:25;26;41
+msgid "Changing the password"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:25
+msgid "After accepting the ToU, you'll be prompted to change your password, but keep in mind that it has to be at least 6 characters long, it has to include at least one upper-case and one lower-case character in addition to a digit or a special character. Enter the same password into the confirm password field, before clicking submit to finalise the change."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:27;44
+msgid "Setting up the GnuPG Key"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:27
+msgid "In order for the system to be able to encrypt the messages that you send through it, it needs to know your GnuPG key. Navigate to the Edit profile view (My Profile on the left -&gt; Edit profile in the top right corner). Paste the key into the GnuPG field and click submit."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:28;42
+msgid "Subscribing to Auto-alerts"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:28;42
+msgid "Turning auto-alerts on will allow the system to send you e-mail notifications about any new public events entered into the system by other users and private events added by members of your organisation. To turn this on, navigate to the Edit profile view (My profile on the left navigation menu -&gt; Edit profile in the top right corner). Tick the auto-alert checkbox and click submit to enable this feature."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:29
+msgid "Use these checkboxes to subscribe to auto-alerts and contact reporter e-mails."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:30;43
+msgid "Subscribing to e-mails sent via the \"Contact Reporter\" functionality"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:30
+msgid "This feature is turned on right below the autoalerts and will allow you to receive e-mails addressed to your organisation whenever a user tries to ask about an event that was posted by a user of your organisation. Keep in mind that you can still be addressed by such a request even when this setting is turned off, if someone tries to contact you as the event creator directly or your organisation for an event that you personally have created then you will be notified."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:31
+msgid "Reviewing the Terms &amp; Conditions"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:31
+msgid "o review the Terms &amp; Conditions or to read the User Guide, use the appropriate button on the left navigation menu."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:32
+msgid "Making sure that compatibility mode is turned off (IE9&amp;IE10)"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:32
+msgid "Compatibility mode can cause some elements to appear differently than intended or not appear at all. Make sure you have this option turned off."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:35
+msgid "To alter any details regarding your profile, use the \"My Profile\" menu button to bring up the profile overview and then click on \"Edit Profile\" in the right upper corner."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:38
+msgid "Change any of your profile settings here."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:40
+msgid "Changing your e-mail address"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:40
+msgid "Your e-mail address serves as both a login name and as a means of communication with other users of the MISP system via the contact reporter feature. To change your e-mail address, just enter the edit profile menu (My profile on the left navigation menu -&gt; Edit profile in the top right corner) and change the field titled Email."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:41
+msgid "As a next step, change the password provided by your administrator to something of your own choosing. Click on My profile on the left navigation menu, under Global Actions, which will bring up the User view. Click on Edit User on the left navigation menu or Edit Profile in the top right corner. This next screen, allows you to edit your details, including your password, by filling out the password field. Keep in mind that the password has to be at least 6 characters long, has to include at least one upper-case and one lower-case character in addition to a digit or a special character. Enter the same password into the confirm password field, before clicking submit to finalise the change."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:43
+msgid "Turning this feature on will allow you to receive e-mails addressed to your organisation whenever a user tries to ask about an event that was posted by a user of your organisation. Keep in mind that you can still be addressed by such a request even when this setting is turned off, if someone tries to contact the person that reported an event that you yourself have created."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:44
+msgid "In order for the system to be able to encrypt the messages that you send through it, it needs to know your GnuPG key. You can acquire this by clicking on the GnuPG key link at the bottom left of the screen. Copy the entirety of the key and navigate to the Edit profile view (My Profile on the left -&gt; Edit profile in the top right corner). Paste the key into the GnuPG field and click submit."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:45
+msgid "Requesting a new authentication key"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:45
+msgid "It is possible to make the system generate a new authentication key for you (for example if your previous one gets compromised. This can be accessed by clicking on the My Profile button and then clicking the reset key next to the currently active authentication code. The old key will become invalid when the new one is generated."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:46
+msgid "Clicking on reset will generate a new key for you and invalidate the old one, blocking it from being used."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:49
+msgid "MISP also provides its users with some information about itself and its users through the links provided in the Global Actions menu."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:51
+msgid "To read about the news regarding the system itself, click on News on the left menu. This will bring up a list of news items concerning updates and changes to MISP itself."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:52
+msgid "Member statistics"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:52
+msgid "By using the Attribute Histogram menu button on the left, you can see a quick histogram depicting the distribution of attribute types created by each organisation."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:53
+msgid "The user guide is also accessible via the Global Actions menu. You can find out more about how to use the system by reading this."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:54
+msgid "It is possible to review the terms &amp; conditions that were shown during the first run of the system by clicking on the terms &amp; conditions link in the Global Actions menu."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:55
+msgid "View statistics about the users and the data contained within this instance."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:58
+msgid "General Statistics"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:58
+msgid "View a set of statistics such as the number of Events and Attributes currently in existance on the platform. The number in the bracket shows the number of new items added during this week."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:61
+#: View/Users/statistics.ctp:42
+#: View/Users/statistics_data.ctp:53
+msgid "Activity Heatmap"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:61
+msgid "This graph shows a heatmap of all activity related to creating event related data on a day by day basis. By default, the graph shows the sum of the contributions of all organisations, but using the buttons representing each organisation in existance on the platform you can switch to the activity heatmap of a single organisation. If you'd like to see the activity further back in the past, just use the arrow buttons to navigate the heatmap."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:66
+msgid "Inspecting the input filters"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:67
+msgid "All the events and attributes that get entered into MISP will be run through a series of input filters. These are defined by the site administrators or users with special privileges to edit the filters, but every user can take a look at the currently active lists."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:69
+msgid "All Attribute value and Event info fields will be parsed for a set of regular expressions and replaced based on the replacement values contained in this section. This has many uses, such as unifying similar data for better correlation, removing personal data from file-paths or simply for clarity. It is also possible to blacklist data by not defining a replacement for a regular expression."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:70
+msgid "This list (can) contain a set of addresses that are allowed to be entered as attribute values but will be blocked from being exported to NIDS-es."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:9;27
+msgid "Creating an event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:10;154
+msgid "Browsing past events"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:11
+msgid "Updating and modifying events"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:12
+msgid "Contacting the publisher"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:16;365
+msgid "Exporting data"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:17
+msgid "Connecting to other servers"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:18;422
+msgid "Rest API"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:28
+msgid "The process of entering an event can be split into 3 phases, the creation of the event itself, populating it with attributes\n"
+"and attachments and finally publishing it."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:30
+msgid "During this first step, you will be create a basic event without any actual attributes, but storing general information such as a description, time and risk level of the incident. To start creating the event, click on the New Event button on the left and fill out the form you are presented with. The following fields need to be filled out"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:31
+msgid "Fill this form out to create a skeleton event, before proceeding to populate it with attributes and attachments."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:33
+msgid "The date when the incident has happened. Just click this field and a date-picker will pop up where you can select the desired date."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:35
+msgid "This setting controls, who will be able to see this event once it becomes published and eventually when it becomes pulled.\n"
+"                        Apart from being able to set which users on this server are allowed to see the event, this also controls whether\n"
+"                        the event will be synchronised to other servers or not. The distribution is inherited by attributes: the most restrictive setting wins.\n"
+"                        The following options are available"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:41
+msgid "Your organization only"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:41
+msgid "This setting will only allow members of your organisation to see this. It can be pulled to another instance by one of your organisation members where only your organisation will be able to see it.\n"
+"                            Events with this setting will not be synchronised"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:43
+msgid "Upon push: do not push. Upon pull : pull."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:45
+msgid "This Community-only"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:45
+msgid "Users that are part of your MISP community will be able to see the event.\n"
+"                            This includes your own organisation, organisations on this MISP server and organisations running MISP\n"
+"                            servers that synchronise with this server. Any other organisations connected to such linked servers will\n"
+"                            be restricted from seeing the event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:49
+msgid "Upon push: do not push. Upon pull: pull and downgrade to Your organization only."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:51
+msgid "Users that are part of your MISP community will be able to see the event.\n"
+"                            This includes all organisations on this MISP server, all organisations on MISP servers synchronising\n"
+"                            with this server and the hosting organisations of servers that connect to those afore mentioned servers\n"
+"                            (so basically any server that is 2 hops away from this one). Any other organisations connected to linked\n"
+"                            servers that are 2 hops away from this own will be restricted from seeing the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:56
+msgid "Upon push: downgrade to This Community only and push. Upon pull: pull and downgrade to This Community only."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:58
+msgid "This will share the event with all MISP communities, allowing the event to be\n"
+"                            freely propagated from one server to the next."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:60
+msgid "Upon push: push. Upon pull: pull."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:64
+msgid "This field indicates the risk level of the event. Incidents can be categorised into three different threat categories (low, medium, high). This field can alternatively be left as undefined. The 3 options are"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:66
+msgid "General mass malware."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:67
+msgid "Advanced Persistent Threats (APT)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:68
+msgid "Sophisticated APTs and 0day attacks."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:70;177
+msgid "Indicates the current stage of the analysis for the event, with the following possible options"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:72;180
+msgid "The analysis is just beginning"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:73;181
+msgid "The analysis is in progress"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:74;182
+msgid "The analysis is complete"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:76;319
+msgid "Event Description"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:76
+msgid "The info field, where the malware/incident can get a brief description starting with the internal reference. This field should be as brief and concise as possible, the more detailed description happens through attributes in the next stage of the event's creation. Keep in mind that the system will automatically replace detected text strings that match a regular expression entry set up by your server's administrator(s)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:79
+msgid "Add attributes to the event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:80
+msgid "The second step of creating an event is to populate it with attributes and attachments. This can be done by adding them manually or importing the attributes from an external format (OpenIOC, ThreatConnect). To import from an external format or to upload an attachment use the options in the menu on the left."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:82
+msgid "Attribute tools"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:82
+msgid "Use these tools to populate the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:83
+msgid "Using the above shown buttons, you can populate an event using various tools that will be explained in the following section. Let's start with the Add Attribute button."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:85
+msgid "Keep in mind that the system searches for regular expressions in the value field of all attributes when entered, replacing detected strings within it as set up by the server's administrator (for example to enforce standardised capitalisation in paths for event correlation or to bring exact paths to a standardised format). The following fields need to be filled out"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "This form allows you to add attributes."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:88
+msgid "This drop-down menu explains the category of the attribute, meaning what aspect of the malware this attribute is describing. This could mean the persistence mechanisms of the malware or network activity, etc. For a list of valid categories, %s"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:89
+msgid "Whilst categories determine what aspect of an event they are describing, the Type explains by what means that aspect is being described. As an example, the source IP address of an attack, a source e-mail address or a file sent through an attachment can all describe the payload delivery of a malware. These would be the types of attributes with the category of payload deliver. For an explanation of what each of the types looks like together with the valid combinations of categories and types, %s."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:90
+msgid "This drop-down list allows you to control who will be able to see this attribute.\n"
+"                The distribution is inherited by attributes: the most restrictive setting wins.\n"
+"                For more info <a href=\"#distribution\">click here</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:93
+msgid "Add a comment to the attribute. This will not be used for correlation."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:94
+msgid "The actual value of the attribute, enter data about the value based on what is valid for the chosen attribute type. For example, for an attribute of type ip-src (source IP address), 11.11.11.11 would be a valid value. For more information on types and values, %s."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:95;131
+msgid "You can add some comments to the attribute that will not be used for correlation but instead serves as purely an informational field."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:96
+msgid "This option allows the attribute to be used as an IDS signature when exporting the NIDS data, unless it is being overruled by the white-list. For more information about the whitelist, head over to the %s section."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:96
+msgid "administration"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:97
+msgid "Batch import"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:97
+msgid "If there are several attributes of the same type to enter (such as a list of IP addresses, it is possible to enter them all into the same value-field, separated by a line break between each line. This will allow the system to create separate lines for the each attribute."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:99
+msgid "Populate from Template"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:100
+msgid "Templates allow users to rapidly populate events of a specific type by filling out a series of pre-defined fields. Users with template creation privileges can create new templates for their organisations or for all organisations on their instance. If you are interested in template creation, please refer to the templating section.<br />\n"
+"For users trying to populate an event, after clicking on the populate from template button, you'll be presented with a list of all currently accessible templates. Pick the one that best describes the event that you are creating."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:102
+msgid "Template Choice"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:102
+msgid "Choose the most appropriate template for your event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:103
+msgid "Once you have chosen a template, you'll be presented with the actual form contained within. Make sure you fill out as many fields as possible with the mandatory fields - marked by a star in a bracket such as this: (*) - are filled out.<br />\n"
+"Templates are devided into sections, with each section having a title and a description in addition to a series of fields. Each field can be an attribute or a file attachment field. An attribute field has the following components"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:105
+msgid "Template Field"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:105
+msgid "MISP will generate attributes based on the field's settings and the data that you provide."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:107
+msgid "The name of the field along with an indication if the field is mandatory."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:108
+msgid "A short description of the field."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:109
+msgid "The value(s) that are valid for the field. In the case of several types being shown here, you can enter value(s) matching any one of the types, or in the case of a batch import field, any mixture of the given types."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:110
+msgid "Text field"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:110
+msgid "This field can either be a single line textfield or a multi-line text area. For the former, enter a single value of the above indicated type, whilst for the latter you cna paste a list of values separated by line-breaks."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:113;115
+msgid "Freetext"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:113
+msgid "Just paste a line-break separated list of indicators into the freetext import tool."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:114
+msgid "If you have a list of indicators that you would like to quickly generate attributes out of then the Free-text import tool is just what you need. Simply paste a list of indicators (separated by line-breaks into this tool)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:115
+msgid "MISP will often find several valid category/type combinations for the values. Do last minute adjustments on the result page."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:116
+msgid "Since there are several category / type combinations that can be valid for a lot of values, MISP will suggest the most common settings. You can alter the category / type / IDS fields manually if you disagree with the results. The options will be restricted to valid category/type combinations for the value that you have entered."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:118
+msgid "If you would like to create and maintain an event with a set of indicators that receives removals and additions over time, then the attribute replace tool might make this task easier for you."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:119
+msgid "Select a category/type combination and paste the updated list of indicators into the textarea."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:120
+msgid "Simply select the desired category / type combination, choose whether the attributes should be marked for IDS exports and paste the new list of indicators into the textarea. Attributes of the same category/type that are present in the event but not the new list will be removed, values in the pasted list that do not yet exist as attributes will be created as attributes and values that already have matching attributes will be left untouched."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:121
+msgid "Add attachments to the event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:122
+msgid "You can also upload attachments, such as the malware itself, report files from external analysis or simply artifacts dropped by the malware. Clicking on the add attachment button brings up a form that allows you to quickly attach a file to the event. The following fields need to be filled out"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:123
+msgid "Add attachment"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:123
+msgid "Point the uploader to the file you want to upload. Make sure to mark it as malware if the uploaded file is harmful, that way it will be neutralised."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:125
+msgid "The category is the same as with the attributes, it answers the question of what the uploaded file is meant to describe."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:126
+msgid "This drop-down list allows you to control who will be able to see this attachment.\n"
+"            The distribution is inherited by attributes: the most restrictive setting wins.\n"
+"            For more info <a href=\"#distribution\">click here</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:129
+msgid "Upload field"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:129
+msgid "By hitting browse, you can browse your file system and point the uploader to the file that you want to attach to the attribute. This will then be uploaded when the upload button is pushed."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:130
+msgid "This check-box marks the file as malware and as such it will be zipped and passworded, to protect the users of the system from accidentally downloading and executing the file. Make sure to tick this if you suspect that the filed is infected, before uploading it."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:134
+msgid "Propose a change to an event that belongs to another organisation"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:135
+msgid "If you would like to propose a modification to an attribute, or to propose some additional attributes to the creating organisation, you can do this with the buttons that replace the add attribute field on the left and the edit icon on the right end of each listed attribute in the event view. The creating organisation of the event will be able to see any proposals and discard or accept the changes."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:136
+msgid "Propose attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:136
+msgid "An attribute with a proposal attached will turn blue and the proposal itself will be grey. If there is a grey proposal without a blue attribute infront of it, it means that someone has proposed a new attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:137
+msgid "If the organisation that has created the event is on another connected server, they will be able to accept the proposal once they initiate a pull and receive your proposal. After this they can republish the event, sending the altered attribute back to your instance."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:139
+msgid "Populate from OpenIOC"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:140
+msgid "It is also possible to attempt to import the data contained in a .ioc file, The import tool will attempt to gather as many IndicatorItems within nested logical operators as possible without breaking their validity. After the procedure is done, you'll be presented with a list of successfully created attributes and a list of failed IndicatorItems as well as a graph of the .ioc file."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:141
+msgid "OpenIOC1"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:141
+msgid "The import tool will list the successful and failed entries after the process is done."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:142
+msgid "OpenIOC2"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:142
+msgid "You'll also be able to see a graph of the imported .ioc file and how successful the import was."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:144
+msgid "Populate from ThreatConnect"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:145
+msgid "You can also import the data from a ThreatConnect export csv file. The following columns are used by the import tool (and are thus mandatory fields to select during the export)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:145
+msgid "Confidence"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:145
+#: View/Sightings/ajax/list_sightings.ctp:8
+#: View/Users/statistics_sightings.ctp:9
+msgid "Source"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:145
+msgid "The result will be a list of attributes that get added to the currently selected event, each of which will be marked with a comment that indicates that its origin being from a ThreatConnect import."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:147
+msgid "Publish an event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:149
+msgid "Once all the attributes and attachments that you want to include with the event are uploaded / set, it is time to finalise its creation by publishing the event (click on publish event in the event view). This will alert the eligible users of it (based on the private-controls of the event and its attributes/attachments and whether they have auto-alert turned on), push the event to instances that your instance connects to and propagate it further based on the distribution rules. It also readies the network related attributes for NIDS signature creation (through the NIDS signature export feature, for more information, go to the export section.)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:150
+msgid "There is an alternate way of publishing an event without alerting any other users, by using the \"publish (no email)\" button. This should only be used for minor edits (such as correcting a typo)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:152
+msgid "If your instance has background jobs enabled then the event might not get published immediately."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:155
+msgid "The MISP interface allows the user to have an overview over or to search for events and attributes of events that are already stored in the system in various ways."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:156
+msgid "To list all events"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:157
+msgid "On the left menu bar, the option \"List events\" will generate a list of the last 60 events. While the attributes themselves aren't shown in this view, the following pieces of information can be seen"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:158
+msgid "List events"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:158
+msgid "This is the list of events in the system. Use the buttons to the right to alter or view any of the events."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:160
+msgid "Already published events are marked by a checkmark. Unpublished events are marked by a cross."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:161
+msgid "The organisation that created the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:162
+msgid "Owner Org"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:162
+msgid "The organisation that owns the event on this instance. This field is only visible to administrators."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:163
+msgid "The event's ID number, assigned by the system when the event was first entered (or in the case of an event that was synchronized, when it was first copied over - more on synchronisation in chapter xy)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:164
+msgid "Tags that are assigned to this event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:165
+msgid "#Attr."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:165
+msgid "The number of attributes that the event has."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:166
+msgid "The e-mail address of the event's reporter. This is not visible to regular users. Organisation administrators can see the e-mail addresses of their own organisation's users."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:167
+msgid "The date of the attack."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:168
+msgid "The risk level of the attack, the following levels are possible"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:171
+msgid "General Malware"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:172
+msgid "Advanced Persistent Threats (APTs)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:173
+msgid "Sophisticated APTs and 0day exploits<"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:174
+msgid "This field can be left undefined and edited at a later date."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:185
+msgid "A short description of the event, starting with an internal reference number."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:186
+msgid "This field indicates what the sharing privileges of the event. The options are described <a href=\"#distribution\">here</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:187
+msgid "The controls that the user has to view or modify the event. The possible actions that are available (depending on user privileges - %s to find out more about privileges)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:190
+msgid "Publishing an event will have several effects: The system will e-mail all eligible users that have auto-alert turned on (and having the needed privileges for the event, depending on its private classification) with a description of your newly published event, it will be flagged as published and it will be pushed to all eligible servers (to read more about synchronisation between servers, have a look at the %s)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:190
+msgid "section on connecting servers"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:191
+msgid "Clicking on the edit button will bring up the same screen as the one used for creating new events, with the exception that all fields come filled out with the data of the event that is being edited. The distribution of an event can only be edited if you are a user of the creating organisation of the event. For more information on this view, refer to the section on <a href=\"#create\">creating an event</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:192
+msgid "The system will prompt you before erasing the unwanted event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:193
+msgid "Will bring up the event view, which besides the basic information contained in the event list, will also include the following"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:198
+msgid "It is also possible to filter the events shown by clicking on the small magnifying glass icons next to the field names and entering a filter term."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:199
+msgid "Event view"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:200
+msgid "This view includes the basic information about an event, a link to related events, all attributes and attachments with tools to modify or delete them and extra functions for publishing the event or getting in touch with the event's reporter."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:201
+msgid "General Event Information"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:203
+msgid "The ID of the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:204
+msgid "In order to avoid collisions between events and attributes (during for example a sync) a Uuid is assigned that uniquely identifies each of them."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:205
+msgid "The organisation that has originally created the event. The logo (if it exists on the server, alternatively a string) representing the organisation is also shown int he right upper corner."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:206
+msgid "Shows a list of the organisations that have contributed to the event via proposals. If you click any of the logos listed here, you'll get redirected to a filtered event history view, including only the changes made by the organisation."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:207
+msgid "A list of tags associated with the event. Clicking a tag will show a list of events with the same tag attached. The little cross next to each tag allows you to remove the tag from the event, whilst the '+' button allows you to assign a tag. For the latter two options to be visible, you have to have tagging permission."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:208
+msgid "The date of detection, set by the user that creates the event, not to be confused with the creation date of the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:209
+msgid "The assigned threat level of the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:210
+msgid "The status of the analysis."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:211
+msgid "This shows the distribution rules applied to this event, controlling whether only the creating organisation can see (Your organisation only) it or everyone on the instance (This community only). The two remaining settings allow the event to be propagated to organisations on remote connected instances."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:212
+msgid "A short description of the event itself. Make sure not to put information in here that could be used for correlation purposes and be better suited as an Attribute."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:213
+msgid "Whether the event has been published or not. Publishing allows the attributes of the event to be used for all eligible exports and it notifies users that have subscribed to the event alerts. Also, a publish initiates a push to all eligible instances."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:215
+msgid "List of Related Events"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:216
+msgid "The list of relations is shown on the right hand side of the general event information. Events can be related by having one or more attributes that are exact matches. For example, if two events both contain a source IP attribute of 11.11.11.11 then they are related. The list of events that are related the currently shown one, are listed under \"Related Events\", as links (titled the related event's date and ID number) to the events themselves."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:217
+msgid "Data Element Toggles"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:218
+msgid "You can control some of the data that is shown on this page using three toggles. The elements that can be disabled are the pivot threads, the attributes (and proposals) and the Discussions. You can collapse these elements and then expand them again using the same button."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:219
+msgid "Pivot Threads"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:220
+msgid "While moving from event to event through the relation links (a process that we refer to as pivoting), you create a path that shows which events you have traversed. This path is reset by leaving the event view and navigating elsewhere in the application or by deleting the root pivot element."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:221
+msgid "Each event visited is represented by a bubble in the pivot thread graph, connected by lines that show how the user has arrived at the next connected event. It is possible to jump back to an earlier relation and pivot to another event through that, creating branches in the graph."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:222
+msgid "The currently selected event is coloured blue in the graph. If you would like to delete an element from the graph (including all of elements that branch off of it) just click on the small x within a pivot bubble. For a deletion to be possible the following conditions have to be met"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:224
+msgid "The pivot element to be deleted cannot be on the path that leads to the currently selected event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:225
+msgid "The pivot element residing in the graph's root can always be deleted - this will simply reset the current pivot thread"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:227
+msgid "Attributes and Proposals"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:228
+msgid "A list of all attributes and proposals attached to the event. The fields for each of them only differ in the available actions and the fact that for proposals to attributes all fields are blank that would stay unchanged if the proposal was accepted (for example, proposing a change to an attribute to turn the IDS flag on will have all fields apart from the IDS flag blank in the proposal. Here is a list of what each of the fields represents"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:230
+msgid "The date of the last modification to the attribute. Proposals don't have a date of last edit."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:231
+msgid "The category of the attribute or proposal. For a list of possible categories visit the section on <a href=\"%s/pages/display/doc/categories_and_types\">categories and types</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:232
+msgid "The type of the attribute or proposal. For a list of possible categories visit the section on <a href=\"%s/pages/display/doc/categories_and_types\">categories and types</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:233
+msgid "The value or value-pair of the attribute. This is the main payload of the attribute, which is described by the category and type columns. For certain types of attributes that are made up of value-pairs the two parts will be split by a pipe (|), such as for filename|md5. The value field(s) are used by the correlation engine to find relations between events. In value-pair attributes both values are correlated individually."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:234
+msgid "Attributes can have a contextual comment to further describe the attribute. These comments are not used for correlation and are purely informative."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:235
+msgid "A list of the event IDs that also contain an attribute with the same value."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:236
+msgid "Flags an attribute as an indicator of compromise, allowing it to be included in all of the eligible exports."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:237
+msgid "Defines the distribution of the attribute individually. An attribute can have a different distribution level than the event. In any case, the lowest distribution level of the two is used."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:238
+msgid "The user can interact with the events through these buttons, which will be further described in the next portion of the guide as they differ for attributes and proposals."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:240
+msgid "Depending on the colour coding of the row, you can have an attribute, a proposal to the event or a proposal to an attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:242
+msgid "Each uncoloured line represents an Attribute."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:243
+msgid "Proposals to an Event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:243
+msgid "Each gray line at the end of the list represents a Proposal to an event. These are proposals for a new attribute, mostly unrelated to any of the currently existing attributes. If the creator of the event accepts one of these a new attribute will be created."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:244
+msgid "Proposals to an Attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:244
+msgid "Each attribute can have several edit proposals. These will be placed right below the attribute that the proposal affects and - as with the event proposals - is coloured grey. The original attribute's row is coloured blue if a proposal exists for it."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:246
+msgid "Using the modify button will bring up the attribute creation view, with all data filled out with the attributes currently stored data."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:247
+msgid "Event Discussion Thread"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:248
+msgid "Each event has its own assigned discussion where users (that are eligible to see the event) can participate in an open discussion. The users are anonymised in the messages, all that other users will see is their user ID number and their organisation. To post a message on the Event Discussion, either use the reply button on a previous post or use the quickresponse field at the bottom of the page.\n"
+"Each post is made up of the following"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:251
+msgid "The date when the post was created."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:252
+msgid "Post navigation"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:252
+msgid "This should the posts' ID as well as a link to jump to the top of the discussion thread on the page itself."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:253
+msgid "Organisation logo"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:253
+msgid "If such an image exists for the organisation that has posted the message, then the logo is shown."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:254
+msgid "The body of the post itself. This can also include automatically generated links to other events and threads as well as show quoted test in embedded bubbles. Editing an event will also append a post with a message indicating that it was edited together with the timestamp of the edit."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:255
+msgid "The e-mail address of the poster if he/she is from the organisation as the current user. Alternatively a generated sting is shown that includes the user ID of the user, so that his/her e-mail address could remain hidden whilst still being identifiable."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:256
+msgid "Action buttons"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:256
+msgid "Edit, Delete and Reply. The first two of the three options are only available to the poster of the message or a site admin. Quoting a post will automatically include the original message in [quote] tags."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:258
+msgid "Here is a list of the various tools you can use while using this feature"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:260
+msgid "Pagination"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:260
+msgid "There are 5 posts visible on each event page, if there have been more messages posted, use the previous and next button to navigate through the thread. This will not reload the rest of the page."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:261
+msgid "Discussion Tags"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:261
+msgid "Users can quote something by encapsulating it in [quote][/quote] tags, they can create a link to another event with the [event][/event] tags or to another discussion thread with [thread][/thread]."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:262
+msgid "Quick Post"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:262
+msgid "Adding a post will take the user to a separate add Post page, something that can be a bit of an inconvenience. To avoid this, there is a quick post button, where users can add messages on the fly without having to reload the page. On top of the quick post field, 3 buttons allow users to generate quote, event and thread tags quickly."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:265
+msgid "Event History"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:266
+msgid "View the logs of the event that show how the event has changed over time, including the contribution from other organisations in the form of proposals. There are two ways to get to this view, either by clicking on View Event History on the side menu of an event view, or by clicking on a contributing organisation's logo on the event view. The latter will show a restricted form of the logs, showing only Proposals created by the selected organisation. The fields shown in this view are as described as follows"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:268
+msgid "The logo (or in the lack thereof a string representation) of the organisation."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:269
+msgid "Each entry in the log happens during an action, such as the creation, modification or deletion of data and some special actions (such as accepting a proposal). This field shows which action caused the entry to be created."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:270
+msgid "Model"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:270
+msgid "As described above, a log entry is generated on certain actions. This field shows which type of data was affected that caused the log entry to be created (such as a change to the event, the creation of an attribute, the discarding of a proposal, etc)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:271
+msgid "This is a short description of the change itself and it is not nearly as detailed as the information administrators get in the audit logs. However, for attributes and proposals the category / type and value of the created or edited attribute is shown."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:272
+msgid "The date and time of the log entrys' creation."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:275
+msgid "Listing all attributes"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:276
+msgid "Apart from having a list of all the events, it is also possible to get a list of all the stored attributes in the system by clicking on the list attributes button. The produced list of attributes will include the followings fields"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:277
+msgid "Use the buttons to the right to view the event that this attribute belongs to or to modify/delete the attribute."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:279
+msgid "This is the ID number of the event that the attribute is tied to. If an event belongs to your organisation, then this field will be coloured red."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:280
+msgid "The organisation that has created the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:281
+msgid "The category of the attribute, showing what the attribute describes (for example the malware's payload). For more information on categories, go to section xy"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:282
+msgid "The type of the value contained in the attribute (for example a source IP address). For more information on types, go to section xy"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:283
+msgid "The actual value of the attribute, describing an aspect, defined by the category and type fields of the malware (for example 11.11.11.11)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:284
+msgid "An optional contextual comment attached to the attribute."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:285
+msgid "Shows whether the attribute has been flagged for NIDS signature generation or not."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:286
+msgid "A set of buttons that allow you to view the event that the attribute is tied to, to edit the attribute (using the same view as what is used to set up attributes, but filled out with the attribute's current data) and a delete button."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:288
+msgid "Searching for attributes"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:289
+msgid "Apart from being able to list all events, it is also possible to search for data contained in the value field of an attribute, by clicking on the \"Search Attributes\" button."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:290
+msgid "Search attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:291
+msgid "This will bring up a form that lets you enter one or several search strings (separate search strings with line breaks) that will be compared to the values of all attributes, along with options to narrow down the search based on category and type. The entered search string has to be an exact match with (the sub-string of) a value. A second text field makes it possible to enter event IDs for events that should be excluded from the search (again, each line represents an event ID to be excluded). The third text field allows the user to restrict the results to attributes from certain organisations or to attributes not created by certain other organisations, using the above described syntax."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:292
+msgid "The list generated by the search will look exactly the same as listing all attributes, except that only the attributes that matched the search criteria will be listed (to find out more about the list attributes view, %s.). The search parameters will be shown above the produced list and the search terms will be highlighted."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:293
+msgid "The last option is a checkbox that restricts all of the results to attributes that are marked as IDS signatures."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:294
+msgid "You can view the event that an attribute belongs to with the view button, or you can edit/delete the attribute via the buttons on the right."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:296
+msgid "Updating and modifying events and attributes"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:297
+msgid "Every event and attribute can easily be edited. First of all it is important to find the event or attribute that is to be edited, using any of the methods mentioned in the section on <a href=\"#browsing_events\">browsing past events</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:298
+msgid "Once it is found, the edit button (whether it be under actions when events/attributes get listed or simply on the event view) will bring up the same screen as what is used to create the entry of the same type (for an event it would be the event screen as <a href=\"#create\">seen here</a>, for an attribute the attribute screen as <a href=\"#create_attribute\">described here</a>)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:299
+msgid "Keep in mind that editing any event (either directly or indirectly through an attribute) will unpublish it, meaning that you'll have to publish it (through the event view) again once you are done."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:302
+msgid "As described earlier, users with tagging rights can arbitrarily tag events using tags chosen from a pool of available options. If you have tagging privileges and would like to create a new tag, navigate to Event Actions - Add Tag. You'll be presented with the following form"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:303
+msgid "Enter a name for the tag and click on the color field to be able to pick a colour for it."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:304
+msgid "Fill out the following fields"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:306
+msgid "Pick a name for the tag. Try to use consistent naming conventions across your instance, to avoid confusion."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:307
+msgid "Colour"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:307
+msgid "You can choose a colour for the tag by clicking on the colour field and using the colour picker tool. Try to avoid having duplicate or similar looking colours to help avoid confusion."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:311
+msgid "Newer users can easily be overwhelmed by having to manually populate events with attributes without any guidance. What sort of information should go into the event? What should be the category and type of a C2 IP? Templates allow users to use simple forms to populate events."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:312
+msgid "Even though MISP ships with a few default templates, it is possible for users (with the appropriate templating privilege) to create new templates for their users or for all users of the instance. Let's look at how you can create a template."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:313
+msgid "First go to Event Actions - Add Template to go to the event creation view."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:314
+#: View/Templates/add.ctp:6
+msgid "Create Template"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:314
+msgid "Fill in the generic information about the template."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:315;325;338;349
+msgid "The following fields have to be filled out"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:317
+msgid "The name of the template should describe what type of an event it should be used to generate attributes."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:318
+msgid "You can attach tags to the template - an event populated using the template would automatically receive the tag(s). Add new tags using the + button. If you change your mind about a tag you can remove it with the cross next to the tag name."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:319
+msgid "A short description about the events that this template should be used for."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:320
+#: View/Templates/add.ctp:44
+#: View/Templates/edit.ctp:44
+msgid "Share this template with others"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:320
+msgid "The template can be set to be usable by any organisation on the instance or only by the one that has created it."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:322
+msgid "Once the skeleton template is created, you can start populating the template with data. There are 3 types of elements that can be used during the creation of a template: attribute, file and text elements. Text elements divide the template into sections with an information field, followed by all of the attribute/file fields until a new text field is read. Don't worry about the order of the elements during creation, they can be re-arranged using drag &amp; drop. Let's look at the 3 element types"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:323
+msgid "Attribute Element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:324
+msgid "Template Attribute Element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:324
+msgid "This element will generate regular attributes based on user entry."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:327;340
+msgid "The field name that will be presented to the user."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:328;341
+msgid "A brief description of the element. Make sure that you provide sufficient information to the user to make it obvious what is expected."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:329
+msgid "The category used for any attributes created using this template element."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:330
+msgid "The type or complex type used for any attributes created using this template element. Complex types allow for several related types to be used on data entry. For example, a \"file\" complex type element allows for filenames and hashes."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:331
+msgid "Use Complex types"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:331
+msgid "If the category permits it, switch to a complex type using this checkbox."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:332
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:63
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:60
+msgid "Automatically mark for IDS"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:332
+msgid "If checked, any attributes generated using this element will be marked for IDS exporting."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:333;344
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:72
+#: View/TemplateElements/ajax/template_element_add_file.ctp:48
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:48
+msgid "Mandatory element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:333
+msgid "If the elemnt is marked as mandatory, then the template form can only be submitted by users if this field is filled out."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:334;345
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:81
+#: View/TemplateElements/ajax/template_element_add_file.ctp:57
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:76
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:57
+msgid "Batch import element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:334
+msgid "Allow for multiple values to be entered (separated by line breaks)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:336
+msgid "File Element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:337
+msgid "Template File Element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:337
+msgid "This element will generate attachments based on user entry."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:342
+msgid "The category to be used by all attachments uploaded through this element."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:343
+msgid "If the uploaded files are malicious and should be encrypted and password protected, mark this checkbox."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:344
+msgid "If it should be required to upload an attachment, check this checkbox."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:345
+msgid "Ticking this checkbox allows users to upload several files using this element."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:347
+msgid "Text Element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:348
+msgid "Template Text Element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:348
+msgid "This element will start a section in the template, which continues until the next text element or the end of the template."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:351
+msgid "The name of the section that will be presented to the user."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:352
+msgid "The description of the section. Explain briefly to the user what the following attribute/file elements will be dealing with. There are several ways to split a template into sections, try to have ease of use in mind while creating it."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:355
+msgid "Contacting the reporter"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:356
+msgid "To get in touch with the reporter of a previously registered event, just find the event for which you would like to contact the reporter by either finding it on the list of events, by finding it through one of its attributes or by finding it through a related event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:357
+msgid "Once the event is found and the event view opened, click the button titled \"Contact Reporter\". This will bring up a view where you can enter your message that is to be e-mailed to all members of the reporting organisation that subscribe to receiving such reports or the reporting user himself. Along with your message, the detailed information about the event in question will be included in the e-mail."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:358
+msgid "Enter your message to the reporter and choose whether his/her entire organisation should get the message or not by ticking the check-box."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:359
+msgid "By default, the message will be sent to every member of the organisation that posted the event in the first place, but if you tick the check-box below the message field before sending the mail, only the person that reported the event will get e-mailed."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:362
+msgid "It is possible to quickly and conveniently export the data contained within the system using the automation features located in the main menu on the left (available to users with authentication key access only). There are various sets of data that can be exported, by using the authentication key provided by the system (also shown on the export page). If for whatever reason you would need to invalidate your current key and get a new one instead (for example due to the old one becoming compromised) just hit the reset link next to the authentication key in the export view or in your \"my profile\" view."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:363
+msgid "To find out about the various export formats and the usage within the automation functions, please read the page on <a href=\"%s/events/automation\">automation</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:366
+msgid "For users that do not have authentication key access, an alternate export feature is available that relies on your interactive login to the site. To access these, just use the export menu button to the left and you'll be presented with a list of export options."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:367
+msgid "Depending on your server's configuration, you will be presented with one of two possible pages, depending on whether you have background processing enabled or not. (The setting on this instance is currently set to: <code>%s</code>)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:367
+msgid "On"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:367
+msgid "Off"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:368;371
+msgid "Export page with background jobs"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:369
+msgid "The page will list a set of export formats that you can immediately download as a file. Just click on the desired export format and MISP will start collecting all the data that you will receive in a file. Keep in mind that this can be a lengthy process. To avoid having to wait, consult with your instance's site administrator about enabling the background processing."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:370;384
+msgid "Use the export features here to quickly download data in various formats"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:372
+msgid "If the background jobs are enabled, you'll be redirected to a different version of the export page. Here you will see a table with all of the major export formats and the current status of the cached export files. Keep in mind that these are generated on an organisation by organisation basis, so even though others have generated newer export caches your organisation may have an outdated cache. You can simply issue a generate command (by clicking the \"Generate\" button) on the desired export type and the background workers will start fetching and assembling your cache. A progress bar will show the progress of the export process."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:373
+msgid "Once done, you can click \"Download\" to download the freshly generated cache file. If the cache is already up to date from before, then you don't have to regenerate the cache, just click on the \"download\" button."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:374
+msgid "You may have noticed that the TEXT export only has a generate button - this is because TEXT exports are made up of a lot of types of exports, all of which get generated together. To download any of these files, just click on any of the attribute types at the bottom of the table."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:375
+msgid "A quick description of each of the fields in the table"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:377
+msgid "The type of the export (such as XML, Suricata, MD5, etc.)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:378
+msgid "The generation date of the current cache for the given export type."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:379
+msgid "A description of the export format."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:380
+msgid "This compares the cache generation date to the last timestamp when an event was updated and lets you know whether the cache is outdated or not."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:381
+msgid "Shows the progress of the last initiated generation process."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:382
+msgid "Download or Generate the given cache with these buttons."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:385
+msgid "Exporting search results and individual events"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:386
+msgid "Apart from the options offered by the export pages, it's also possible to export all events involved in a search attribute result table, by using the \"Download results as XML\" button on the left menu bar."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:387
+msgid "Download a .xml from all the events that are shown through an attribute in the search results."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:388
+msgid "Each event's view has its own export feature, both as an XML export and as a .ioc file. To reach these features, just navigate to an event and use the appropriate buttons on the right side."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:389
+msgid "Download a .xml or a .ioc of the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:391
+msgid "Connecting to other instances"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:392
+msgid "Apart from being a self contained repository of attacks/malware, one of the main features of MISP is its ability to connect to other instances and share (parts of) its information. The following options allow you to set up and maintain such connections."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:393
+msgid "Setting up a connection to another server"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:394
+msgid "In order to share data with a remote server via pushes and pulls, you need to request a valid authentication key from the hosting organisation of the remote instance. When clicking on List Servers and then on New Server, a form comes up that needs to be filled out in order for your instance to connect to it. The following fields need to be filled out"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:395
+msgid "Add server"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:395
+msgid "Make sure that you enter the authentication key that you have been given by the hosting organisation of the remote instance, instead of the one you have gotten from this one."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:397
+#: View/Servers/add.ctp:8
+#: View/Servers/edit.ctp:8
+msgid "Base URL"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:397
+msgid "The URL of the remote server."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:398
+msgid "Organization"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:398
+msgid "The organisation that runs the remote server. It is very impoportant that this setting is filled out exactly as the organisation name set up in the bootstrap file of the remote instance."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:399
+msgid "The authentication key that you have received from the hosting organisation of the remote instance."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:400
+msgid "This check-box controls whether your server is allowed to push to the remote instance."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:401
+msgid "This check-box controls whether your server can request to pull all data from the remote instance."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:402
+msgid "Unpublish event (Push only)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:402
+msgid "This check-box controls to unpublish new event (working with Push events)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:403
+msgid "Publish without email (Pull only)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:403
+msgid "This check-box controls whether your server is allowed to publish event without email (working with Pull events)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:404
+msgid "Self Signed"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:404
+msgid "Ticking this checkbox will allow syncing with instances using self-signed certificates."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:405
+msgid "Certificate File"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:405
+msgid "If the instance that you want to connect to has their entire own certificate chain, you can use this to import a .pem file with it and override CakePHP's standard root CA file."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:407
+msgid "If you are an administrator</b>, trying to allow another instance to connect to your own, it is vital that two rules are followed when setting up a synchronisation account"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:409
+msgid "The synchronisation user has to have the sync permission and full read/write/publish privileges turned on"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:410
+msgid "Both the sync user and the organisation setting in your instance's Config/bootstrap.php file have to match the organisation identifier of the hosting organisation."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:412
+msgid "Browsing the currently set up server connections and interacting with them"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:413
+msgid "If you ever need to change the data about the linked servers or remove any connections, you have the following options to view and manipulate the server connections, when clicking on List Servers: (you will be able to see a list of all servers that your server connects to, including the base address, the organisation running the server the last pushed and pulled event IDs and the control buttons.)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:414
+msgid "Apart from editing / deleting the link to the remote server, you can issue a push all or pull all command from here."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:416
+msgid "Editing the connection to the"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:416
+msgid "By clicking edit a view, <a href=#new_server>that is identical to the new instance view</a>, is loaded, with all the current information of the instance pre-entered."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:417
+msgid "Deleting the connection to the instance"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:417
+msgid "Clicking the delete button will delete the link to the instance."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:418
+#: View/Servers/index.ctp:128
+msgid "Push all"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:418
+msgid " By clicking this button, all events that are eligible to be pushed on the instance you are on will start to be pushed to the remote instance. Events and attributes that exist on the far end will be updated."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:419
+#: View/Servers/index.ctp:125
+msgid "Pull all"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:419
+msgid "By clicking this button, all events that are set to be pull-able or full access on the remote server will be copied to this instance. Existing events will not be updated."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:423
+msgid "The platform is also <a href=\"http://en.wikipedia.org/wiki/Representational_state_transfer\">RESTfull</a>, so this means that you can use structured format (XML or JSON) to access Events data."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:424
+msgid "Requests"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:425
+msgid "Use any HTTP compliant library to perform requests."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:426
+msgid "You can choose which format you would like to use as input/output for the REST calls by specifying the Accept and Content-Type headers."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:427
+msgid "The following headers are required if you wish to recieve / push XML data"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:431
+msgid "The following headers are required if you wish to receive / push JSON data"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:435
+msgid "The following table shows the relation of the request type and the resulting action"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:444
+msgid "HTTP format"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:446
+msgid "Controller action invoked"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:476
+msgid "(1) Warning, there's a limit on the number of results when you call <code>index</code>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:477
+msgid "(2) Attachments are included using base64 encoding below the <code>data</code> tag."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:480
+msgid "Example - Get single Event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:481
+msgid "In this example we fetch the details of a single Event (and thus also his Attributes)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:482
+msgid "The request should be"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:484
+msgid "And with the HTTP Headers"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:487;548
+msgid "The response you're going to get is the following data"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:495;596
+msgid "Code monkey doing code monkey stuff"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:509;581
+msgid "Artifacts dropped"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:515;544
+msgid "This is an Attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:516;545;588
+msgid "Some_attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:525
+msgid "Example - Add new Event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:526
+msgid "In this example we want to add a single Event.<br/>\n"
+"The request should be"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:531
+msgid "And the request body"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:535;567
+msgid "Something concise"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:613
+msgid "The response from requesting an invalid page"
+msgstr ""
+
+#: View/Posts/add.ctp:10;16
+#: View/Posts/edit.ctp:6
+msgid "Thread Subject"
+msgstr ""
+
+#: View/Posts/add.ctp:24
+msgid "In response to"
+msgstr ""
+
+#: View/Regexp/admin_add.ctp:4
+msgid "Add Import Regexp"
+msgstr ""
+
+#: View/Regexp/admin_add.ctp:10
+#: View/Regexp/admin_edit.ctp:11
+msgid "Types to be affected by the filter (Setting 'all' will override the other settings)"
+msgstr ""
+
+#: View/Regexp/admin_edit.ctp:4
+msgid "Edit Import Regexp"
+msgstr ""
+
+#: View/Roles/admin_add.ctp:9
+#: View/Roles/admin_edit.ctp:9
+msgid "Restrict to site admins"
+msgstr ""
+
+#: View/Roles/admin_add.ctp:19
+#: View/Roles/admin_edit.ctp:18
+msgid "Memory limit"
+msgstr ""
+
+#: View/Roles/admin_add.ctp:20
+#: View/Roles/admin_edit.ctp:19
+msgid "Maximum execution time"
+msgstr ""
+
+#: View/Roles/index.ctp:36
+msgid "ok"
+msgstr ""
+
+#: View/Roles/index.ctp:36
+msgid "remove"
+msgstr ""
+
+#: View/Roles/view.ctp:5
+msgid "Permission level"
+msgstr ""
+
+#: View/Servers/add.ctp:4
+msgid "Add Server"
+msgstr ""
+
+#: View/Servers/add.ctp:6
+#: View/Servers/edit.ctp:6
+msgid "Instance identification"
+msgstr ""
+
+#: View/Servers/add.ctp:11
+#: View/Servers/edit.ctp:11
+msgid "Instance name"
+msgstr ""
+
+#: View/Servers/add.ctp:17
+msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change."
+msgstr ""
+
+#: View/Servers/add.ctp:20
+#: View/Servers/edit.ctp:20
+msgid "Internal instance"
+msgstr ""
+
+#: View/Servers/add.ctp:30
+#: View/Servers/edit.ctp:31
+msgid "Instance ownership and credentials"
+msgstr ""
+
+#: View/Servers/add.ctp:31
+#: View/Servers/edit.ctp:32
+msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
+msgstr ""
+
+#: View/Servers/add.ctp:37
+msgid "Remote Sync Organisation Type"
+msgstr ""
+
+#: View/Servers/add.ctp:42
+#: View/Servers/edit.ctp:43
+msgid "External Organisation"
+msgstr ""
+
+#: View/Servers/add.ctp:48
+msgid "Owner of remote instance"
+msgstr ""
+
+#: View/Servers/add.ctp:54
+#: View/Servers/edit.ctp:65
+msgid "Remote Organisation's Name"
+msgstr ""
+
+#: View/Servers/add.ctp:58
+#: View/Servers/edit.ctp:69
+msgid "Remote Organisation's Uuid"
+msgstr ""
+
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:78
+msgid "Enabled synchronisation methods"
+msgstr ""
+
+#: View/Servers/add.ctp:86
+msgid "Server certificate file"
+msgstr ""
+
+#: View/Servers/add.ctp:92
+msgid "Client certificate file"
+msgstr ""
+
+#: View/Servers/add.ctp:97
+#: View/Servers/edit.ctp:142
+msgid "Push rules:"
+msgstr ""
+
+#: View/Servers/add.ctp:98;104
+#: View/Servers/edit.ctp:143;149
+msgid "Events with the following tags allowed: "
+msgstr ""
+
+#: View/Servers/add.ctp:99;105
+#: View/Servers/edit.ctp:144;150
+msgid "Events with the following tags blocked: "
+msgstr ""
+
+#: View/Servers/add.ctp:100;106
+#: View/Servers/edit.ctp:145;151
+msgid "Events with the following organisations allowed: "
+msgstr ""
+
+#: View/Servers/add.ctp:101;107
+#: View/Servers/edit.ctp:146;152
+msgid "Events with the following organisations blocked: "
+msgstr ""
+
+#: View/Servers/add.ctp:103
+#: View/Servers/edit.ctp:148
+msgid "Pull rules:"
+msgstr ""
+
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:179
+msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
+msgstr ""
+
+#: View/Servers/add.ctp:137
+msgid "Unpublish new event (working with Pull event)."
+msgstr ""
+
+#: View/Servers/add.ctp:138
+msgid "Publish new event without email (working with Push event)."
+msgstr ""
+
+#: View/Servers/add.ctp:139
+msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
+msgstr ""
+
+#: View/Servers/edit.ctp:17
+msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change. This also requires that the current instance's host organisation and the remote sync organisation are the same."
+msgstr ""
+
+#: View/Servers/edit.ctp:37
+msgid "Organisation Type"
+msgstr ""
+
+#: View/Servers/edit.ctp:54
+msgid "Local Organisation"
+msgstr ""
+
+#: View/Servers/edit.ctp:75
+msgid "Leave empty to use current key"
+msgstr ""
+
+#: View/Servers/edit.ctp:99
+msgid "Server certificate file (*.pem): "
+msgstr ""
+
+#: View/Servers/edit.ctp:107;129
+msgid "Add certificate file"
+msgstr ""
+
+#: View/Servers/edit.ctp:108;130
+msgid "Remove certificate file"
+msgstr ""
+
+#: View/Servers/edit.ctp:121
+msgid "Client certificate file: "
+msgstr ""
+
+#: View/Servers/edit.ctp:188
+msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
+msgstr ""
+
+#: View/Servers/edit.ctp:245;249
+msgid "Not set."
+msgstr ""
+
+#: View/Servers/filter_event_index.ctp:6
+msgid "Please enter the url parameters that are to be used for the request. Valid parameters are: "
+msgstr ""
+
+#: View/Servers/filter_event_index.ctp:8
+msgid "Example:"
+msgstr ""
+
+#: View/Servers/filter_event_index.ctp:21
+msgid "Apply filters to the remote instance's index"
+msgstr ""
+
+#: View/Servers/index.ctp:2
+msgid "Servers"
+msgstr ""
+
+#: View/Servers/index.ctp:23
+msgid "Connection test"
+msgstr ""
+
+#: View/Servers/index.ctp:31
+msgid "Remote Organisation"
+msgstr ""
+
+#: View/Servers/index.ctp:72
+msgid "Test the connection to the remote instance"
+msgstr ""
+
+#: View/Servers/index.ctp:72
+msgid "Run"
+msgstr ""
+
+#: View/Servers/index.ctp:73
+msgid "Internal instance that ignores distribution level degradation *WARNING: Only use this setting if you have several internal instances and the sync link is to an internal extension of the current MISP community*"
+msgstr ""
+
+#: View/Servers/index.ctp:73
+msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
+msgstr ""
+
+#: View/Servers/index.ctp:122
+msgid "Explore"
+msgstr ""
+
+#: View/Servers/index.ctp:124
+msgid "Pull updates to events that already exist locally"
+msgstr ""
+
+#: View/Servers/index.ctp:131
+msgid "Cache instance"
+msgstr ""
+
+#: View/Servers/preview_event.ctp:7
+msgid "You are currently viewing an event on the remote instance %s "
+msgstr ""
+
+#: View/Servers/preview_event.ctp:31
+msgid "Filter the remote instance by tag: %s"
+msgstr ""
+
+#: View/Servers/preview_event.ctp:31
+msgid "Filter the remote instance on the tag: %s"
+msgstr ""
+
+#: View/Servers/preview_index.ctp:3
+msgid "You are currently viewing the event index of the remote instance %s"
+msgstr ""
+
+#: View/Servers/preview_index.ctp:112
+msgid "not "
+msgstr ""
+
+#: View/Servers/preview_index.ctp:112
+msgid "published"
+msgstr ""
+
+#: View/Servers/preview_index.ctp:173
+msgid "Fetch the event"
+msgstr ""
+
+#: View/Servers/pull.ctp:2
+msgid "Failed pulls"
+msgstr ""
+
+#: View/Servers/pull.ctp:5
+msgid "No failed pulls"
+msgstr ""
+
+#: View/Servers/pull.ctp:13
+msgid "Succeeded pulls"
+msgstr ""
+
+#: View/Servers/pull.ctp:16
+msgid "No succeeded pulls"
+msgstr ""
+
+#: View/Servers/pull.ctp:24
+msgid "Proposals pulled"
+msgstr ""
+
+#: View/Servers/pull.ctp:27
+msgid "No proposals pulled"
+msgstr ""
+
+#: View/Servers/push.ctp:2
+msgid "Failed pushes"
+msgstr ""
+
+#: View/Servers/push.ctp:5
+msgid "No failed pushes"
+msgstr ""
+
+#: View/Servers/push.ctp:13
+msgid "Succeeded pushes"
+msgstr ""
+
+#: View/Servers/push.ctp:16
+msgid "No succeeded pushes"
+msgstr ""
+
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
+msgid "Relative path to query"
+msgstr ""
+
+#: View/Servers/rest.ctp:116
+msgid "Response code"
+msgstr ""
+
+#: View/Servers/rest.ctp:117
+msgid "Request duration"
+msgstr ""
+
+#: View/Servers/rest.ctp:118
+msgid "Headers"
+msgstr ""
+
+#: View/Servers/server_settings.ctp:3
+msgid "Warning: app/Config/config.php is not writeable. This means that any setting changes made here will NOT be saved."
+msgstr ""
+
+#: View/Servers/server_settings.ctp:20
+msgid "To edit a setting, simply double click it."
+msgstr ""
+
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:2
+msgid "Select instances to add"
+msgstr ""
+
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:7
+msgid "Available Instances"
+msgstr ""
+
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
+msgid "Added Instances"
+msgstr ""
+
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
+msgid "Add servers to sharing group"
+msgstr ""
+
+#: View/Servers/ajax/update.ctp:7
+msgid "Do you want to pull the latest commit from the <?php echo h($branch); ?> branch? If you have made local changes to MISP the merge will fail."
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:2
+msgid "ZeroMQ Server Status"
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:5
+msgid "Start time"
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:6
+msgid "Settings read at"
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:7
+msgid "Events processed"
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:9
+msgid "The ZeroMQ server is unreachable."
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:11
+msgid "Cancel prompt"
+msgstr ""
+
+#: View/ShadowAttributes/add.ctp:4
+#: View/ShadowAttributes/edit.ctp:4
+msgid "Add Proposal"
+msgstr ""
+
+#: View/ShadowAttributes/add.ctp:52;65
+#: View/ShadowAttributes/add_attachment.ctp:35
+#: View/ShadowAttributes/edit.ctp:51
+msgid "Propose"
+msgstr ""
+
+#: View/ShadowAttributes/edit.ctp:41
+msgid "IDS Signature?"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:24
+msgid "My Org's Events"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:29
+msgid "All Events"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:43
+msgid "Proposal by"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:49
+msgid "Event creator"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:55
+msgid "Proposed value"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:81
+msgid "Attribute edit"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:83
+msgid "New Attribute"
+msgstr ""
+
+#: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:7
+msgid "Are you sure you want to propose to delete Attribute #%s?"
+msgstr ""
+
+#: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
+msgid "Propose to delete attribute"
+msgstr ""
+
+#: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:5
+msgid "Proposal Deletion"
+msgstr ""
+
+#: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:7
+msgid "Are you sure you want to delete Proposal #%s?"
+msgstr ""
+
+#: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+msgid "Delete proposal"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:3
+msgid "New Sharing Group"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
+msgid "General"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
+msgid "Organisations tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
+msgid "MISP Instances"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
+msgid "Summary and Save"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
+msgid "Example: Multinational sharing group"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
+msgid "Releasable to"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
+msgid "Example: Community1, Organisation1, Organisation2"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
+msgid "A description of the sharing group."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
+msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
+msgid "Make the sharing group selectable (active)"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
+msgid "Next page"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
+msgid "Add local organisation(s) to the sharing group"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
+msgid "Add local organisation"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
+msgid "Add remote organisations to the sharing group"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
+msgid "Add remote organisation"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
+#: View/SharingGroups/view.ctp:44
+msgid "Extend"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
+msgid "Previous page"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
+msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
+msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
+msgid "Add instance"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
+#: View/SharingGroups/view.ctp:69
+msgid "All orgs"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:103
+msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:104
+msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:105
+msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:106
+msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
+msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
+msgid "Submit and create sharing group"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:135
+msgid "Local instance"
+msgstr ""
+
+#: View/SharingGroups/edit.ctp:111
+msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
+"                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
+"                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
+msgstr ""
+
+#: View/SharingGroups/edit.ctp:114
+msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:2
+msgid "Sharing Groups"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:26
+msgid "Active Sharing Groups"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:31
+msgid "Passive Sharing Groups"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:80
+msgid "Distribution List"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:28
+msgid "Synced by"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:68
+msgid "Url"
+msgstr ""
+
+#: View/Sightings/ajax/add_sighting.ctp:11
+msgid "honeypot, IDS sensor id, SIEM,…"
+msgstr ""
+
+#: View/Sightings/ajax/add_sighting.ctp:15
+msgid "Sighting date"
+msgstr ""
+
+#: View/Sightings/ajax/advanced.ctp:2
+msgid "Sighting details"
+msgstr ""
+
+#: View/Sightings/ajax/advanced.ctp:4
+msgid "Graph"
+msgstr ""
+
+#: View/Sightings/ajax/advanced.ctp:6
+msgid "My org"
+msgstr ""
+
+#: View/Sightings/ajax/list_sightings.ctp:10
+msgid "Attribute ID"
+msgstr ""
+
+#: View/Sightings/ajax/list_sightings.ctp:35
+msgid "Delete sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
+msgid "Add Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
+msgstr ""
+
+#: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
+msgid "Remove Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:7
+msgid "Remove sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
+msgid "Remove sighting"
+msgstr ""
+
+#: View/TagCollections/add.ctp:8
+msgid "Edit Tag Collection"
+msgstr ""
+
+#: View/TagCollections/add.ctp:16
+msgid "Visible to all orgs"
+msgstr ""
+
+#: View/TagCollections/import.ctp:4
+msgid "Paste tag collection data"
+msgstr ""
+
+#: View/TagCollections/import.ctp:5
+msgid "Paste a MISP tag collection JSON below to add tag collections."
+msgstr ""
+
+#: View/TagCollections/import.ctp:10
+msgid "Tag collection JSON"
+msgstr ""
+
+#: View/Tags/add.ctp:12
+#: View/Tags/edit.ctp:12
+msgid "Restrict tagging to org"
+msgstr ""
+
+#: View/Tags/add.ctp:17
+#: View/Tags/edit.ctp:17
+msgid "Restrict tagging to user"
+msgstr ""
+
+#: View/Tags/edit.ctp:31
+msgid "Unselectable Tag"
+msgstr ""
+
+#: View/Tags/index.ctp:10
+msgid "Your Favourite Tags"
+msgstr ""
+
+#: View/Tags/index.ctp:56
+msgid "Filter user tags"
+msgstr ""
+
+#: View/Tags/index.ctp:66
+msgid "Restricted to org"
+msgstr ""
+
+#: View/Tags/index.ctp:68
+msgid "Restricted to user"
+msgstr ""
+
+#: View/Tags/index.ctp:70
+msgid "Taxonomy"
+msgstr ""
+
+#: View/Tags/index.ctp:71
+msgid "Tagged events"
+msgstr ""
+
+#: View/Tags/index.ctp:72
+msgid "Tagged attributes"
+msgstr ""
+
+#: View/Tags/index.ctp:74
+msgid "Favourite"
+msgstr ""
+
+#: View/Tasks/index.ctp:4
+msgid "Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks."
+msgstr ""
+
+#: View/Tasks/index.ctp:5
+msgid "Warning: Scheduled tasks come with a lot of caveats and little in regards of customisations / granularity. You can instead simply create cron jobs out of the console commands as described here: "
+msgstr ""
+
+#: View/Tasks/index.ctp:55
+msgid "Set frequency timer for scheduled task"
+msgstr ""
+
+#: View/Tasks/index.ctp:96
+msgid "Update all"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:2
+msgid "Taxonomies"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:26
+msgid "Active Tags"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:36
+msgid "enable all"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:36
+msgid "Enable all tags"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:36
+msgid "Are you sure you want to enable every tag associated to this taxonomy?"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:41
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
+msgid "Disable"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:41
+#: View/Taxonomies/view.ctp:29
+msgid "Are you sure you want to disable this taxonomy library?"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:43
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
+msgid "Enable"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:43
+#: View/Taxonomies/view.ctp:31
+msgid "Are you sure you want to enable this taxonomy library?"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:48
+msgid "Delete taxonomy"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:62
+msgid "Create and/or update selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
+msgid "Hidden"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:154
+msgid "Refresh"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:159
+msgid "Refresh or enable"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:9
+msgid "Taxonomy Deletion"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Taxonomy #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the taxonomy at any time by updating your taxonomies."
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:13
+msgid "Create Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:15
+msgid "Are you sure you want to create / update all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+msgid "Create / update all selected taxonomy entries as tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+msgid "Create / update all taxonomy entries as tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
+#: View/TemplateElements/ajax/ajaxIndex.ctp:2
+msgid "Template Elements"
+msgstr ""
+
+#: View/TemplateElements/ajax/ajaxIndex.ctp:11
+msgid "Add a new template element"
+msgstr ""
+
+#: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:5
+msgid "Template Element Deletion"
+msgstr ""
+
+#: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:7
+msgid "Are you sure you want to delete Template Element #%s?"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:5
+msgid "Add Attribute Element To Template"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:29
+#: View/TemplateElements/ajax/template_element_add_file.ctp:29
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:29
+msgid "Select Category"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:37
+msgid "Select Type"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:43
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:42
+msgid "Some categories can use complex types. A complex type can define attributes that can be described by various different types, the system will parse the user's entry and determine the most suitable type for the found attributes. The list of valid types for the chosen complex type is shown below."
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:47
+msgid "Use complex types"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:55
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:53
+msgid "Types allowed based on the above setting"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:59
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:57
+msgid "When checked, attributes created using this element will automatically be marked for IDSes."
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:68
+#: View/TemplateElements/ajax/template_element_add_file.ctp:44
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:65
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:44
+msgid "This setting will make this element mandatory."
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:77
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:73
+msgid "If this checkbox is checked, then the resulting field in the form will allow several values to be entered (separated by a linebreak)."
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
+msgid "Add attribute element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:2
+#: View/Templates/ajax/template_choices.ctp:2
+msgid "Choose element type"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:3
+msgid "Add an attribute element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:4
+msgid "Add a file element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:5
+msgid "Add a text description to the elements that follow"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_file.ctp:5
+msgid "Add File Element To Template"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_file.ctp:34
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:34
+msgid "If a file is flagged as malicious then it will automatically be encrypted."
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_file.ctp:53
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:53
+msgid "If this checkbox is checked, then the resulting field in the form will allow several files to be uploaded."
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_file.ctp:67
+msgid "Submit the file element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_text.ctp:5
+#: View/TemplateElements/ajax/template_element_edit_text.ctp:5
+msgid "Add Text Element To Template"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_text.ctp:29
+msgid "Add text description element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:5
+msgid "Edit Attribute Element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:86
+msgid "Submit attribute element changes"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:5
+msgid "Edit File Element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:67
+msgid "Submit file element changes"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_edit_text.ctp:29
+msgid "Submit description changes"
+msgstr ""
+
+#: View/Templates/add.ctp:41
+#: View/Templates/edit.ctp:41
+msgid "A description of the template"
+msgstr ""
+
+#: View/Templates/add.ctp:49
+msgid "Create"
+msgstr ""
+
+#: View/Templates/index.ctp:2
+msgid "Templates"
+msgstr ""
+
+#: View/Templates/index.ctp:45
+msgid "Are you sure you want to delete Template #"
+msgstr ""
+
+#: View/Templates/populate_event_from_template_attributes.ctp:2
+msgid "Populate From Template Results"
+msgstr ""
+
+#: View/Templates/populate_event_from_template_attributes.ctp:3
+msgid "Below you can see the attributes that are to be created based on the data that you have entered into the template. If you are satisfied with the result, click \"Finalise\". Otherwise, click \"Modify\"."
+msgstr ""
+
+#: View/Templates/populate_event_from_template_attributes.ctp:37
+msgid "Finalise"
+msgstr ""
+
+#: View/Templates/upload_file.ctp:3
+msgid "Upload Files"
+msgstr ""
+
+#: View/Templates/upload_file.ctp:8
+msgid "Replace File"
+msgstr ""
+
+#: View/Templates/upload_file.ctp:10
+msgid "Upload File"
+msgstr ""
+
+#: View/Templates/view.ctp:38
+msgid "Shareable"
+msgstr ""
+
+#: View/Threads/index.ctp:24
+msgid "Last Post By"
+msgstr ""
+
+#: View/Threads/index.ctp:26
+msgid "Posts"
+msgstr ""
+
+#: View/Threads/index.ctp:81
+msgid "View Discussion"
+msgstr ""
+
+#: View/Users/admin_add.ctp:4
+msgid "Admin Add User"
+msgstr ""
+
+#: View/Users/admin_add.ctp:32
+#: View/Users/admin_edit.ctp:32
+msgid "Set password"
+msgstr ""
+
+#: View/Users/admin_add.ctp:37
+msgid "Length"
+msgstr ""
+
+#: View/Users/admin_add.ctp:38
+msgid "Complexity"
+msgstr ""
+
+#: View/Users/admin_add.ctp:52
+msgid "Choose organisation"
+msgstr ""
+
+#: View/Users/admin_add.ctp:66
+#: View/Users/admin_edit.ctp:60
+msgid "Sync user for"
+msgstr ""
+
+#: View/Users/admin_add.ctp:70
+#: View/Users/admin_edit.ctp:64
+msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
+msgstr ""
+
+#: View/Users/admin_add.ctp:72
+#: View/Users/admin_edit.ctp:66
+msgid "Fetch the user's GnuPG key"
+msgstr ""
+
+#: View/Users/admin_add.ctp:72
+#: View/Users/admin_edit.ctp:66
+#: View/Users/edit.ctp:25
+msgid "Fetch GnuPG key"
+msgstr ""
+
+#: View/Users/admin_add.ctp:74
+#: View/Users/admin_edit.ctp:68
+msgid "SMIME key"
+msgstr ""
+
+#: View/Users/admin_add.ctp:74
+#: View/Users/admin_edit.ctp:68
+msgid "Paste the user's SMIME public key in PEM format here."
+msgstr ""
+
+#: View/Users/admin_add.ctp:88
+#: View/Users/admin_edit.ctp:78
+msgid "Disable this user account"
+msgstr ""
+
+#: View/Users/admin_add.ctp:90
+msgid "Send credentials automatically"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:4
+msgid "Admin Edit User"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
+msgid "Terms accepted"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:74
+msgid "Reset Auth Key"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:86
+#: View/Users/change_pw.ctp:18
+#: View/Users/edit.ctp:36
+msgid "Confirm with your current password"
+msgstr ""
+
+#: View/Users/admin_email.ctp:2
+msgid "Contact User(s)"
+msgstr ""
+
+#: View/Users/admin_email.ctp:6
+msgid "Messaging - here's a quick guide on how this feature works"
+msgstr ""
+
+#: View/Users/admin_email.ctp:7
+msgid "You can use this view to send messages to your current or future users or send them a temporary password."
+msgstr ""
+
+#: View/Users/admin_email.ctp:9
+msgid "When adding a new user to the system, or when you want to manually reset the password for a user, just use the \"Send temporary password\" setting."
+msgstr ""
+
+#: View/Users/admin_email.ctp:10
+msgid "After selecting the action, choose who the target of the e-mails should be (all users, a single user or a user not yet in the system)."
+msgstr ""
+
+#: View/Users/admin_email.ctp:11
+msgid "You can then specify (if eligible) what the e-mail address of the target is (for existing users you can choose from a dropdown menu)."
+msgstr ""
+
+#: View/Users/admin_email.ctp:12
+msgid "In the case of a new user, you can specify the future user's GnuPG key, to send his/her new key in an encrypted e-mail."
+msgstr ""
+
+#: View/Users/admin_email.ctp:13
+msgid "The system will automatically generate a message for you, but it is also possible to write a custom message if you tick the check-box,\n"
+"                        but don't worry about assigning a temporary password manually, the system will do that for you, right after your custom message."
+msgstr ""
+
+#: View/Users/admin_email.ctp:18
+msgid "Custom message"
+msgstr ""
+
+#: View/Users/admin_email.ctp:18
+msgid "Welcome message"
+msgstr ""
+
+#: View/Users/admin_email.ctp:18
+msgid "Reset password"
+msgstr ""
+
+#: View/Users/admin_email.ctp:19
+msgid "A single user"
+msgstr ""
+
+#: View/Users/admin_email.ctp:19
+msgid "All users"
+msgstr ""
+
+#: View/Users/admin_email.ctp:19
+msgid "All users of the same organisation"
+msgstr ""
+
+#: View/Users/admin_email.ctp:39
+msgid "Enter a custom message"
+msgstr ""
+
+#: View/Users/admin_email.ctp:73
+msgid "New user registration"
+msgstr ""
+
+#: View/Users/admin_email.ctp:73
+msgid "Password reset"
+msgstr ""
+
+#: View/Users/admin_filter_user_index.ctp:4
+msgid "Filter User Index"
+msgstr ""
+
+#: View/Users/admin_filter_user_index.ctp:81
+msgid "Remove filter"
+msgstr ""
+
+#: View/Users/admin_filter_user_index.ctp:106
+msgid "Apply filters"
+msgstr ""
+
+#: View/Users/admin_index.ctp:2
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:32
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr ""
+
+#: View/Users/admin_quick_email.ctp:2
+msgid "Contact %s"
+msgstr ""
+
+#: View/Users/admin_quick_email.ctp:4
+msgid "WARNING: This user does not have an encryption key set. The security posture of this instance allows for the sending of clear-text e-mails, so this is what will happen if you proceed."
+msgstr ""
+
+#: View/Users/admin_quick_email.ctp:7
+msgid "%s key found for user, the e-mail will be sent encrypted using this key."
+msgstr ""
+
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/admin_view.ctp:44
+msgid "Invited By"
+msgstr ""
+
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
+msgstr ""
+
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr ""
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
+msgid "GnuPG fingerprint"
+msgstr ""
+
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
+msgid "GnuPG status"
+msgstr ""
+
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
+msgid "SMIME Public certificate"
+msgstr ""
+
+#: View/Users/check_and_correct_pgps.ctp:2
+msgid "Failed GnuPGs?"
+msgstr ""
+
+#: View/Users/check_and_correct_pgps.ctp:4
+msgid "No failed composites"
+msgstr ""
+
+#: View/Users/edit.ctp:27
+msgid "SMIME Public certificate (PEM format)"
+msgstr ""
+
+#: View/Users/login.ctp:37;44
+msgid "Login"
+msgstr ""
+
+#: View/Users/statistics.ctp:8
+#: View/Users/statistics_data.ctp:11
+msgid "Some statistics about this instance. The changes since the beginning of this month are noted in brackets wherever applicable"
+msgstr ""
+
+#: View/Users/statistics.ctp:21
+#: View/Users/statistics_data.ctp:26
+msgid "Correlations found"
+msgstr ""
+
+#: View/Users/statistics.ctp:23
+#: View/Users/statistics_data.ctp:28
+msgid "Proposals active"
+msgstr ""
+
+#: View/Users/statistics.ctp:29
+#: View/Users/statistics_data.ctp:40
+msgid "Discussion threads"
+msgstr ""
+
+#: View/Users/statistics.ctp:34
+#: View/Users/statistics_data.ctp:45
+msgid "Discussion posts"
+msgstr ""
+
+#: View/Users/statistics.ctp:43
+#: View/Users/statistics_data.ctp:54
+msgid "A heatmap showing user activity for each day during this month and the 4 months that preceded it. Use the buttons below to only show the heatmap of a specific organisation."
+msgstr ""
+
+#: View/Users/statistics.ctp:60
+#: View/Users/statistics_data.ctp:71
+msgid "Go left"
+msgstr ""
+
+#: View/Users/statistics.ctp:66
+#: View/Users/statistics_data.ctp:77
+msgid "Go right"
+msgstr ""
+
+#: View/Users/statistics.ctp:113
+#: View/Users/statistics_data.ctp:124
+msgid "The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings."
+msgstr ""
+
+#: View/Users/statistics.ctp:117
+#: View/Users/statistics_data.ctp:128
+msgid "The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer."
+msgstr ""
+
+#: View/Users/statistics_attackmatrix.ctp:6
+msgid "A heatmap showing the usage of ATT&CK Tactic."
+msgstr ""
+
+#: View/Users/statistics_data.ctp:32
+msgid "Users with PGP keys"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:36
+msgid "Local Organisations"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:38
+msgid "Average Users / Org"
+msgstr ""
+
+#: View/Users/statistics_orgs.ctp:17
+msgid "Organisation list"
+msgstr ""
+
+#: View/Users/statistics_orgs.ctp:18
+msgid "Quick overview over the organisations residing on or known by this instance."
+msgstr ""
+
+#: View/Users/statistics_orgs.ctp:34
+msgid "Nationality"
+msgstr ""
+
+#: View/Users/statistics_orgs.ctp:36
+msgid "Sector"
+msgstr ""
+
+#: View/Users/statistics_sightings.ctp:6
+msgid "A toplist of the top sources for the sightings of your organisation."
+msgstr ""
+
+#: View/Users/statistics_sightings.ctp:10
+msgid "#Entries"
+msgstr ""
+
+#: View/Users/statistics_sightings.ctp:11
+msgid "#Sighting"
+msgstr ""
+
+#: View/Users/statistics_sightings.ctp:12
+msgid "#False-positive"
+msgstr ""
+
+#: View/Users/statistics_sightings.ctp:13
+msgid "Expiration"
+msgstr ""
+
+#: View/Users/statistics_tags.ctp:11
+msgid "A treemap of the currently used event tags. Click on any of the taxonomies to hide it and click it again to show it."
+msgstr ""
+
+#: View/Users/statistics_users.ctp:6
+msgid "User and Organisation Statistics"
+msgstr ""
+
+#: View/Users/terms.ctp:2
+msgid "MISP Terms and Conditions"
+msgstr ""
+
+#: View/Users/terms.ctp:11
+msgid "Terms and Conditions file not found."
+msgstr ""
+
+#: View/Users/terms.ctp:19
+msgid "Download Terms and Conditions"
+msgstr ""
+
+#: View/Users/terms.ctp:27
+msgid "Accept Terms"
+msgstr ""
+
+#: View/Users/verify_certificate.ctp:2
+msgid "Certificates validation"
+msgstr ""
+
+#: View/Users/verify_g_p_g.ctp:2
+msgid "GnuPG key validation"
+msgstr ""
+
+#: View/Users/ajax/emailConfirmTemplate.ctp:2
+msgid "Confirm sending"
+msgstr ""
+
+#: View/Users/ajax/emailConfirmTemplate.ctp:4
+msgid "You are about to send a mail to %s recipient(s)?"
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:2
+msgid "Choose the key that you would like to use"
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:6
+msgid "Key ID"
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:7
+msgid "Creation date"
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:8
+msgid "Associated E-mail addresses"
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:12
+msgid "Select GnuPG key"
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:3
+msgid "WARNING: This user does not have an encryption key set. The security posture of this instance allows for the sending of clear text e-mails, so this is what will happen if you proceed."
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:8
+msgid "Send welcome message to user"
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:8
+msgid "Initiate password reset for user"
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:9
+msgid "Are you sure you want to reset the password of %s and send him/her a welcome message with the credentials?"
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:9
+msgid "Are you sure you want to reset the password of %s and send him/her the temporary credentials? "
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:22
+msgid "First time registration"
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:27
+msgid "Submit password reset"
+msgstr ""
+
+#: View/Warninglists/index.ctp:2
+msgid "Warninglists"
+msgstr ""
+
+#: View/Warninglists/index.ctp:61
+msgid "Delete Warninglist"
+msgstr ""
+
+#: View/Warninglists/index.ctp:61
+msgid "Delete warninglist"
+msgstr ""
+
+#: View/Warninglists/view.ctp:14;16
+msgid "Accepted attribute types"
+msgstr ""
+
+#: View/Warninglists/ajax/delete_confirmation.ctp:9
+msgid "Warninglist Deletion"
+msgstr ""
+
+#: View/Warninglists/ajax/delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Warninglist #%s<br /> Associated tags will not be removed. You can reload the warninglist at any time by updating your warninglists."
+msgstr ""
+
+#: View/Whitelists/admin_add.ctp:4
+msgid "Add Signature Whitelist"
+msgstr ""
+
+#: View/Whitelists/admin_edit.ctp:4
+msgid "Edit Signature Whitelist"
+msgstr ""
+
+#: View/Whitelists/admin_index.ctp:3
+#: View/Whitelists/index.ctp:3
+msgid "Regex entries (in the standard php regex /{regex}/{modifier} format) entered below will restrict matching attributes from being included in the IDS flag sensitive exports (such as NIDS exports)."
+msgstr ""
+
+#: Model/Attribute.php:validation for field event_id
+#: Model/Event.php:validation for field org_id;validation for field orgc_id;validation for field user_id
+#: Model/Server.php:validation for field org_id;validation for field lastpushedid;validation for field lastpulledid
+#: Model/ShadowAttribute.php:validation for field event_id;validation for field org_id;validation for field event_org_id
+#: Model/User.php:validation for field role_id;validation for field invited_by;validation for field newsread
+msgid "numeric"
+msgstr ""
+
+#: Model/Attribute.php:validation for field type
+#: Model/ShadowAttribute.php:validation for field type
+msgid "Options depend on the selected category."
+msgstr ""
+
+#: Model/Attribute.php:validation for field category
+#: Model/ShadowAttribute.php:validation for field category
+msgid "Options : Payload delivery, Antivirus detection, Payload installation, Files dropped ..."
+msgstr ""
+
+#: Model/Attribute.php:validation for field value
+#: Model/ShadowAttribute.php:validation for field value
+msgid "stringNotEmpty"
+msgstr ""
+
+#: Model/Attribute.php:validation for field value
+#: Model/ShadowAttribute.php:validation for field value
+msgid "Value not in the right type/format. Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:validation for field value
+msgid "A similar attribute already exists for this event."
+msgstr ""
+
+#: Model/Attribute.php:validation for field value
+msgid "Composite type found but the value not in the composite (value1|value2) format."
+msgstr ""
+
+#: Model/Attribute.php:validation for field value
+msgid "maxTextLength"
+msgstr ""
+
+#: Model/Attribute.php:validation for field to_ids
+#: Model/Event.php:validation for field published
+#: Model/Server.php:validation for field push;validation for field pull
+#: Model/ShadowAttribute.php:validation for field to_ids;validation for field proposal_to_delete
+#: Model/User.php:validation for field autoalert;validation for field contactalert;validation for field change_pw;validation for field termsaccepted
+msgid "boolean"
+msgstr ""
+
+#: Model/Attribute.php:validation for field uuid
+#: Model/Event.php:validation for field uuid;validation for field extends_uuid
+#: Model/EventBlacklist.php:validation for field event_uuid
+#: Model/MispObject.php:validation for field uuid
+#: Model/OrgBlacklist.php:validation for field org_uuid
+#: Model/Organisation.php:validation for field uuid
+#: Model/ShadowAttribute.php:validation for field uuid
+#: Model/SharingGroup.php:validation for field uuid
+msgid "Please provide a valid UUID"
+msgstr ""
+
+#: Model/Attribute.php:validation for field uuid
+#: Model/MispObject.php:validation for field uuid
+msgid "The UUID provided is not unique"
+msgstr ""
+
+#: Model/Attribute.php:validation for field distribution
+msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group, Inherit event"
+msgstr ""
+
+#: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
+#: Model/Event.php:validation for field org_id;validation for field orgc_id;validation for field info
+#: Model/EventDelegation.php:validation for field event_id;validation for field org_id
+#: Model/EventTag.php:validation for field event_id;validation for field tag_id
+#: Model/FavouriteTag.php:validation for field user_id;validation for field tag_id
+#: Model/News.php:validation for field message;validation for field title
+#: Model/ObjectRelationship.php:validation for field name
+#: Model/Organisation.php:validation for field name;validation for field uuid
+#: Model/Role.php:validation for field name
+#: Model/ServerTag.php:validation for field server_id;validation for field tag_id
+#: Model/SharingGroup.php:validation for field name
+#: Model/Tag.php:validation for field name;validation for field colour
+#: Model/TagCollection.php:validation for field name
+#: Model/TemplateElementAttribute.php:validation for field name;validation for field description
+#: Model/ThreatLevel.php:validation for field name;validation for field description;validation for field form_description
+#: Model/User.php:validation for field org_id;validation for field authkey
+#: Model/Whitelist.php:validation for field name
+msgid "valueNotEmpty"
+msgstr ""
+
+#: Model/Event.php:validation for field date
+msgid "Expected date format: YYYY-MM-DD"
+msgstr ""
+
+#: Model/Event.php:validation for field threat_level_id
+msgid "Options : 1, 2, 3, 4 (for High, Medium, Low, Undefined)"
+msgstr ""
+
+#: Model/Event.php:validation for field distribution
+msgid "Options : Your organisation only, This community only, Connected communities, All communities"
+msgstr ""
+
+#: Model/Event.php:validation for field sharing_group_id
+msgid "If the distribution is set to \"Sharing Group\", a sharing group has to be selected."
+msgstr ""
+
+#: Model/Event.php:validation for field analysis
+msgid "Options : 0, 1, 2 (for Initial, Ongoing, Completed)"
+msgstr ""
+
+#: Model/EventBlacklist.php:validation for field event_uuid
+msgid "Event already blacklisted."
+msgstr ""
+
+#: Model/EventGraph.php:validation for field network_json
+msgid "The provided eventGraph is not a valid json format"
+msgstr ""
+
+#: Model/Feed.php:validation for field url
+#: Model/Noticelist.php:validation for field name;validation for field version
+#: Model/NoticelistEntry.php:validation for field value
+#: Model/Post.php:validation for field contents
+#: Model/Role.php:validation for field valueNotEmpty
+#: Model/Server.php:validation for field authkey
+#: Model/Taxonomy.php:validation for field namespace;validation for field description;validation for field version
+#: Model/TaxonomyEntry.php:validation for field value;validation for field expanded
+#: Model/TaxonomyPredicate.php:validation for field value;validation for field expanded
+#: Model/Warninglist.php:validation for field name;validation for field description;validation for field version
+#: Model/WarninglistEntry.php:validation for field value
+#: Model/WarninglistType.php:validation for field type
+msgid "rule"
+msgstr ""
+
+#: Model/Feed.php:validation for field event_id
+msgid "Please enter a numeric event ID or leave this field blank."
+msgstr ""
+
+#: Model/Log.php:validation for field action
+msgid "Options : ..."
+msgstr ""
+
+#: Model/ObjectRelationship.php:validation for field name
+msgid "A relationship with this name already exists."
+msgstr ""
+
+#: Model/OrgBlacklist.php:validation for field org_uuid
+msgid "Organisation already blacklisted."
+msgstr ""
+
+#: Model/Organisation.php:validation for field name
+msgid "An organisation with this name already exists."
+msgstr ""
+
+#: Model/Organisation.php:validation for field uuid
+msgid "An organisation with this UUID already exists."
+msgstr ""
+
+#: Model/Regexp.php:validation for field regexp
+msgid "This is not a valid regular expression. Don't forget the delimiters!"
+msgstr ""
+
+#: Model/Role.php:validation for field name
+msgid "A role with this name already exists."
+msgstr ""
+
+#: Model/Server.php:validation for field url
+msgid "Please enter a valid base-url."
+msgstr ""
+
+#: Model/SharingGroup.php:validation for field name
+msgid "A sharing group with this name already exists."
+msgstr ""
+
+#: Model/Sighting.php:validation for field type
+msgid "Invalid type. Valid options are: 0 (Sighting), 1 (False-positive), 2 (Expiration)."
+msgstr ""
+
+#: Model/Tag.php:validation for field name
+msgid "This field is required."
+msgstr ""
+
+#: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
+#: Model/Whitelist.php:validation for field name
+msgid "A similar name already exists."
+msgstr ""
+
+#: Model/Tag.php:validation for field colour
+msgid "Colour has to be in the RGB format (#FFFFFF)"
+msgstr ""
+
+#: Model/TemplateElementAttribute.php:validation for field category
+#: Model/TemplateElementFile.php:validation for field category
+msgid "Please choose a category."
+msgstr ""
+
+#: Model/TemplateElementAttribute.php:validation for field type
+msgid "Please choose a type."
+msgstr ""
+
+#: Model/TemplateElementFile.php:validation for field name
+#: Model/TemplateElementText.php:validation for field name
+msgid "Please enter a Name"
+msgstr ""
+
+#: Model/TemplateElementFile.php:validation for field description
+msgid "Please enter a Description"
+msgstr ""
+
+#: Model/TemplateElementText.php:validation for field text
+msgid "Please fill out the text field"
+msgstr ""
+
+#: Model/User.php:validation for field password
+msgid "Password length requirement not met."
+msgstr ""
+
+#: Model/User.php:validation for field password
+msgid "Password complexity requirement not met."
+msgstr ""
+
+#: Model/User.php:validation for field password
+msgid "Please re-enter your password twice so that the values match."
+msgstr ""
+
+#: Model/User.php:validation for field org_id
+msgid "The organisation ID has to be a numeric value."
+msgstr ""
+
+#: Model/User.php:validation for field email
+msgid "Please enter a valid email address."
+msgstr ""
+
+#: Model/User.php:validation for field email
+msgid "An account with this email address already exists."
+msgstr ""
+
+#: Model/User.php:validation for field authkey
+msgid "A authkey of a minimum length of 40 is required."
+msgstr ""
+
+#: Model/User.php:validation for field gpgkey
+msgid "GnuPG key not valid, please enter a valid key."
+msgstr ""
+
+#: Model/User.php:validation for field certif_public
+msgid "Certificate not valid, please enter a valid certificate (x509)."
+msgstr ""
+
+#: Model/User.php:validation for field nids_sid
+msgid "A SID should be an integer."
+msgstr ""
+
+#: Model/Whitelist.php:validation for field name
+msgid "Name not in the right format. Whitelist entries have to be enclosed by a valid php delimiter (which can be most non-alphanumeric / non-whitespace character). Format: \"/8.8.8.8/\" Please double check the name."
+msgstr ""
+
diff --git a/app/Locale/pt_BR/LC_MESSAGES/default.po b/app/Locale/pt_BR/LC_MESSAGES/default.po
index 442e0f8f5..2f8d23162 100644
--- a/app/Locale/pt_BR/LC_MESSAGES/default.po
+++ b/app/Locale/pt_BR/LC_MESSAGES/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-01-22 21:26\n"
+"PO-Revision-Date: 2019-03-06 02:07\n"
 "Last-Translator: SteveClement <steve@localhost.lu>\n"
 "Language-Team: Portuguese, Brazilian\n"
 "MIME-Version: 1.0\n"
@@ -15,272 +15,285 @@ msgstr ""
 "Language: pt_BR\n"
 
 #: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:149;153;157
+#: Controller/AttributesController.php:125;129;133
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1001;1348;1352;1356;1385;1800;1876;1880;1884;2102;2166;2248;2903;5264;5429;5433;5442
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
 #: Controller/PostsController.php:56
+#: Model/Galaxy.php:292
 msgid "Invalid event"
 msgstr "Evento inválido"
 
-#: Controller/AppController.php:607
+#: Console/Command/ServerShell.php:49
+#: Controller/ServersController.php:632
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+msgstr ""
+
+#: Console/Command/ServerShell.php:51
+msgid "ERROR: %s"
+msgstr ""
+
+#: Controller/AppController.php:383
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr ""
+
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
+msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+msgstr ""
+
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
+msgid "You have to be logged in to do that."
+msgstr ""
+
+#: Controller/AppController.php:627
+msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
+msgstr ""
+
+#: Controller/AppController.php:752
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Pronto. attribute_count gerado a partir do zero para "
 
-#: Controller/AppController.php:726
-#: Controller/AttributesController.php:2668
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
 #: Controller/ShadowAttributesController.php:1276
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "Jobs na fila. Você pode acompanhar o progresso se você navegar no modo de exibição para jobs ativos (administração -> jobs)."
 
-#: Controller/AttributesController.php:140;1392
+#: Controller/AttributesController.php:116;1403
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "Nenhum ID de evento selecionado."
 
-#: Controller/AttributesController.php:143
+#: Controller/AttributesController.php:119
 msgid "You don't have permissions to create attributes"
 msgstr "Você não tem direito de criar atributos"
 
-#: Controller/AttributesController.php:163;489;666
+#: Controller/AttributesController.php:139;488;668
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1684;1705;1739
-#: Controller/ObjectsController.php:442
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
 msgid "You do not have permission to do that."
 msgstr "Você não tem permissão para fazer isso."
 
-#: Controller/AttributesController.php:414;864;869;873;1072;1152;2684;2698;2731;2753;2762;3309;3313;3409;3413
-#: Controller/ShadowAttributesController.php:824;1067;1091;1124;1134
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
 #: Controller/TagsController.php:491
 msgid "Invalid attribute"
 msgstr "Atributo inválido % s"
 
-#: Controller/AttributesController.php:424
-#: Controller/ShadowAttributesController.php:500
+#: Controller/AttributesController.php:421
+#: Controller/ShadowAttributesController.php:499
 msgid "You do not have the permission to view this event."
 msgstr "Você não tem permissão para visualizar este evento."
 
-#: Controller/AttributesController.php:472
+#: Controller/AttributesController.php:468
 msgid "Attribute not an attachment or malware-sample"
 msgstr "Atributo não é um arquivo anexo ou exemplo de malware"
 
-#: Controller/AttributesController.php:504;677
-#: Controller/ShadowAttributesController.php:548
-msgid "PHP says file was not uploaded. Are you attacking me?"
-msgstr "PHP diz que o arquivo não foi carregada. Esta me atacando?"
-
-#: Controller/AttributesController.php:680
-#: Controller/ShadowAttributesController.php:551;561
-msgid "There was a problem to upload the file."
-msgstr "Houve um problema ao carregar o arquivo."
-
-#: Controller/AttributesController.php:824
-msgid "The ThreatConnect data has been imported."
-msgstr "Os dados do ThreatConnect foram importados."
-
-#: Controller/AttributesController.php:827
-msgid "%s entries imported."
-msgstr "%s entradas importadas."
-
-#: Controller/AttributesController.php:831
-msgid "%s entries could not be imported."
-msgstr "%s entradas não puderam ser importadas."
-
-#: Controller/AttributesController.php:881;924;926
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "Atributo inválido."
-
-#: Controller/AttributesController.php:920
-msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
-msgstr "Não foi possível salvar atributo: atributo no pedido não mais recente que a cópia local."
-
-#: Controller/AttributesController.php:936;1401
-#: Controller/EventsController.php:4635;4648;5213;5227
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
 msgid "Invalid Event."
 msgstr "Evento inválido."
 
-#: Controller/AttributesController.php:953
+#: Controller/AttributesController.php:503;679
+#: Controller/ShadowAttributesController.php:546
+msgid "PHP says file was not uploaded. Are you attacking me?"
+msgstr "PHP diz que o arquivo não foi carregada. Esta me atacando?"
+
+#: Controller/AttributesController.php:682
+#: Controller/ShadowAttributesController.php:549;559
+msgid "There was a problem to upload the file."
+msgstr "Houve um problema ao carregar o arquivo."
+
+#: Controller/AttributesController.php:826
+msgid "The ThreatConnect data has been imported."
+msgstr "Os dados do ThreatConnect foram importados."
+
+#: Controller/AttributesController.php:829
+msgid "%s entries imported."
+msgstr "%s entradas importadas."
+
+#: Controller/AttributesController.php:833
+msgid "%s entries could not be imported."
+msgstr "%s entradas não puderam ser importadas."
+
+#: Controller/AttributesController.php:883;931;933
+#: Controller/ShadowAttributesController.php:829
+msgid "Invalid attribute."
+msgstr "Atributo inválido."
+
+#: Controller/AttributesController.php:927
+msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
+msgstr "Não foi possível salvar atributo: atributo no pedido não mais recente que a cópia local."
+
+#: Controller/AttributesController.php:960
 msgid "The attribute has been saved"
 msgstr "A configuração foi salva"
 
-#: Controller/AttributesController.php:985
+#: Controller/AttributesController.php:995
 msgid "The attribute could not be saved. Please, try again."
 msgstr "A solicitação não pode ser finalizada. Por favor, tente novamente."
 
-#: Controller/AttributesController.php:1076
+#: Controller/AttributesController.php:1087
 msgid "Invalid event id."
 msgstr "ID de evento inválido."
 
-#: Controller/AttributesController.php:1106
-#: Controller/EventsController.php:2023
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
+#: Controller/ShadowAttributesController.php:729
 msgid "Invalid input."
 msgstr "Entrada inválida."
 
-#: Controller/AttributesController.php:1111
+#: Controller/AttributesController.php:1122
 msgid "Invalid field."
 msgstr "Campo inválido."
 
-#: Controller/AttributesController.php:1156
+#: Controller/AttributesController.php:1167
 msgid "Invalid attribute id."
 msgstr "ID de configuração inválido."
 
-#: Controller/AttributesController.php:1231;1241
+#: Controller/AttributesController.php:1242;1252
 msgid "Attribute deleted"
 msgstr "Atributo excluído"
 
-#: Controller/AttributesController.php:1236;1238
+#: Controller/AttributesController.php:1247;1249
 msgid "Attribute was not deleted"
 msgstr "Atributo não foi excluído"
 
-#: Controller/AttributesController.php:1263;3155
-#: Controller/ShadowAttributesController.php:864
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
 msgid "Invalid Attribute"
 msgstr "Atributo inválido"
 
-#: Controller/AttributesController.php:1290
+#: Controller/AttributesController.php:1301
 msgid "Could not restore the attribute"
 msgstr "Não foi possível restaurar o atributo"
 
-#: Controller/AttributesController.php:1311;1318;1322
+#: Controller/AttributesController.php:1322;1329;1333
 msgid "Attribute not found or not authorised."
 msgstr "Atributo não encontrado ou não autorizado."
 
-#: Controller/AttributesController.php:1372
+#: Controller/AttributesController.php:1383
 msgid "This function is only accessible via POST requests."
 msgstr "Esta função só é acessível através de solicitações de POST."
 
-#: Controller/AttributesController.php:1427
+#: Controller/AttributesController.php:1438
 msgid "No matching attributes found."
 msgstr ""
 
-#: Controller/AttributesController.php:1461
+#: Controller/AttributesController.php:1472
 msgid "This method can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:1472
+#: Controller/AttributesController.php:1482
 msgid "You are not authorized to edit this event."
 msgstr ""
 
-#: Controller/AttributesController.php:1537
+#: Controller/AttributesController.php:1580
 msgid "No event ID provided."
 msgstr ""
 
-#: Controller/AttributesController.php:1640
-msgid "Invalid tag"
-msgstr "Tag inválida"
-
-#: Controller/AttributesController.php:2107;2282;2391;2441;2524;2610
-#: Controller/EventsController.php:2484;2600;2662;2720;3079;3301;3993;4011
-msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
+msgid "Synonyms: "
 msgstr ""
 
-#: Controller/AttributesController.php:2112;2277;2384
-#: Controller/EventsController.php:3084
+#: Controller/AttributesController.php:1997;2104
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr ""
 
-#: Controller/AttributesController.php:2123
-msgid "Content type and parameter mismatch. Expecting JSON."
-msgstr ""
-
-#: Controller/AttributesController.php:2128
-msgid "Content type and parameter mismatch. Expecting XML."
-msgstr ""
-
-#: Controller/AttributesController.php:2132;2290
+#: Controller/AttributesController.php:2010
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
 msgstr ""
 
-#: Controller/AttributesController.php:2310
+#: Controller/AttributesController.php:2030
 msgid "You don't have access to that event."
 msgstr ""
 
-#: Controller/AttributesController.php:2373
+#: Controller/AttributesController.php:2093
 msgid "No matches."
 msgstr ""
 
-#: Controller/AttributesController.php:2395;2404
+#: Controller/AttributesController.php:2115;2124
 msgid "Invalid attribute or no authorisation to view it."
 msgstr ""
 
-#: Controller/AttributesController.php:2445;2528;2614
-#: Controller/EventsController.php:2488;2605;2667;2724;3305;3997;4015
-msgid "You have to be logged in to do that."
-msgstr ""
-
-#: Controller/AttributesController.php:2472
+#: Controller/AttributesController.php:2192
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
 msgstr ""
 
-#: Controller/AttributesController.php:2536
+#: Controller/AttributesController.php:2256
 msgid "Invalid event ID format."
 msgstr ""
 
-#: Controller/AttributesController.php:2645
+#: Controller/AttributesController.php:2365
 #: Controller/ShadowAttributesController.php:1254
 msgid "All done. "
 msgstr "Pronto. "
 
-#: Controller/AttributesController.php:2677;2724
+#: Controller/AttributesController.php:2397;2444
 #: Controller/ShadowAttributesController.php:1062
 msgid "Invalid field requested."
 msgstr ""
 
-#: Controller/AttributesController.php:2680;2727
+#: Controller/AttributesController.php:2400;2447
 msgid "This function can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:2792;2800
-#: Controller/EventsController.php:3689;3967
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:2821
+#: Controller/AttributesController.php:2541
 msgid "This action can only be accessed via AJAX."
 msgstr ""
 
-#: Controller/AttributesController.php:2830;3081;3095;3106
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
 msgid "You are not authorised to do that."
 msgstr ""
 
-#: Controller/AttributesController.php:2935
-#: Controller/EventsController.php:4431
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
 msgid "This functionality requires API key access."
 msgstr ""
 
-#: Controller/AttributesController.php:2943
+#: Controller/AttributesController.php:2663
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr ""
 
-#: Controller/AttributesController.php:2955
+#: Controller/AttributesController.php:2675
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr ""
 
-#: Controller/AttributesController.php:3116
+#: Controller/AttributesController.php:2836
 msgid "Invalid script."
 msgstr ""
 
-#: Controller/AttributesController.php:3181
+#: Controller/AttributesController.php:2901
 msgid "No valid enrichment options found for this attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:3245
+#: Controller/AttributesController.php:2964
 msgid "Invalid type requested."
 msgstr ""
 
-#: Controller/AttributesController.php:3476
-#: Controller/EventsController.php:5209
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr ""
 
-#: Controller/AttributesController.php:3480;3495
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3243;3258
+#: Controller/ShadowAttributesController.php:677
 msgid "Invalid Attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:3483;3498
-#: Controller/EventsController.php:5216;5230
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
 msgid "You don't have permission to do that."
 msgstr ""
 
@@ -288,254 +301,286 @@ msgstr ""
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "Evento Blacklisting não está habilitado nesta instância."
 
-#: Controller/EventsController.php:804
+#: Controller/EventsController.php:848
 msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
 msgstr "Não há certificado x509 ou chave GnuPG definido no seu perfil. Para receber e-mails, submeta seu certificado público ou chave GnuPG no seu perfil."
 
-#: Controller/EventsController.php:806
+#: Controller/EventsController.php:850
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "Nenhuma chave GnuPG definida no seu perfil. Para receber e-mails, submeta sua chave pública no seu perfil."
 
-#: Controller/EventsController.php:812
+#: Controller/EventsController.php:856
 msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
 msgstr "Não há certificado x509 ou chave GnuPG definido no seu perfil. Para receber atributos em e-mails, submeta seu certificado público ou chave GnuPG no seu perfil."
 
-#: Controller/EventsController.php:814
+#: Controller/EventsController.php:858
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr "Nenhuma chave GnuPG definida no seu perfil. Para receber atributos em e-mails, submeta sua chave pública no seu perfil."
 
-#: Controller/EventsController.php:1527
+#: Controller/EventsController.php:1559
+msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
+msgstr ""
+
+#: Controller/EventsController.php:1769
 msgid "You don't have permissions to create events"
 msgstr ""
 
-#: Controller/EventsController.php:1533
+#: Controller/EventsController.php:1775
 msgid "No valid event data received."
 msgstr ""
 
-#: Controller/EventsController.php:1569
+#: Controller/EventsController.php:1811
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr ""
 
-#: Controller/EventsController.php:1573;1577
+#: Controller/EventsController.php:1815;1819
 msgid "Invalid Sharing Group or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:1601
+#: Controller/EventsController.php:1843
 msgid "Event blocked by local blacklist."
 msgstr ""
 
-#: Controller/EventsController.php:1614;1693;1955
+#: Controller/EventsController.php:1856;1933;2197
 msgid "The event has been saved"
 msgstr "O evento foi criado"
 
-#: Controller/EventsController.php:1622
+#: Controller/EventsController.php:1864
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr ""
 
-#: Controller/EventsController.php:1633
+#: Controller/EventsController.php:1870
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr ""
 
-#: Controller/EventsController.php:1635;1958
+#: Controller/EventsController.php:1872;2200
 msgid "The event could not be saved. Please, try again."
 msgstr "A solicitação não pode ser finalizada. Por favor, tente novamente."
 
-#: Controller/EventsController.php:1719
+#: Controller/EventsController.php:1912
+msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
+msgstr ""
+
+#: Controller/EventsController.php:1959
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "Você só pode carregar arquivos MISP XML ou JSON MISP."
 
-#: Controller/EventsController.php:1720
+#: Controller/EventsController.php:1960
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr ""
 
-#: Controller/EventsController.php:1768
+#: Controller/EventsController.php:2009
 msgid "STIX document imported, event's created: "
 msgstr "Documento STIX importado, eventos criados: "
 
-#: Controller/EventsController.php:1771
+#: Controller/EventsController.php:2012
 msgid "STIX document imported."
 msgstr "Documento STIX importado."
 
-#: Controller/EventsController.php:1774
+#: Controller/EventsController.php:2015
 msgid "Could not import STIX document: "
 msgstr "Não foi possível importar o documento STIX: "
 
-#: Controller/EventsController.php:1781
+#: Controller/EventsController.php:2022
 msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
 msgstr "Upload do arquivo falhou. Tenha certeza que você selecionou um arquivo stix para upload e que o arquivo não exceda o tamanho máximo de "
 
-#: Controller/EventsController.php:1805;1890
+#: Controller/EventsController.php:2046;2131
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "Você não está autorizado a fazer isso. Por favor, considere usar o recurso 'sugerir um atributo'."
 
-#: Controller/EventsController.php:1813
+#: Controller/EventsController.php:2054
 msgid "Invalid event ID entered."
 msgstr "ID de evento enviado inválido."
 
-#: Controller/EventsController.php:1818
+#: Controller/EventsController.php:2059
 msgid "You are not authorised to read the selected event."
 msgstr "Você não está autorizado a ler o evento selecionado."
 
-#: Controller/EventsController.php:2109;2172
+#: Controller/EventsController.php:2349;2387;2450
 msgid "You don't have the permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:2259
+#: Controller/EventsController.php:2358
+msgid "Event unpublished."
+msgstr ""
+
+#: Controller/EventsController.php:2537
 msgid "Email sent to the reporter."
 msgstr "E-mail enviado para o responsável."
 
-#: Controller/EventsController.php:2261
+#: Controller/EventsController.php:2539
 msgid "Sending of email failed"
 msgstr "Falha ao enviar email"
 
-#: Controller/EventsController.php:2397
+#: Controller/EventsController.php:2678
 msgid "This feature is currently disabled"
 msgstr ""
 
-#: Controller/EventsController.php:2439;4025
+#: Controller/EventsController.php:2720;3986
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
 msgstr ""
 
-#: Controller/EventsController.php:2475
+#: Controller/EventsController.php:2756
 msgid "Invalid Event ID."
 msgstr ""
 
-#: Controller/EventsController.php:2522
+#: Controller/EventsController.php:2803
 msgid "No events found that match the passed parameters."
 msgstr ""
 
-#: Controller/EventsController.php:2547
+#: Controller/EventsController.php:2828
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
 msgstr ""
 
-#: Controller/EventsController.php:2622;2684
+#: Controller/EventsController.php:2903
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
 msgstr ""
 
-#: Controller/EventsController.php:2641
-#: Model/Attribute.php:1927
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
 msgid "Invalid hash type."
 msgstr ""
 
-#: Controller/EventsController.php:2871
+#: Controller/EventsController.php:3025
 msgid "Filename not allowed."
 msgstr ""
 
-#: Controller/EventsController.php:2892
+#: Controller/EventsController.php:3045
 msgid "Problem with writing the ioc file. Please report to administrator."
 msgstr "Problema com a criação do arquivo ioc. Por favor reporte ao administrador."
 
-#: Controller/EventsController.php:2986
+#: Controller/EventsController.php:3139
 msgid "This is not a valid MISP XML file."
 msgstr ""
 
-#: Controller/EventsController.php:3101
-msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type)."
-msgstr ""
-
-#: Controller/EventsController.php:3294
+#: Controller/EventsController.php:3291
 msgid "Not yet implemented"
 msgstr ""
 
-#: Controller/EventsController.php:3312;3316
+#: Controller/EventsController.php:3309;3313
 msgid "Invalid event or not authorised."
 msgstr "Evento inválido ou não autorizado."
 
-#: Controller/EventsController.php:3336;3406
+#: Controller/EventsController.php:3333;3403
 msgid "You don't have the privileges to access this."
 msgstr ""
 
-#: Controller/EventsController.php:3920
-msgid "Could not add tags."
+#: Controller/EventsController.php:3610
+#: Controller/TagCollectionsController.php:307
+msgid "Invalid Tag."
 msgstr ""
 
-#: Controller/EventsController.php:3971;5055
-#: Controller/ObjectsController.php:46;140;144;438
+#: Controller/EventsController.php:3626
+#: Controller/TagCollectionsController.php:323
+msgid "Tag is already attached to this event."
+msgstr ""
+
+#: Controller/EventsController.php:3637;3643
+#: Controller/TagCollectionsController.php:330
+msgid "Tag(s) added."
+msgstr ""
+
+#: Controller/EventsController.php:3639
+msgid "Tag could not be added."
+msgstr ""
+
+#: Controller/EventsController.php:3645
+#: Controller/TagCollectionsController.php:338
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
 msgid "Invalid event."
 msgstr ""
 
-#: Controller/EventsController.php:4085;4115;4131
+#: Controller/EventsController.php:3918
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
+msgstr ""
+
+#: Controller/EventsController.php:4049;4079;4095
 msgid "You do not have the permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:4196;4334
+#: Controller/EventsController.php:4160;4300
 msgid "Invalid ID"
 msgstr ""
 
-#: Controller/EventsController.php:4200;4338
+#: Controller/EventsController.php:4164;4304
 msgid "Event not found or you are not authorised to view it."
 msgstr ""
 
-#: Controller/EventsController.php:4434;4441
+#: Controller/EventsController.php:4405;4412
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4470
+#: Controller/EventsController.php:4441
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4478
+#: Controller/EventsController.php:4449
 msgid "Event not found"
 msgstr ""
 
-#: Controller/EventsController.php:4501
+#: Controller/EventsController.php:4472
 msgid "Event not found."
 msgstr ""
 
-#: Controller/EventsController.php:4511
+#: Controller/EventsController.php:4482
 msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
 msgstr ""
 
-#: Controller/EventsController.php:4536
+#: Controller/EventsController.php:4507
 msgid "The creation of a new event with the supplied information has failed."
 msgstr ""
 
-#: Controller/EventsController.php:4671;4693;4722;4747;4772;4802;4823
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
 msgid "Invalid type."
 msgstr ""
 
-#: Controller/EventsController.php:4866
+#: Controller/EventsController.php:4906
 msgid "Invalid method."
 msgstr ""
 
-#: Controller/EventsController.php:4946
+#: Controller/EventsController.php:4989
 msgid "%s services are not enabled."
 msgstr ""
 
-#: Controller/EventsController.php:4950
+#: Controller/EventsController.php:4993
 msgid "Attribute not found or you are not authorised to see it."
 msgstr ""
 
-#: Controller/EventsController.php:4956
+#: Controller/EventsController.php:4999
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4973
+#: Controller/EventsController.php:5016
 msgid "no valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4995
+#: Controller/EventsController.php:5038
 msgid "%s service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5007
+#: Controller/EventsController.php:5050
 msgid ": Enriched via the %s"
 msgstr ""
 
-#: Controller/EventsController.php:5136
+#: Controller/EventsController.php:5184
 msgid "Import service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5303
+#: Controller/EventsController.php:5351
 msgid "Invalid ID."
 msgstr ""
 
-#: Controller/EventsController.php:5351
-#: Controller/ShadowAttributesController.php:312;317;534
+#: Controller/EventsController.php:5399
+#: Controller/ShadowAttributesController.php:311;316;532
 msgid "Invalid Event"
 msgstr ""
 
-#: Controller/EventsController.php:5369
+#: Controller/EventsController.php:5420
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "Tarefa de enriquecimento está na fila para processamento em background. Volte mais tarde para ver os resultados."
 
@@ -543,122 +588,138 @@ msgstr "Tarefa de enriquecimento está na fila para processamento em background.
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:193;291
+#: Controller/FeedsController.php:205;303
 msgid "Feed added."
 msgstr "Feed adicionado."
 
-#: Controller/FeedsController.php:201
+#: Controller/FeedsController.php:213
 msgid "Feed could not be added. Invalid field: %s"
 msgstr "Feed não pode ser adicionado. Campo inválido: %s"
 
-#: Controller/FeedsController.php:226;326;348;470;502;682
+#: Controller/FeedsController.php:238;338;360;482;517;721
 msgid "Invalid feed."
 msgstr ""
 
-#: Controller/FeedsController.php:299
+#: Controller/FeedsController.php:311
 msgid "Feed could not be updated. Invalid fields: %s"
 msgstr "O feed não pode ser atualizado. Campos inválidos: %s"
 
-#: Controller/FeedsController.php:322
+#: Controller/FeedsController.php:334
 msgid "This action requires a post request."
 msgstr ""
 
-#: Controller/FeedsController.php:355;474
+#: Controller/FeedsController.php:367;486
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr ""
 
-#: Controller/FeedsController.php:368;434
+#: Controller/FeedsController.php:380;446
 msgid "Starting fetch from Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:379
+#: Controller/FeedsController.php:391
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:384;386
+#: Controller/FeedsController.php:396;398
 msgid "Fetching the feed has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:390
+#: Controller/FeedsController.php:402
 msgid "Fetching the feed has successfuly completed."
 msgstr ""
 
-#: Controller/FeedsController.php:451
+#: Controller/FeedsController.php:463
 msgid "Fetching the feed has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:481
+#: Controller/FeedsController.php:493
 msgid "Event added."
 msgstr ""
 
-#: Controller/FeedsController.php:484
+#: Controller/FeedsController.php:496
 msgid "Event already up to date."
 msgstr ""
 
-#: Controller/FeedsController.php:486
+#: Controller/FeedsController.php:498
 msgid "Event updated."
 msgstr ""
 
-#: Controller/FeedsController.php:490
+#: Controller/FeedsController.php:502
 msgid "Could not %s event."
 msgstr ""
 
-#: Controller/FeedsController.php:493
+#: Controller/FeedsController.php:505
 msgid "Download failed."
 msgstr ""
 
-#: Controller/FeedsController.php:561
+#: Controller/FeedsController.php:597
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr ""
 
-#: Controller/FeedsController.php:600;651
+#: Controller/FeedsController.php:636;687
 msgid "Invalid feed type."
 msgstr ""
 
-#: Controller/FeedsController.php:714
+#: Controller/FeedsController.php:753
 msgid "This event is blocked by the Feed filters."
 msgstr ""
 
-#: Controller/FeedsController.php:716
+#: Controller/FeedsController.php:755
 msgid "Could not download the selected Event"
 msgstr ""
 
-#: Controller/FeedsController.php:752;756
+#: Controller/FeedsController.php:791;795
 msgid "Invalid Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:777
+#: Controller/FeedsController.php:816
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: Controller/FeedsController.php:781
+#: Controller/FeedsController.php:820
 msgid "Feed not found."
 msgstr ""
 
-#: Controller/FeedsController.php:790
+#: Controller/FeedsController.php:829
 msgid "Data pulled."
 msgstr ""
 
-#: Controller/FeedsController.php:792
+#: Controller/FeedsController.php:831
 msgid "Could not pull the selected data. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:809
+#: Controller/FeedsController.php:848
 msgid "Starting feed caching."
 msgstr ""
 
-#: Controller/FeedsController.php:824
+#: Controller/FeedsController.php:863
 msgid "Caching the feeds has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:827
+#: Controller/FeedsController.php:866
 msgid "Caching the feeds has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:858
+#: Controller/FeedsController.php:900
 msgid "Invalid feed list received."
 msgstr ""
 
+#: Controller/GalaxiesController.php:92
+msgid "All clusters"
+msgstr ""
+
+#: Controller/GalaxiesController.php:135
+msgid "All namespaces"
+msgstr ""
+
+#: Controller/GalaxiesController.php:250
+msgid "Failed to parse request."
+msgstr ""
+
+#: Controller/GalaxiesController.php:253
+msgid "No clusters picked."
+msgstr ""
+
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr "Todos os jobs concluídos foram removidos"
@@ -671,11 +732,23 @@ msgstr "Todos os jobs foram removidos"
 msgid "Invalid object"
 msgstr "Objeto inválido"
 
-#: Controller/ObjectReferencesController.php:187
+#: Controller/ObjectReferencesController.php:188
 msgid "Invalid object reference"
 msgstr "Referência de objeto inválida"
 
-#: Controller/ObjectTemplatesController.php:88
+#: Controller/ObjectTemplatesController.php:31
+msgid "All Objects"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:99
+msgid "Invalid object template"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:103
+msgid "Invalid object template id."
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
 msgstr "ObjectTemplate apagado"
 
@@ -696,23 +769,23 @@ msgstr ""
 msgid "Invalid template."
 msgstr "Modelo inválido."
 
-#: Controller/ObjectsController.php:303
+#: Controller/ObjectsController.php:311
 msgid "You don't have permissions to edit objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:317;328;427
+#: Controller/ObjectsController.php:325;336;439
 msgid "Invalid object."
 msgstr ""
 
-#: Controller/ObjectsController.php:421
+#: Controller/ObjectsController.php:433
 msgid "You don't have permissions to delete objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:531;538;542
+#: Controller/ObjectsController.php:543;550;554
 msgid "Object not found or not authorised."
 msgstr ""
 
-#: Controller/ObjectsController.php:799
+#: Controller/ObjectsController.php:811
 msgid "%s objects successfully reconstructed."
 msgstr "%s objetos reconstruídos com êxito."
 
@@ -776,123 +849,147 @@ msgstr "A função não pode ser salva. Por favor, tente novamente."
 msgid "Role deleted"
 msgstr "Função deletada"
 
-#: Controller/ServersController.php:204;394
+#: Controller/ServersController.php:226;417
 msgid "The pull filter rules must be in valid JSON format."
 msgstr "As regras de filtragem de extração devem estar em um formato JSON válido."
 
-#: Controller/ServersController.php:214;404
+#: Controller/ServersController.php:236;427
 msgid "The push filter rules must be in valid JSON format."
 msgstr "As regras de filtragem devem estar no formato JSON válido."
 
-#: Controller/ServersController.php:268;434
+#: Controller/ServersController.php:291;457
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr "Esta organização não pôde ser criada pois o uuid já está em uso."
 
-#: Controller/ServersController.php:280
+#: Controller/ServersController.php:303
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format? Also, make sure the organisation's name doesn't clash with an existing one."
 msgstr "Não foi possível salvar a nova organização, tem certeza que o uuid está no formato correto? Certifique-se também de que o nome da organização não esteja em conflito com outra já existente."
 
-#: Controller/ServersController.php:309;490
+#: Controller/ServersController.php:332;513
 msgid "The server has been saved"
 msgstr "O servidor foi salvo"
 
-#: Controller/ServersController.php:316;497
+#: Controller/ServersController.php:339;520
 msgid "The server could not be saved. Please, try again."
 msgstr "O servidor não pode ser salvo. Por favor, tente novamente."
 
-#: Controller/ServersController.php:369;565;590;598;659;1412
+#: Controller/ServersController.php:392;589;614;623;683;1360
 msgid "Invalid server"
 msgstr "Servidor inválido"
 
-#: Controller/ServersController.php:451
+#: Controller/ServersController.php:474
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr "Não foi possível salvar a nova organização, tem certeza que o uuid está no formato correto?."
 
-#: Controller/ServersController.php:572
+#: Controller/ServersController.php:596
 msgid "Server deleted"
 msgstr "Servidor excluído"
 
-#: Controller/ServersController.php:575
+#: Controller/ServersController.php:599
 msgid "Server was not deleted"
 msgstr "Servidor não foi excluído"
 
-#: Controller/ServersController.php:602
+#: Controller/ServersController.php:626
 msgid "Pull setting not enabled for this server."
 msgstr "A opção de carregar a configuração não está habilitada para este servidor."
 
-#: Controller/ServersController.php:611
-msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
-msgstr "Não autorizado. Isto aconteceu devido a uma chave de autenticação inválida, ou ao usuário de sincronização não ter permissões de autenticação habilitadas no servidor remoto. Outra razão pode ser um configuração incorreta no servidor de sincronização."
+#: Controller/ServersController.php:659
+msgid "Pull queued for background execution. Job ID: %s"
+msgstr ""
 
-#: Controller/ServersController.php:1309
+#: Controller/ServersController.php:696
+msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
+msgstr ""
+
+#: Controller/ServersController.php:709
+msgid "Push complete. %s events pushed, %s events could not be pushed."
+msgstr ""
+
+#: Controller/ServersController.php:734
+msgid "Push queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:1257
 msgid "File not found."
 msgstr "Arquivo não encontrado."
 
-#: Controller/ServersController.php:1315
+#: Controller/ServersController.php:1263
 msgid "File could not be deleted."
 msgstr "O arquivo não pôde ser excluído."
 
-#: Controller/ServersController.php:1338;1354
+#: Controller/ServersController.php:1286;1302
 msgid "Upload failed."
 msgstr "Falha no upload."
 
-#: Controller/ServersController.php:1346
+#: Controller/ServersController.php:1294
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr "Arquivo já existe. Se você quer substituí-lo, remova o antigo primeiro."
 
-#: Controller/ShadowAttributesController.php:212
+#: Controller/ServersController.php:1748
+msgid "Starting server caching."
+msgstr ""
+
+#: Controller/ServersController.php:1763
+msgid "Caching the servers has failed."
+msgstr ""
+
+#: Controller/ServersController.php:1766
+msgid "Caching the servers has successfully completed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:211
 msgid "Moving of the file that this attachment references failed."
 msgstr "Mover o arquivo que faz referência a este anexo falhou."
 
-#: Controller/ShadowAttributesController.php:280
+#: Controller/ShadowAttributesController.php:279
 msgid "Could not discard proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:341
+#: Controller/ShadowAttributesController.php:340
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr "O atributo não foi adicionado: anexos são adicionados pelo botão \"Adicionar anexo\""
 
-#: Controller/ShadowAttributesController.php:389;392;401
+#: Controller/ShadowAttributesController.php:388;391;400
 msgid "The lines"
 msgstr "As linhas"
 
-#: Controller/ShadowAttributesController.php:441
+#: Controller/ShadowAttributesController.php:440
 msgid "The proposal has been saved"
 msgstr "A proposta foi atualizada"
 
-#: Controller/ShadowAttributesController.php:453;763
+#: Controller/ShadowAttributesController.php:452;761
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:455
+#: Controller/ShadowAttributesController.php:454
 msgid "The proposal could not be saved. Please, try again."
 msgstr "A proposta não pode ser salva. Por favor, tente novamente."
 
-#: Controller/ShadowAttributesController.php:492
+#: Controller/ShadowAttributesController.php:491
 msgid "Invalid Proposal"
 msgstr "Proposta inválida"
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:521
 msgid "Proposal not an attachment or malware-sample"
 msgstr "A proposta não é um anexo ou amostra de malware"
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:617
 msgid "The attachment has been uploaded"
 msgstr "O anexo foi salvo"
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:619
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr "O anexo foi carregado, mas algumas das propostas não puderam ser criadas. As propostas que falharam são: "
 
-#: Controller/ShadowAttributesController.php:624
+#: Controller/ShadowAttributesController.php:622
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr "O anexo não pôde ser salvo, por favor contacte o administrador."
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:752
 msgid "The proposed Attribute has been saved"
 msgstr "O atributo proposto foi salvo"
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:763
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr "O ShadowAttribute não pôde ser salvo. Por favor, tente novamente."
 
@@ -924,6 +1021,86 @@ msgstr "Grupo de compartilhamento removido"
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr "O grupo de compartilhamento não pôde ser removido. Certifique-se de que não existem eventos, atributos ou threads pertencentes a este grupo."
 
+#: Controller/SightingsController.php:86
+msgid "Could not add the Sighting. Reason: "
+msgstr ""
+
+#: Controller/SightingsController.php:96;99
+msgid "Sighting added"
+msgstr ""
+
+#: Controller/SightingsController.php:152
+msgid "You are not authorised to remove sightings data as you don't have permission to modify your organisation's data."
+msgstr ""
+
+#: Controller/SightingsController.php:158
+msgid "Attribute not found"
+msgstr ""
+
+#: Controller/SightingsController.php:176
+msgid "Invalid request."
+msgstr ""
+
+#: Controller/SightingsController.php:185
+msgid "Sighting added."
+msgstr ""
+
+#: Controller/SightingsController.php:187
+msgid "Sighting could not be added"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:56;177
+msgid "The tag collection has been saved"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:64;185
+msgid "The tag collection could not be added. Reason: "
+msgstr ""
+
+#: Controller/TagCollectionsController.php:85
+msgid "%s new tag collections added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:154
+msgid "Invalid Tag Collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:161
+msgid "You don't have editing rights on this Tag Collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:201;380
+msgid "Invalid tag collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:207
+msgid "Tag collection deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:215
+msgid "Tag collection could not be deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:224
+msgid "You are not allowed to delete that."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:332
+msgid "Tag(s) could not be added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:384
+msgid "Insufficient privileges to remove the tag from the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:395
+msgid "Invalid tag or tag not associated with the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:399
+msgid "Failed to remove tag from the collection."
+msgstr ""
+
 #: Controller/TagsController.php:367
 msgid "Tag deleted"
 msgstr "Tag deletada"
@@ -932,6 +1109,27 @@ msgstr "Tag deletada"
 msgid "Tag was not deleted"
 msgstr "Tag não foi deletada"
 
+#: Controller/TagsController.php:580
+msgid "Favourite Tags"
+msgstr ""
+
+#: Controller/TagsController.php:586
+msgid "Tag Collections"
+msgstr ""
+
+#: Controller/TagsController.php:591
+msgid "All Tags"
+msgstr ""
+
+#: Controller/TagsController.php:601
+#: View/Taxonomies/view.ctp:2
+msgid "Taxonomy Library"
+msgstr ""
+
+#: Controller/TagsController.php:756
+msgid "Includes: "
+msgstr ""
+
 #: Controller/TemplatesController.php:408
 msgid "Event populated, "
 msgstr "Evento preenchido, "
@@ -940,15 +1138,15 @@ msgstr "Evento preenchido, "
 msgid "Event populated, but "
 msgstr "Evento preenchido, mas "
 
-#: Controller/UsersController.php:42;221
+#: Controller/UsersController.php:42;247
 msgid "Invalid user or not authorised."
 msgstr "Usuário inválido ou não autorizado."
 
-#: Controller/UsersController.php:54;430;657;907
+#: Controller/UsersController.php:54;456;683;929
 msgid "Invalid user"
 msgstr "Usuário inválido"
 
-#: Controller/UsersController.php:119;564;728
+#: Controller/UsersController.php:119;590;754
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr "Domínio de e-mail inválido. Seu usuário é restrito para criar usuário(s) para o(s) seguinte(s) domínio(s): "
 
@@ -960,59 +1158,75 @@ msgstr "O perfil foi atualizado"
 msgid "The profile could not be updated. Please, try again."
 msgstr "O perfil não foi atualizado. Por favor, tente novamente."
 
-#: Controller/UsersController.php:198
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
 msgid "Password Changed."
 msgstr "Senha alterada."
 
-#: Controller/UsersController.php:203
+#: Controller/UsersController.php:222
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr "A senha não foi atualizada. Verifique os requerimentos de tamanho mínimo de senha / complexidade."
 
-#: Controller/UsersController.php:575
+#: Controller/UsersController.php:601
 msgid "The user could not be saved. Invalid organisation."
 msgstr "O usuário não foi salvo. Organização inválida."
 
-#: Controller/UsersController.php:597
+#: Controller/UsersController.php:623
 msgid "The user has been saved."
 msgstr "O usuário foi salvo."
 
-#: Controller/UsersController.php:606;843
+#: Controller/UsersController.php:632;865
 msgid "The user could not be saved. Please, try again."
 msgstr "O usuário não pôde ser salvo. Por favor, tente novamente."
 
-#: Controller/UsersController.php:835
+#: Controller/UsersController.php:857
 msgid "The user has been saved"
 msgstr "O usuário foi salvo"
 
-#: Controller/UsersController.php:915
+#: Controller/UsersController.php:937
 msgid "User deleted"
 msgstr "Usuário deletado"
 
-#: Controller/UsersController.php:919
+#: Controller/UsersController.php:941
 msgid "User was not deleted"
 msgstr "O usuário não foi excluído"
 
-#: Controller/UsersController.php:997
+#: Controller/UsersController.php:1019
 msgid "Invalid username or password, try again"
 msgstr "Nome de usuário ou senha inválidos, tente novamente"
 
-#: Controller/UsersController.php:1080
+#: Controller/UsersController.php:1106
 msgid "Good-Bye"
 msgstr "Até mais"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1147
 msgid "New authkey generated."
 msgstr "Nova chave auth gerada."
 
-#: Controller/UsersController.php:1230
+#: Controller/UsersController.php:1256
 msgid "You accepted the Terms and Conditions."
 msgstr "Você aceitou os termos e condições de serviços."
 
-#: Controller/UsersController.php:1419
+#: Controller/UsersController.php:1438
+msgid "Recipient email not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1443
+msgid "Recipient organisation not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1480
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr "E-mails enviados, mas não foi possível entregar as mensagens para os seguintes destinatários: "
 
-#: Controller/UsersController.php:1421
+#: Controller/UsersController.php:1482
 msgid "E-mails sent."
 msgstr "E-mails enviados."
 
@@ -1040,972 +1254,1040 @@ msgstr "%s removido"
 msgid "%s was not deleted"
 msgstr "%s não foi removido"
 
-#: Controller/Component/BlackListComponent.php:72
+#: Controller/Component/BlackListComponent.php:75
 msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
 msgstr "Feito. Adicionadas %d novas entradas à blacklist. %d entradas não puderam ser salvas."
 
-#: Controller/Component/BlackListComponent.php:123
+#: Controller/Component/BlackListComponent.php:126
 msgid "Blacklist item added."
 msgstr "Item adicionado à blacklist."
 
-#: Controller/Component/BlackListComponent.php:152
+#: Controller/Component/BlackListComponent.php:155
 msgid "Invalid blacklist entry"
 msgstr "Entrada inválida na blacklist"
 
-#: Controller/Component/BlackListComponent.php:156
+#: Controller/Component/BlackListComponent.php:159
 msgid "Blacklist entry removed"
 msgstr "Entrada removida da blacklist"
 
-#: Controller/Component/BlackListComponent.php:158
+#: Controller/Component/BlackListComponent.php:161
 msgid "Could not remove the blacklist entry"
 msgstr "Não foi possível remover a entrada da blacklist"
 
-#: Model/Attribute.php:567
+#: Model/Attribute.php:591
 msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/Attribute.php:677
+#: Model/Attribute.php:703
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Attribute.php:802
+#: Model/Attribute.php:828
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Attribute.php:921
+#: Model/Attribute.php:953
 msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:928
+#: Model/Attribute.php:960
 msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:935
+#: Model/Attribute.php:967
 msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:946
+#: Model/Attribute.php:978
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:957
+#: Model/Attribute.php:989
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:972
+#: Model/Attribute.php:996
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:1011
 msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:990
+#: Model/Attribute.php:1029
 msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:995
+#: Model/Attribute.php:1034
 msgid "Invalid composite type. The format has to be %s."
 msgstr ""
 
-#: Model/Attribute.php:1006
+#: Model/Attribute.php:1045
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr ""
 
-#: Model/Attribute.php:1014
+#: Model/Attribute.php:1053
 msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1025
+#: Model/Attribute.php:1064
 msgid "Invalid CIDR notation value found."
 msgstr ""
 
-#: Model/Attribute.php:1032;1083
+#: Model/Attribute.php:1071;1122
 msgid "IP address has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1037
+#: Model/Attribute.php:1076
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr ""
 
-#: Model/Attribute.php:1066
+#: Model/Attribute.php:1105
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1086
+#: Model/Attribute.php:1125
 msgid "Domain name has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1099
+#: Model/Attribute.php:1138
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1107
+#: Model/Attribute.php:1146
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr ""
 
-#: Model/Attribute.php:1118
+#: Model/Attribute.php:1157
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr ""
 
-#: Model/Attribute.php:1230
+#: Model/Attribute.php:1272
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr ""
 
-#: Model/Attribute.php:1236
+#: Model/Attribute.php:1278
 msgid "The value has to be a number greater or equal 0."
 msgstr ""
 
-#: Model/Attribute.php:1243
+#: Model/Attribute.php:1285
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:1923;1991
+#: Model/Attribute.php:1968;2036
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2527
+#: Model/Attribute.php:2616
 msgid "This field is mandatory."
 msgstr ""
 
-#: Model/Attribute.php:2885
+#: Model/Attribute.php:3069
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
-#: Model/Event.php:4532
+#: Model/Event.php:5392
 msgid "Issues while loading the stix file. "
 msgstr "Problemas ao carregar o arquivo stix. "
 
-#: Model/Event.php:4534
+#: Model/Event.php:5394
 msgid "Issues with the maec library. "
 msgstr "Problemas com a biblioteca maec. "
 
-#: Model/Event.php:4536
+#: Model/Event.php:5396
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr "Problemas ao executar o script ou entrada inválida. "
 
-#: Model/Event.php:4539
+#: Model/Event.php:5399
 msgid "Please ask your administrator to "
 msgstr "Por favor, contate o administrador para "
 
-#: Model/Event.php:4541
+#: Model/Event.php:5401
 msgid "Please "
 msgstr "Por favor "
 
-#: Model/Event.php:4543
+#: Model/Event.php:5403
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr "verifique se as dependências para STIX estão válidas via ferramenta de diagnóstico."
 
-#: Model/Event.php:4575
+#: Model/Event.php:5435
 msgid "#"
 msgstr "#"
 
-#: Model/Event.php:4584
+#: Model/Event.php:5444
 msgid "%s not set"
 msgstr "%s não definido"
 
-#: Model/Server.php:114
+#: Model/Event.php:5667
+msgid "Could not add tags."
+msgstr ""
+
+#: Model/Galaxy.php:219;276;286;300
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
 msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
 msgstr ""
 
-#: Model/Server.php:115
+#: Model/Server.php:122
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:125
+#: Model/Server.php:132
 msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
 msgstr ""
 
-#: Model/Server.php:126
+#: Model/Server.php:133
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:135
+#: Model/Server.php:142
 msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
 msgstr ""
 
-#: Model/Server.php:137
+#: Model/Server.php:144
 msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
 msgstr ""
 
-#: Model/Server.php:143
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:151
+#: Model/Server.php:166
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:161
+#: Model/Server.php:176
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr ""
 
-#: Model/Server.php:170
+#: Model/Server.php:185
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:195
 msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
 msgstr ""
 
-#: Model/Server.php:179
+#: Model/Server.php:204
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:187
+#: Model/Server.php:212
 msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
 msgstr ""
 
-#: Model/Server.php:196
+#: Model/Server.php:221
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:198
+#: Model/Server.php:223
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:204;212;230;254;262;270;278;335;383;391;457
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
 msgid "This setting is deprecated and can be safely removed."
 msgstr ""
 
-#: Model/Server.php:220
+#: Model/Server.php:245
 msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
 msgstr ""
 
-#: Model/Server.php:238
+#: Model/Server.php:263
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:246
+#: Model/Server.php:271
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:286
+#: Model/Server.php:311
 msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:294
+#: Model/Server.php:319
 msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:302
+#: Model/Server.php:327
 msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:310
+#: Model/Server.php:335
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:318
+#: Model/Server.php:343
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:327
+#: Model/Server.php:352
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:329
+#: Model/Server.php:354
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:343
+#: Model/Server.php:368
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:351
+#: Model/Server.php:376
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:359
+#: Model/Server.php:384
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:367
+#: Model/Server.php:392
 msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
 msgstr ""
 
-#: Model/Server.php:375
+#: Model/Server.php:400
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:399
+#: Model/Server.php:424
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:407
+#: Model/Server.php:432
 msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
 msgstr ""
 
-#: Model/Server.php:416
+#: Model/Server.php:441
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:424
+#: Model/Server.php:449
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:432
+#: Model/Server.php:457
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:440
+#: Model/Server.php:465
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr ""
 
-#: Model/Server.php:449
+#: Model/Server.php:474
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:465
+#: Model/Server.php:490
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:473
+#: Model/Server.php:498
 msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
 msgstr ""
 
-#: Model/Server.php:481
+#: Model/Server.php:506
 msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
 msgstr ""
 
-#: Model/Server.php:489
+#: Model/Server.php:514
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:498
+#: Model/Server.php:523
 msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
 msgstr ""
 
-#: Model/Server.php:507
+#: Model/Server.php:532
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:516
+#: Model/Server.php:541
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:550
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:524
+#: Model/Server.php:558
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:533
+#: Model/Server.php:567
 msgid "Used on the login page, before the MISP logo"
 msgstr ""
 
-#: Model/Server.php:541
+#: Model/Server.php:575
 msgid "Used on the login page, after the MISP logo"
 msgstr ""
 
-#: Model/Server.php:549
+#: Model/Server.php:583
 msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:557
+#: Model/Server.php:591
 msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:565
+#: Model/Server.php:599
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:573
+#: Model/Server.php:607
 msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
 msgstr ""
 
-#: Model/Server.php:581
+#: Model/Server.php:615
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:589
+#: Model/Server.php:623
 msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
 msgstr ""
 
-#: Model/Server.php:597
+#: Model/Server.php:631
 msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
 msgstr ""
 
-#: Model/Server.php:605
+#: Model/Server.php:639
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:614
+#: Model/Server.php:648
 msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:623
+#: Model/Server.php:657
 msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:631
+#: Model/Server.php:665
 msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
 msgstr ""
 
-#: Model/Server.php:638
+#: Model/Server.php:672
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:645
+#: Model/Server.php:679
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:654
+#: Model/Server.php:688
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:662
+#: Model/Server.php:696
 msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
 msgstr ""
 
-#: Model/Server.php:671
+#: Model/Server.php:705
 msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
 msgstr ""
 
-#: Model/Server.php:680
+#: Model/Server.php:714
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:689
+#: Model/Server.php:723
 msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:698
+#: Model/Server.php:732
 msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:707
+#: Model/Server.php:741
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:717
+#: Model/Server.php:751
 msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
 msgstr ""
 
-#: Model/Server.php:726
+#: Model/Server.php:760
 msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
 msgstr ""
 
-#: Model/Server.php:735
+#: Model/Server.php:769
 msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
 msgstr ""
 
-#: Model/Server.php:744
+#: Model/Server.php:778
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:753
+#: Model/Server.php:787
 msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
 msgstr ""
 
-#: Model/Server.php:762
-msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/webroot/css directory and enter the name here."
+#: Model/Server.php:796
+msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
 msgstr ""
 
-#: Model/Server.php:771
+#: Model/Server.php:805
 msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
 msgstr ""
 
-#: Model/Server.php:780
+#: Model/Server.php:814
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr ""
 
-#: Model/Server.php:789
+#: Model/Server.php:823
 msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
 msgstr ""
 
-#: Model/Server.php:799
+#: Model/Server.php:833
 msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
 msgstr ""
 
-#: Model/Server.php:808
+#: Model/Server.php:842
 msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:816
+#: Model/Server.php:850
 msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:824
+#: Model/Server.php:858
 msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
 msgstr ""
 
-#: Model/Server.php:832
+#: Model/Server.php:866
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:841
+#: Model/Server.php:875
 msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
 msgstr ""
 
-#: Model/Server.php:849
+#: Model/Server.php:883
+msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
+msgstr ""
+
+#: Model/Server.php:891
 msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
 msgstr ""
 
-#: Model/Server.php:861
+#: Model/Server.php:903
 msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
 msgstr ""
 
-#: Model/Server.php:869
+#: Model/Server.php:911
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:877
+#: Model/Server.php:919
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:885
+#: Model/Server.php:927
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:893
+#: Model/Server.php:935
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:901
+#: Model/Server.php:943
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:910
+#: Model/Server.php:952
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:921
+#: Model/Server.php:963
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr ""
 
-#: Model/Server.php:929
+#: Model/Server.php:971
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:937
+#: Model/Server.php:979
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:945
+#: Model/Server.php:987
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:953
+#: Model/Server.php:995
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:965
+#: Model/Server.php:1007
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:973
+#: Model/Server.php:1015
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:981
+#: Model/Server.php:1023
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:989
+#: Model/Server.php:1031
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:997
+#: Model/Server.php:1039
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1008
+#: Model/Server.php:1050
 msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
 msgstr ""
 
-#: Model/Server.php:1017
+#: Model/Server.php:1059
 msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
 msgstr ""
 
-#: Model/Server.php:1026
+#: Model/Server.php:1068
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr ""
 
-#: Model/Server.php:1034
+#: Model/Server.php:1076
 msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 msgstr ""
 
-#: Model/Server.php:1042
+#: Model/Server.php:1084
 msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
 msgstr ""
 
-#: Model/Server.php:1051
+#: Model/Server.php:1093
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1060
+#: Model/Server.php:1102
 msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
 msgstr ""
 
-#: Model/Server.php:1069
+#: Model/Server.php:1111
 msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
 msgstr ""
 
-#: Model/Server.php:1071
+#: Model/Server.php:1113
 msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
 msgstr ""
 
-#: Model/Server.php:1081
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1089
+#: Model/Server.php:1149
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr ""
 
-#: Model/Server.php:1100
+#: Model/Server.php:1160
 msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
 msgstr ""
 
-#: Model/Server.php:1108
+#: Model/Server.php:1168
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr ""
 
-#: Model/Server.php:1116
+#: Model/Server.php:1176
 msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
 msgstr ""
 
-#: Model/Server.php:1125
-msgid "The timeout duration of sessions (in MINUTES)."
-msgstr ""
-
-#: Model/Server.php:1133
-msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
-msgstr ""
-
-#: Model/Server.php:1144
-msgid "The default policy action for the values added to the RPZ."
-msgstr ""
-
-#: Model/Server.php:1153
-msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
-msgstr ""
-
-#: Model/Server.php:1161
-msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
-msgstr ""
-
-#: Model/Server.php:1169
-msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1177
-msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
 #: Model/Server.php:1185
-msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
 msgstr ""
 
 #: Model/Server.php:1193
+msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
+msgstr ""
+
+#: Model/Server.php:1204
+msgid "The default policy action for the values added to the RPZ."
+msgstr ""
+
+#: Model/Server.php:1213
+msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
+msgstr ""
+
+#: Model/Server.php:1221
+msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
+msgstr ""
+
+#: Model/Server.php:1229
+msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1237
+msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1245
+msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1253
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1201
+#: Model/Server.php:1261
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1217
+#: Model/Server.php:1277
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:1225
+#: Model/Server.php:1285
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1233
+#: Model/Server.php:1293
 msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
 msgstr ""
 
-#: Model/Server.php:1242
+#: Model/Server.php:1302
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1251
+#: Model/Server.php:1311
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1260
+#: Model/Server.php:1320
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1269
+#: Model/Server.php:1329
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1278
+#: Model/Server.php:1338
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1287
+#: Model/Server.php:1347
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1296
+#: Model/Server.php:1356
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1304
+#: Model/Server.php:1364
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1312
+#: Model/Server.php:1372
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1320
+#: Model/Server.php:1380
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1328
+#: Model/Server.php:1388
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1336
+#: Model/Server.php:1396
 msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1344
+#: Model/Server.php:1404
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1352
+#: Model/Server.php:1412
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1360
+#: Model/Server.php:1420
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1368
+#: Model/Server.php:1428
 msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1376
+#: Model/Server.php:1436
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1384
-msgid "The URL(s) at which to access ElasticSearch - comma seperate if you want to have more than one."
+#: Model/Server.php:1444
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1392
+#: Model/Server.php:1452
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1460
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1468
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1416
+#: Model/Server.php:1476
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1424
+#: Model/Server.php:1484
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr ""
 
-#: Model/Server.php:1432
+#: Model/Server.php:1492
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:1440
+#: Model/Server.php:1500
 msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
 msgstr ""
 
-#: Model/Server.php:1449
+#: Model/Server.php:1509
 msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
 msgstr ""
 
-#: Model/Server.php:1457
+#: Model/Server.php:1517
 msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
 msgstr ""
 
-#: Model/Server.php:1465
+#: Model/Server.php:1525
 msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
 msgstr ""
 
-#: Model/Server.php:1475
+#: Model/Server.php:1535
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1484
+#: Model/Server.php:1544
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1493
+#: Model/Server.php:1553
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1502
+#: Model/Server.php:1562
 msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
 msgstr ""
 
-#: Model/Server.php:1511
+#: Model/Server.php:1571
 msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
 msgstr ""
 
-#: Model/Server.php:1520
+#: Model/Server.php:1580
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr ""
 
-#: Model/Server.php:1529
+#: Model/Server.php:1589
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1537
+#: Model/Server.php:1597
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1545
+#: Model/Server.php:1605
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1553;1665
+#: Model/Server.php:1613;1725
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:1561;1682
+#: Model/Server.php:1621;1742
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:1569
+#: Model/Server.php:1629
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1577
+#: Model/Server.php:1637
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1585
+#: Model/Server.php:1645
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1593
+#: Model/Server.php:1653
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1601
+#: Model/Server.php:1661
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:1609
+#: Model/Server.php:1669
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:1617
+#: Model/Server.php:1677
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1625
+#: Model/Server.php:1685
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:1633
+#: Model/Server.php:1693
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1641
+#: Model/Server.php:1701
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1649
+#: Model/Server.php:1709
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:1657
+#: Model/Server.php:1717
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:1673
+#: Model/Server.php:1733
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:1690
+#: Model/Server.php:1750
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:1699
+#: Model/Server.php:1759
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:1708
+#: Model/Server.php:1768
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr ""
 
-#: Model/Server.php:1717
+#: Model/Server.php:1777
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:1726
+#: Model/Server.php:1786
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:1735
+#: Model/Server.php:1795
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:1745
+#: Model/Server.php:1805
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:1754
+#: Model/Server.php:1814
 msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
 msgstr ""
 
-#: Model/Server.php:2401
+#: Model/Server.php:1947
+msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/Server.php:2054
+msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+msgstr "Não autorizado. Isto aconteceu devido a uma chave de autenticação inválida, ou ao usuário de sincronização não ter permissões de autenticação habilitadas no servidor remoto. Outra razão pode ser um configuração incorreta no servidor de sincronização."
+
+#: Model/Server.php:2056
+msgid "Sorry, this is not yet implemented"
+msgstr ""
+
+#: Model/Server.php:2057
+msgid "Something went wrong while trying to pull"
+msgstr ""
+
+#: Model/Server.php:2069;2071
+msgid "Unknown issue."
+msgstr ""
+
+#: Model/Server.php:2535
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:2404
+#: Model/Server.php:2538
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:2412
+#: Model/Server.php:2546
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:2527
+#: Model/Server.php:2661
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3130
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
 msgid "Organisation logos"
 msgstr "Logotipos da organização"
 
-#: Model/Server.php:3131
+#: Model/Server.php:3476
 msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
 msgstr "O logotipo usado por uma organização sobre o índice de eventos, visualizador de evento, discussões, propostas, etc. Certifique-se que o nome do arquivo está no formato org.png, onde org é o nome da organização diferenciando maiusculas de minúsculas."
 
-#: Model/Server.php:3133
+#: Model/Server.php:3478
 msgid "48x48 pixel .png files"
 msgstr "arquivos .png de 48 x 48 pixels"
 
-#: Model/Server.php:3136;3151
+#: Model/Server.php:3481;3496
 msgid "Filename must be in the following format: *.png"
 msgstr "Nome do arquivo deve estar no seguinte formato: *. png"
 
-#: Model/Server.php:3140
+#: Model/Server.php:3485
 msgid "Additional image files"
 msgstr "Arquivos de imagem adicionais"
 
-#: Model/Server.php:3141
+#: Model/Server.php:3486
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr "Arquivos de imagem carregados para este diretório podem ser usados para várias finalidades, como para os logotipos de página de login"
 
-#: Model/Server.php:3148
+#: Model/Server.php:3493
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr "texto/html se for embutido, algo que transmite os termos de uso se for baixado"
 
-#: Model/Server.php:3765
+#: Model/Server.php:3665
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr ""
+
+#: Model/Server.php:4115
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:3766
+#: Model/Server.php:4116
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:3770
+#: Model/Server.php:4120
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:3771
+#: Model/Server.php:4121
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
@@ -2029,7 +2311,7 @@ msgstr "depende dos seguintes itens"
 
 #: View/Attributes/add.ctp:7
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr "Adicionar atributo"
@@ -2074,7 +2356,7 @@ msgstr "Tipo "
 #: View/Attributes/add.ctp:36
 #: View/Attributes/add_attachment.ctp:24
 #: View/Attributes/edit.ctp:24
-#: View/Events/add.ctp:24
+#: View/Events/add.ctp:20
 msgid "Distribution "
 msgstr "Distribuição "
 
@@ -2082,7 +2364,7 @@ msgstr "Distribuição "
 #: View/Attributes/add_attachment.ctp:33
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
-#: View/Events/add.ctp:34
+#: View/Events/add.ctp:30
 #: View/Events/edit.ctp:26
 #: View/Feeds/add.ctp:176
 #: View/Feeds/edit.ctp:172
@@ -2109,23 +2391,24 @@ msgstr "Comentário contextual"
 msgid "for Intrusion Detection System"
 msgstr "para o sistema de deteção de intrusão"
 
-#: View/Attributes/add.ctp:87
+#: View/Attributes/add.ctp:91
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_mitre_attack_matrix.ctp:14;113
+#: View/Elements/view_galaxy_matrix.ctp:76;199
 #: View/Events/contact.ctp:29
 #: View/Events/edit.ctp:59
 #: View/Events/free_text_import.ctp:27
 #: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:78
+#: View/ObjectReferences/ajax/add.ctp:130
 #: View/Objects/add.ctp:147
 #: View/Objects/revise_object.ctp:85
 #: View/Organisations/admin_add.ctp:49
 #: View/Organisations/admin_edit.ctp:60
-#: View/Servers/add.ctp:126
-#: View/Servers/edit.ctp:167
-#: View/SharingGroups/add.ctp:75
+#: View/Servers/add.ctp:115
+#: View/Servers/edit.ctp:162
+#: View/SharingGroups/add.ctp:115
+#: View/TagCollections/add.ctp:21
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
 #: View/TemplateElements/ajax/template_element_add_file.ctp:67
 #: View/TemplateElements/ajax/template_element_add_text.ctp:29
@@ -2134,7 +2417,7 @@ msgstr "para o sistema de deteção de intrusão"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/Users/admin_add.ctp:97
 #: View/Users/admin_edit.ctp:91
-#: View/Users/admin_email.ctp:51
+#: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
 #: View/Users/change_pw.ctp:23
 #: View/Users/edit.ctp:41
@@ -2142,14 +2425,17 @@ msgstr "para o sistema de deteção de intrusão"
 msgid "Submit"
 msgstr "Enviar"
 
-#: View/Attributes/add.ctp:88
+#: View/Attributes/add.ctp:92
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:62
+#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/exportSearch.ctp:32
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Elements/eventattributecreation.ctp:89
-#: View/Elements/view_mitre_attack_matrix.ctp:114
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/view_galaxy_matrix.ctp:200
 #: View/Elements/serverRuleElements/pull.ctp:70
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2158,21 +2444,18 @@ msgstr "Enviar"
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/ajax/enrich_event.ctp:21
+#: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:15
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/exportChoice.ctp:51
 #: View/Events/ajax/importChoice.ctp:12
 #: View/Events/ajax/quick_edit.ctp:6
-#: View/Galaxies/ajax/cluster_choice.ctp:32
-#: View/Galaxies/ajax/galaxy_choice.ctp:22
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:15
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
-#: View/ObjectReferences/ajax/add.ctp:82
+#: View/ObjectReferences/ajax/add.ctp:134
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/ObjectTemplates/ajax/object_choice.ctp:10
 #: View/Objects/add.ctp:153
 #: View/Objects/revise_object.ctp:87
 #: View/Objects/ajax/delete.ctp:24
@@ -2187,11 +2470,12 @@ msgstr "Enviar"
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
 #: View/Sightings/ajax/advanced.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
-#: View/Tags/ajax/select_tag.ctp:32
-#: View/Tags/ajax/taxonomy_choice.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:6
 #: View/TemplateElements/ajax/template_element_add_file.ctp:73
@@ -2201,6 +2485,7 @@ msgstr "Enviar"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:35
 #: View/Templates/ajax/template_choices.ctp:15
 #: View/Users/admin_filter_user_index.ctp:107
+#: View/Users/ajax/emailConfirmTemplate.ctp:14
 #: View/Users/ajax/fetchpgpkey.ctp:24
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
@@ -2239,8 +2524,6 @@ msgstr "Id de Evento"
 #: View/Elements/Users/userIndexTable.ctp:4
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_view.ctp:14
-#: View/Users/view.ctp:14
 msgid "Org"
 msgstr "Org"
 
@@ -2255,7 +2538,7 @@ msgid "Event date"
 msgstr "Data do Evento"
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Event graph"
 msgstr "Gráfico do evento"
 
@@ -2283,12 +2566,12 @@ msgstr "Marcar todos os novos atributos de IDS"
 
 #: View/Attributes/attribute_replace.ctp:26
 #: View/Noticelists/view.ctp:36
-#: View/Warninglists/view.ctp:54
+#: View/Warninglists/view.ctp:35
 msgid "Values"
 msgstr "Valores"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:75
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:46
@@ -2322,7 +2605,7 @@ msgstr "Nenhuma falha nos compostos"
 msgid "disabled"
 msgstr "desabilitado"
 
-#: View/Attributes/edit.ctp:64
+#: View/Attributes/edit.ctp:68
 #: View/ShadowAttributes/add.ctp:55
 #: View/ShadowAttributes/edit.ctp:45;54
 msgid "Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this."
@@ -2330,7 +2613,7 @@ msgstr "Aviso: Você está prestes a compartilhar dados de natureza confidencial
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -2338,10 +2621,6 @@ msgstr "Aviso: Você está prestes a compartilhar dados de natureza confidencial
 msgid "Attributes"
 msgstr "Atributos"
 
-#: View/Attributes/index.ctp:7
-msgid "Results for all attributes"
-msgstr "Resultados para todos os atributos"
-
 #: View/Attributes/index.ctp:8
 msgid " with the value containing "
 msgstr " com o valor que contém "
@@ -2354,57 +2633,67 @@ msgstr " sendo marcados com "
 msgid " from the events "
 msgstr " dos acontecimentos "
 
-#: View/Attributes/index.ctp:12
-msgid " of category "
-msgstr " da categoria "
+#: View/Attributes/index.ctp:11
+msgid " carrying the tag(s) "
+msgstr ""
 
-#: View/Attributes/index.ctp:13
+#: View/Attributes/index.ctp:12
 msgid " of type "
 msgstr " do tipo "
 
-#: View/Attributes/index.ctp:14
-msgid " created by the organisation "
-msgstr " criado pela organização "
+#: View/Attributes/index.ctp:13
+msgid " of category "
+msgstr " da categoria "
 
-#: View/Attributes/index.ctp:28;173
-#: View/Elements/eventattribute.ctp:60;258
+#: View/Attributes/index.ctp:14
+msgid " created by organisation "
+msgstr ""
+
+#: View/Attributes/index.ctp:26
+msgid "Results for all attributes"
+msgstr "Resultados para todos os atributos"
+
+#: View/Attributes/index.ctp:39;132
+#: View/Elements/eventattribute.ctp:60;229
 #: View/Elements/eventdiscussion.ctp:15;126
+#: View/Elements/generic_table.ctp:16
+#: View/Elements/generic_table_row.ctp:16
 #: View/Elements/Feeds/eventattribute.ctp:20;86
 #: View/Elements/Servers/eventattribute.ctp:20;86
 #: View/EventBlacklists/index.ctp:13;54
-#: View/Events/index.ctp:12;89
+#: View/Events/index.ctp:12;115
 #: View/Events/proposal_event_index.ctp:12;95
 #: View/Events/ajax/index.ctp:13;39
 #: View/Feeds/freetext_index.ctp:22;86
-#: View/Feeds/index.ctp:20;230
-#: View/Feeds/preview_index.ctp:14;82
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
 #: View/Galaxies/index.ctp:13;53
-#: View/GalaxyClusters/ajax/index.ctp:11;96
+#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:33;162
-#: View/Logs/admin_index.ctp:37;111
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
 #: View/Logs/event_index.ctp:17;61
 #: View/News/index.ctp:39
 #: View/Noticelists/index.ctp:13;83
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
-#: View/ObjectTemplates/index.ctp:13;126
+#: View/ObjectTemplates/index.ctp:13;137
 #: View/OrgBlacklists/index.ctp:13;52
-#: View/Organisations/index.ctp:42;138
+#: View/Organisations/index.ctp:42;159
 #: View/Regexp/admin_index.ctp:13;51
 #: View/Regexp/index.ctp:13;45
 #: View/Roles/admin_index.ctp:13;82
 #: View/Roles/index.ctp:13;55
-#: View/Servers/index.ctp:13;117
-#: View/Servers/preview_index.ctp:15;164
-#: View/ShadowAttributes/index.ctp:12;108
-#: View/SharingGroups/index.ctp:13;86
+#: View/Servers/index.ctp:13;156
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;63
-#: View/Taxonomies/view.ctp:53;169
+#: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:12;56
+#: View/Users/admin_index.ctp:12;86
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -2412,45 +2701,47 @@ msgstr " criado pela organização "
 msgid "previous"
 msgstr "voltar"
 
-#: View/Attributes/index.ctp:30;175
-#: View/Elements/eventattribute.ctp:62;260
+#: View/Attributes/index.ctp:41;134
+#: View/Elements/eventattribute.ctp:62;231
 #: View/Elements/eventdiscussion.ctp:17;128
+#: View/Elements/generic_table.ctp:18
+#: View/Elements/generic_table_row.ctp:18
 #: View/Elements/Feeds/eventattribute.ctp:22;88
 #: View/Elements/Servers/eventattribute.ctp:22;88
 #: View/EventBlacklists/index.ctp:15;56
-#: View/Events/index.ctp:14;91
+#: View/Events/index.ctp:14;117
 #: View/Events/proposal_event_index.ctp:14;97
 #: View/Events/ajax/index.ctp:15;41
 #: View/Feeds/freetext_index.ctp:24;88
-#: View/Feeds/index.ctp:22;232
-#: View/Feeds/preview_index.ctp:16;84
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
 #: View/Galaxies/index.ctp:15;55
-#: View/GalaxyClusters/ajax/index.ctp:13;98
+#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:35;164
-#: View/Logs/admin_index.ctp:39;113
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
 #: View/Logs/event_index.ctp:19;63
 #: View/News/index.ctp:41
 #: View/Noticelists/index.ctp:15;85
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
-#: View/ObjectTemplates/index.ctp:15;128
+#: View/ObjectTemplates/index.ctp:15;139
 #: View/OrgBlacklists/index.ctp:15;54
-#: View/Organisations/index.ctp:44;140
+#: View/Organisations/index.ctp:44;161
 #: View/Regexp/admin_index.ctp:15;53
 #: View/Regexp/index.ctp:15;47
 #: View/Roles/admin_index.ctp:15;84
 #: View/Roles/index.ctp:15;57
-#: View/Servers/index.ctp:15;119
-#: View/Servers/preview_index.ctp:17;166
-#: View/ShadowAttributes/index.ctp:14;110
-#: View/SharingGroups/index.ctp:15;88
+#: View/Servers/index.ctp:15;158
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;65
-#: View/Taxonomies/view.ctp:55;171
+#: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:14;58
+#: View/Users/admin_index.ctp:14;88
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -2458,66 +2749,144 @@ msgstr "voltar"
 msgid "next"
 msgstr "próximo"
 
-#: View/Attributes/index.ctp:148
-msgid "Are you sure you want to delete this attribute?"
-msgstr "Tem certeza de que deseja excluir este atributo?"
+#: View/Attributes/index.ctp:53
+#: View/Elements/eventattribute.ctp:152
+#: View/Elements/Events/eventIndexTable.ctp:37
+#: View/Elements/Feeds/eventattribute.ctp:45
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/view.ctp:117
+#: View/Feeds/preview_event.ctp:16
+#: View/Noticelists/view.ctp:43
+#: View/Pages/doc/using_the_system.ctp:164;207;318
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
+#: View/Tags/index.ctp:10
+#: View/Templates/add.ctp:12
+#: View/Templates/edit.ctp:12
+#: View/Templates/view.ctp:19
+msgid "Tags"
+msgstr "Tags"
 
-#: View/Attributes/index.ctp:151
-msgid "Propose an edit"
-msgstr "Propor uma edição"
+#: View/Attributes/index.ctp:54
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/Galaxies/index.ctp:2
+msgid "Galaxies"
+msgstr ""
 
-#: View/Attributes/index.ctp:155
-#: View/Elements/Events/eventIndexTable.ctp:82;86;229
-#: View/Elements/Users/userIndexTable.ctp:94
-#: View/Elements/dashboard/dashboard_events.ctp:4;5
-#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
-#: View/Events/proposal_event_index.ctp:45;49
-#: View/Feeds/preview_index.ctp:66
-#: View/Noticelists/index.ctp:66
-#: View/ObjectTemplates/index.ctp:104
-#: View/Organisations/index.ctp:122
-#: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/preview_index.ctp:148
-#: View/Taxonomies/index.ctp:47
-#: View/Warninglists/index.ctp:60
-msgid "View"
-msgstr "Visualizar"
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:161
+msgid "Correlate"
+msgstr ""
 
-#: View/Attributes/index.ctp:166
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Events/view.ctp:314
+#: View/Feeds/preview_event.ctp:73
+#: View/Pages/doc/using_the_system.ctp:235
+#: View/Servers/preview_event.ctp:95
+msgid "Related Events"
+msgstr ""
+
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:163
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+msgid "Feed hits"
+msgstr ""
+
+#: View/Attributes/index.ctp:61
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
+msgid "Sightings"
+msgstr ""
+
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
+#: View/Tags/index.ctp:73
+msgid "Activity"
+msgstr ""
+
+#: View/Attributes/index.ctp:63
+#: View/Elements/eventattribute.ctp:168
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/healthElements/files.ctp:33
+#: View/Elements/healthElements/workers.ctp:60
+#: View/Elements/templateElements/templateRowAttribute.ctp:94
+#: View/Elements/templateElements/templateRowFile.ctp:71
+#: View/Elements/templateElements/templateRowText.ctp:28
+#: View/EventBlacklists/index.ctp:27
+#: View/Events/export.ctp:31
+#: View/Events/resolved_attributes.ctp:53
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:51
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:66
+#: View/OrgBlacklists/index.ctp:26
+#: View/Organisations/index.ctp:102
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:25
+#: View/Roles/admin_index.ctp:35
+#: View/Servers/index.ctp:37
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:27
+#: View/Templates/index.ctp:27
+#: View/Threads/index.ctp:28
+#: View/Warninglists/index.ctp:38
+#: View/Whitelists/admin_index.ctp:24
+msgid "Actions"
+msgstr ""
+
+#: View/Attributes/index.ctp:125
 #: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
 #: View/EventBlacklists/index.ctp:47
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:223
-#: View/Feeds/preview_index.ctp:74
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
 #: View/Galaxies/index.ctp:46
-#: View/GalaxyClusters/ajax/index.ctp:90
+#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:155
-#: View/Logs/admin_index.ctp:104
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
 #: View/Logs/event_index.ctp:54
 #: View/News/index.ctp:33
 #: View/Noticelists/index.ctp:76
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:66
-#: View/ObjectTemplates/index.ctp:119
+#: View/ObjectTemplates/index.ctp:130
 #: View/OrgBlacklists/index.ctp:45
-#: View/Organisations/index.ctp:131
+#: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
 #: View/Roles/admin_index.ctp:75
 #: View/Roles/index.ctp:48
-#: View/Servers/index.ctp:110
-#: View/Servers/preview_index.ctp:156
-#: View/ShadowAttributes/index.ctp:101
-#: View/SharingGroups/index.ctp:79
+#: View/Servers/index.ctp:149
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:56
-#: View/Taxonomies/view.ctp:162
+#: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:49
+#: View/Users/admin_index.ctp:79
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -2564,26 +2933,22 @@ msgid "Containing the following expressions"
 msgstr "Contendo as seguintes expressões"
 
 #: View/Attributes/search.ctp:11
-msgid "Being an attribute matching the following tags"
-msgstr "Sendo um atributo correspondente as seguintes tags"
+msgid "Having tag or being an attribute of an event having the tag"
+msgstr ""
 
 #: View/Attributes/search.ctp:12
 msgid "Being attributes of the following event IDs, event UUIDs or attribute UUIDs"
 msgstr "Sendo os atributos dos seguintes IDs do evento, UUIDs do evento ou UUIDs do atributo"
 
-#: View/Attributes/search.ctp:13
-msgid "Being an attribute of an event matching the following tags"
-msgstr "Sendo um atributo de um evento que corresponde as seguintes tags"
-
-#: View/Attributes/search.ctp:20
+#: View/Attributes/search.ctp:15
 msgid "From the following organisation(s)"
 msgstr "Das seguintes organizações"
 
-#: View/Attributes/search.ctp:36
-msgid "Only find IOCs to use in IDS"
-msgstr "Encontrar apenas IOC's para usar em IDS"
+#: View/Attributes/search.ctp:29
+msgid "Only find IOCs flagged as to_ids"
+msgstr ""
 
-#: View/Attributes/search.ctp:40
+#: View/Attributes/search.ctp:33
 msgid "Alternate Search Result (Events)"
 msgstr "Resultado de pesquisa alternativos (Eventos)"
 
@@ -2601,26 +2966,26 @@ msgstr "Tem certeza que quer apagar o atributo #%s? O atributo só será apagado
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90
-#: View/Elements/galaxyQuickView.ctp:23
-#: View/Elements/side_menu.ctp:351
-#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/eventIndexTable.ctp:229
 #: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:30
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Roles/admin_index.ctp:67
-#: View/Servers/index.ctp:99
+#: View/Servers/index.ctp:138
 #: View/Tags/index.ctp:125
 msgid "Delete"
 msgstr "Apagar"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
@@ -2634,34 +2999,36 @@ msgstr "Apagar"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:56
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:168
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
 #: View/Events/ajax/handleSelected.ctp:17
 #: View/Events/ajax/toggle_correlation.ctp:20
 #: View/Feeds/preview_event.ctp:56
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:79
 #: View/Servers/ajax/update.ctp:11
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
 #: View/Templates/view.ctp:41
-#: View/Users/admin_view.ctp:32;37;104;114;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:27
 msgid "Yes"
 msgstr "Sim"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:21
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
@@ -2675,29 +3042,30 @@ msgstr "Sim"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:58;176
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:166
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/handleSelected.ctp:22
 #: View/Events/ajax/toggle_correlation.ctp:25
 #: View/Feeds/preview_event.ctp:61;66
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:89
 #: View/Servers/ajax/update.ctp:16
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
 #: View/Templates/view.ctp:42
-#: View/Users/admin_view.ctp:32;37;106;116;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
 msgid "No"
@@ -2706,7 +3074,6 @@ msgstr "Não"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:5
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:5
 #: View/Attributes/ajax/attributeEditValueForm.ctp:6
 msgid "Accept change"
@@ -2715,7 +3082,6 @@ msgstr "Aceitar modificação"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:6
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
 msgid "Discard change"
@@ -2732,7 +3098,7 @@ msgstr "Não altere as configurações atuais"
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/view.ctp:143
+#: View/Events/view.ctp:145
 #: View/Feeds/add.ctp:167
 #: View/Feeds/edit.ctp:164
 #: View/Feeds/freetext_index.ctp:36
@@ -2754,6 +3120,50 @@ msgstr "Para o sistema de deteção de intrusão"
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr "Deixe este campo vazio para deixar o campo de comentário dos atributos selecionados inalterada."
 
+#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+msgid "Tags to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+msgid "Tags to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+msgid "Clusters to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+msgid "Clusters to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr "ligado"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr "desativado"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
 #: View/Attributes/ajax/attributeRestorationForm.ctp:5
 msgid "Attribute Restoration"
 msgstr "Restauração de atributo"
@@ -2762,6 +3172,15 @@ msgstr "Restauração de atributo"
 msgid "Are you sure you want to undelete Attribute #%s?"
 msgstr "Tem certeza que deseja recuperar este atributo %s?"
 
+#: View/Attributes/ajax/exportSearch.ctp:2
+msgid "Choose the format that you wish to download the search results in"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:10;23
+#: View/Events/ajax/exportChoice.ctp:17;18;27;28
+msgid "Export as %s"
+msgstr ""
+
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
 msgid "Remove Tag"
 msgstr "Remover Tag"
@@ -2782,16 +3201,6 @@ msgstr "Excluir"
 msgid "Toggle Correlation %s "
 msgstr "Alternar correlação %s "
 
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "on"
-msgstr "ligado"
-
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "off"
-msgstr "desativado"
-
 #: View/Attributes/ajax/toggle_correlation.ctp:11
 msgid "Re-enable the correlation for this attribute."
 msgstr "Reative a correlação para este atributo."
@@ -2804,13 +3213,21 @@ msgstr "Isto irá remover todas as correlações que já existem para este atrib
 msgid "Toggle correlation for attribute"
 msgstr "Alternar correlação para o atributo"
 
-#: View/Elements/ajaxAttributeTags.ctp:25
+#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Elements/ajaxTagCollectionTags.ctp:16
 #: View/Elements/ajaxTags.ctp:14
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr "Remover marca"
 
+#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Pages/doc/using_the_system.ctp:303
+#: View/Templates/add.ctp:17
+#: View/Templates/edit.ctp:17
+msgid "Add tag"
+msgstr ""
+
 #: View/Elements/ajaxTags.ctp:17
 msgid "Remove tag %s"
 msgstr "Remover marca %s"
@@ -2821,215 +3238,33 @@ msgstr "Remover marca %s"
 msgid "Add a tag"
 msgstr "Adicione uma marca"
 
-#: View/Elements/eventattribute.ctp:71;269
+#: View/Elements/eventattribute.ctp:71;240
 #: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
 #: View/Elements/Servers/eventattribute.ctp:28;31;94;97
 msgid "view all"
 msgstr "ver todos"
 
-#: View/Elements/eventattribute.ctp:117
-#: View/Pages/doc/using_the_system.ctp:86
-msgid "Add attribute"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:118
-msgid "Edit selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:119
-msgid "Tag selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:120
-msgid "Delete selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:121
-msgid "Accept selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:122
-msgid "Discard selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:123
-msgid "Sightings display for selected attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:127
-msgid "Populate using a template"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:129
-msgid "Populate using the freetext import tool"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:131
-msgid "Replace all attributes of a category/type combination within the event"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:140;159
-msgid "Show all attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:144
-msgid "Only show %s related attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:148
-msgid "Only show proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:148
-#: View/Logs/event_index.ctp:44
-msgid "Proposal"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:149
-msgid "Only show correlating attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Only show potentially false positive attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Warnings"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:152
-msgid "Include deleted attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show attribute context fields"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show context fields"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:157
-msgid "Filter on attributes value"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:159
-#: View/Events/index.ctp:41
-#: View/Servers/preview_index.ctp:42
-#: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:37
-msgid "Remove filters"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all"
 msgstr "Selecionar todos"
 
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 msgid "Select all attributes/proposals on current page"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:188
-#: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/view.ctp:121
-#: View/Feeds/preview_event.ctp:16
-#: View/Noticelists/view.ctp:43
-#: View/Pages/doc/using_the_system.ctp:164;207;318
-#: View/Servers/preview_event.ctp:27
-#: View/Servers/preview_index.ctp:68
-#: View/Tags/index.ctp:10
-#: View/Templates/add.ctp:12
-#: View/Templates/edit.ctp:12
-#: View/Templates/view.ctp:19
-msgid "Tags"
-msgstr "Tags"
-
-#: View/Elements/eventattribute.ctp:189
-#: View/Elements/global_menu.ctp:56
-#: View/Events/view.ctp:387
-#: View/Galaxies/index.ctp:2
-msgid "Galaxies"
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:191
-msgid "Correlate"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:192
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:263
-#: View/Feeds/preview_event.ctp:73
-#: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:95
-msgid "Related Events"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:193
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
-msgid "Feed hits"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:196
-#: View/Events/view.ctp:198
-msgid "Sightings"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:197
-#: View/Events/view.ctp:205
-#: View/Tags/index.ctp:73
-msgid "Activity"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:198
-#: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/healthElements/files.ctp:33
-#: View/Elements/healthElements/workers.ctp:55
-#: View/Elements/templateElements/templateRowAttribute.ctp:94
-#: View/Elements/templateElements/templateRowFile.ctp:71
-#: View/Elements/templateElements/templateRowText.ctp:28
-#: View/EventBlacklists/index.ctp:27
-#: View/Events/export.ctp:31
-#: View/Events/resolved_attributes.ctp:53
-#: View/Feeds/index.ctp:61
-#: View/Feeds/preview_index.ctp:38
-#: View/GalaxyClusters/ajax/index.ctp:51
-#: View/Noticelists/index.ctp:37
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:55
-#: View/OrgBlacklists/index.ctp:26
-#: View/Organisations/index.ctp:81
-#: View/Pages/doc/using_the_system.ctp:187;238;286;382
-#: View/Regexp/admin_index.ctp:25
-#: View/Roles/admin_index.ctp:35
-#: View/Servers/index.ctp:36
-#: View/Servers/preview_index.ctp:80
-#: View/SharingGroups/add.ctp:34;54
-#: View/SharingGroups/edit.ctp:34;62
-#: View/SharingGroups/index.ctp:30
-#: View/Sightings/ajax/list_sightings.ctp:11
-#: View/Tags/index.ctp:76
-#: View/Taxonomies/index.ctp:27
-#: View/Templates/index.ctp:27
-#: View/Threads/index.ctp:28
-#: View/Warninglists/index.ctp:38
-#: View/Whitelists/admin_index.ctp:24
-msgid "Actions"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:238
+#: View/Elements/eventattribute.ctp:209
 msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
 "a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
 "attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:242
+#: View/Elements/eventattribute.ctp:213
 msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
 msgstr ""
 
@@ -3037,6 +3272,140 @@ msgstr ""
 msgid "Create multiple attributes one per line"
 msgstr ""
 
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr "Todos(as)"
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr "Aviso"
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr ""
+
 #: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr ""
@@ -3046,14 +3415,14 @@ msgid "Deactivated user"
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:223
-#: View/Elements/Events/View/row_attribute.ctp:299
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/View/row_attribute.ctp:380
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/Feeds/edit.ctp:193
 #: View/OrgBlacklists/edit.ctp:22
 #: View/Pages/doc/using_the_system.ctp:191
-#: View/Servers/index.ctp:98
-#: View/Tags/edit.ctp:35
+#: View/Servers/index.ctp:137
+#: View/Tags/edit.ctp:36
 #: View/Templates/edit.ctp:49
 msgid "Edit"
 msgstr "Editar"
@@ -3081,12 +3450,12 @@ msgid "Insert a link to an event - just enter the event ID between the [event][/
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:180;191
+#: View/Events/view.ctp:196;207
 #: View/Objects/orphaned_object_diagnostics.ctp:21
 #: View/Pages/doc/administration.ctp:167
 #: View/Pages/doc/using_the_system.ctp:200;279
 #: View/Posts/add.ctp:33
-#: View/ShadowAttributes/index.ctp:31
+#: View/ShadowAttributes/index.ctp:41
 msgid "Event"
 msgstr ""
 
@@ -3121,9 +3490,19 @@ msgid "Code"
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:156
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr ""
 
+#: View/Elements/flashErrorMessage.ctp:2
+msgid "Errors"
+msgstr ""
+
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Jobs/ajax/error.ctp:34
+msgid "Close"
+msgstr ""
+
 #: View/Elements/footer.ctp:5
 msgid "Keyboard shortcuts for this page"
 msgstr "Atalhos de teclado para esta página"
@@ -3135,8 +3514,8 @@ msgstr "nenhum"
 #: View/Elements/footer.ctp:15
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:60
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
 msgid "GnuPG key"
 msgstr ""
 
@@ -3152,32 +3531,36 @@ msgstr ""
 msgid "View details about this galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:17
+#: View/Elements/galaxyQuickView.ctp:19
 #: View/Elements/galaxyQuickViewMini.ctp:69
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:18
+#: View/Elements/galaxyQuickView.ctp:20
 #: View/Elements/galaxyQuickViewMini.ctp:70
 msgid "View all events containing this cluster."
 msgstr ""
 
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
 #: View/Elements/galaxyQuickView.ctp:24
 msgid "Are you sure you want to detach %s from this event?"
 msgstr "Tem certeza que deseja desvincular %s deste evento?"
 
-#: View/Elements/galaxyQuickViewMini.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:74
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr "Tem certeza que deseja desvincular %s deste %s?"
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 #: View/EventBlacklists/add.ctp:35
 #: View/EventBlacklists/edit.ctp:29
-#: View/Events/add.ctp:72
+#: View/Events/add.ctp:68
 #: View/Events/filter_event_index.ctp:125
 #: View/Feeds/add.ctp:198
 #: View/Feeds/import_feeds.ctp:19
@@ -3187,113 +3570,139 @@ msgstr ""
 #: View/Roles/admin_add.ctp:44
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 #: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:19
 #: View/Tags/add.ctp:35
 #: View/Users/admin_filter_user_index.ctp:62
 #: View/Whitelists/admin_add.ctp:13
 msgid "Add"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/side_menu.ctp:174;188
+#: View/Elements/generic_picker.ctp:205
+msgid "Due to the large number of options, no contextual information is provided."
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:273
+msgid "Nothing to pick"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:11
+#: View/Pages/doc/general.ctp:20
+msgid "Event Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:26
-#: View/Elements/side_menu.ctp:179;194
-#: View/Events/add.ctp:8
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
+#: View/Events/add.ctp:4
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:28
-#: View/Elements/side_menu.ctp:213
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr "Listar atributos"
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/side_menu.ctp:218
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr "Atributos de Pesquisa"
 
-#: View/Elements/global_menu.ctp:30
-#: View/Elements/side_menu.ctp:206
-#: View/Servers/rest.ctp:4
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
+#: View/Servers/rest.ctp:20
 msgid "REST client"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:32
-#: View/Elements/side_menu.ctp:238
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr "Visualizar propostas"
 
-#: View/Elements/global_menu.ctp:35
-#: View/Elements/side_menu.ctp:446
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
+#: View/Pages/doc/general.ctp:39
+msgid "Events with proposals"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr "Listar Tags"
 
-#: View/Elements/global_menu.ctp:37
-#: View/Elements/side_menu.ctp:450
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
+msgid "List Tag Collections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 #: View/Tags/edit.ctp:4
 msgid "Add Tag"
 msgstr "Adicionar Tag"
 
-#: View/Elements/global_menu.ctp:39
-#: View/Elements/side_menu.ctp:471
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:41
-#: View/Elements/side_menu.ctp:485
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:43
-#: View/Elements/side_menu.ctp:487
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:46
-#: View/Elements/side_menu.ctp:247
+#: View/Elements/global_menu.ctp:78
 #: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:48
-#: View/Elements/side_menu.ctp:253
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
+#: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
 #: View/Pages/doc/using_the_system.ctp:15;361
 msgid "Automation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:60
-#: View/Elements/side_menu.ctp:529
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:67
+#: View/Elements/global_menu.ctp:101
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:72;76
+#: View/Elements/global_menu.ctp:104;109
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -3302,7 +3711,7 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:73;77
+#: View/Elements/global_menu.ctp:114;119
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -3311,82 +3720,88 @@ msgstr ""
 msgid "Signature Whitelist"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:79
-#: View/Elements/side_menu.ctp:274
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 msgid "List Warninglists"
 msgstr "Listar a lista de avisos"
 
-#: View/Elements/global_menu.ctp:80
-#: View/Elements/side_menu.ctp:283
+#: View/Elements/global_menu.ctp:128
 msgid "List Noticelists"
 msgstr "Listar a lista de notificações"
 
-#: View/Elements/global_menu.ctp:90
+#: View/Elements/global_menu.ctp:135
+#: View/Pages/doc/general.ctp:22;54
+msgid "Global Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:139
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:91
-#: View/Elements/side_menu.ctp:311
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr "Meu Perfil"
 
-#: View/Elements/global_menu.ctp:92;203
-#: View/Elements/side_menu.ctp:312
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: View/Elements/global_menu.ctp:96
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
-#: View/Users/statistics_data.ctp:32
+#: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:100
-#: View/Elements/side_menu.ctp:325
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr "Permissões específicas para funções"
 
-#: View/Elements/global_menu.ctp:102
-#: View/Elements/side_menu.ctp:552
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:104
-#: View/Elements/side_menu.ctp:331
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Sharing Groups"
 msgstr "Lista Grupos de Compartilhamento"
 
-#: View/Elements/global_menu.ctp:106
-#: View/Elements/side_menu.ctp:332
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
 msgid "Add Sharing Group"
 msgstr "Adicionar Grupo de Compartilhamento"
 
-#: View/Elements/global_menu.ctp:109
-#: View/Elements/side_menu.ctp:334
-#: View/Events/automation.ctp:42
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
+#: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
 msgstr "Manual do Usuário"
 
-#: View/Elements/global_menu.ctp:110
-#: View/Elements/side_menu.ctp:335
-#: View/Pages/doc/general.ctp:61
-#: View/Pages/doc/user_management.ctp:54
-msgid "Terms &amp; Conditions"
-msgstr "Termos &amp; Condições"
+#: View/Elements/global_menu.ctp:186
+msgid "Categories & Types"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:111
-#: View/Elements/side_menu.ctp:336
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -3399,30 +3814,34 @@ msgstr "Termos &amp; Condições"
 msgid "Statistics"
 msgstr "Estatísticas"
 
-#: View/Elements/global_menu.ctp:113
+#: View/Elements/global_menu.ctp:201
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:114
+#: View/Elements/global_menu.ctp:205
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:125
-#: View/Elements/side_menu.ctp:354
+#: View/Elements/global_menu.ctp:212
+#: View/Pages/doc/general.ctp:23;66
+msgid "Sync Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr "Listar Servidores"
 
-#: View/Elements/global_menu.ctp:127
-#: View/Elements/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
 msgid "List Feeds"
 msgstr "Listar Feeds"
 
-#: View/Elements/global_menu.ctp:136
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/administration.ctp:8
-#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
 #: View/Pages/doc/quickstart.ctp:8
@@ -3431,95 +3850,100 @@ msgstr "Listar Feeds"
 msgid "Administration"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:140
-#: View/Elements/side_menu.ctp:376
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr "Listar Usuários"
 
-#: View/Elements/global_menu.ctp:141
-#: View/Elements/side_menu.ctp:375
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
 msgid "Add User"
 msgstr "Adicionar Usuário"
 
-#: View/Elements/global_menu.ctp:142
-#: View/Elements/side_menu.ctp:379
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:144
-#: View/Elements/side_menu.ctp:316;391
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
 msgid "List Organisations"
 msgstr "Listar Organizações"
 
-#: View/Elements/global_menu.ctp:146
-#: View/Elements/side_menu.ctp:383
-msgid "Add Organisation"
-msgstr "Adicionar Organização"
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
+msgstr ""
 
-#: View/Elements/global_menu.ctp:149
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:151
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-msgid "Maintenance"
-msgstr ""
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
+msgstr "Configuração de Servidores & Manutenção"
 
-#: View/Elements/global_menu.ctp:158
-#: View/Elements/side_menu.ctp:401
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr "Jobs"
 
-#: View/Elements/global_menu.ctp:160
-#: View/Elements/side_menu.ctp:403
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
 msgstr "Tarefas Agendadas"
 
-#: View/Elements/global_menu.ctp:165
-#: View/Elements/side_menu.ctp:407
+#: View/Elements/global_menu.ctp:300
+msgid "Blacklist Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
 msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:169
+#: View/Elements/global_menu.ctp:314
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/side_menu.ctp:411
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
 msgid "Manage Org Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:180
+#: View/Elements/global_menu.ctp:327
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:184
-#: View/Elements/side_menu.ctp:417
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:185
-#: View/Elements/side_menu.ctp:418
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr "Pesquisar Logs"
 
-#: View/Elements/global_menu.ctp:207;209
+#: View/Elements/global_menu.ctp:362;367
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -3540,407 +3964,8 @@ msgstr "Alternar histograma"
 msgid "Attributes per organization"
 msgstr "Atributos por organização"
 
-#: View/Elements/side_menu.ctp:17;78
-msgid "Populate From Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:24
-msgid "Freetext Import Result"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:31
-msgid "View Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:36;465;540
-msgid "View Correlation Graph"
-msgstr "Exibir Gráfico de Correlação"
-
-#: View/Elements/side_menu.ctp:41
-msgid "View Event History"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:48
-#: View/Events/edit.ctp:8
-msgid "Edit Event"
-msgstr "Editar evento"
-
-#: View/Elements/side_menu.ctp:50
-msgid "Delete Event"
-msgstr "Apagar Evento"
-
-#: View/Elements/side_menu.ctp:50;267;298;351;371
-#: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Servers/index.ctp:99
-msgid "Are you sure you want to delete # %s?"
-msgstr "Tem certeza que deseja excluir # %s?"
-
-#: View/Elements/side_menu.ctp:61
-msgid "Add Object"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:66
-msgid "Add Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:73
-msgid "Populate from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:86
-#: View/Events/ajax/enrich_event.ctp:2
-msgid "Enrich Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:91
-msgid "Merge attributes from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:98
-msgid "Propose Attribute"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:103
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:115
-#: View/Elements/Events/eventIndexTable.ctp:218
-msgid "Publish Event"
-msgstr "Publicar evento"
-
-#: View/Elements/side_menu.ctp:123
-msgid "Publish (no email)"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:132
-msgid "Delegate Publishing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:143
-#: View/EventDelegations/ajax/accept_delegation.ctp:2
-msgid "Accept Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:151
-msgid "Discard Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:157
-msgid "Publish event to ZMQ"
-msgstr "Publicar o evento para ZMQ"
-
-#: View/Elements/side_menu.ctp:162
-msgid "Contact Reporter"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:169
-msgid "Download as..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:201
-msgid "Import from…"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:224
-msgid "Download results as JSON"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:228
-msgid "Download results as XML"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:232
-msgid "Download results as CSV"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:242
-#: View/Pages/doc/general.ctp:39
-msgid "Events with proposals"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:259
-msgid "List Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:261
-msgid "New Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:262
-msgid "Perform on existing"
-msgstr "Executar em existentes"
-
-#: View/Elements/side_menu.ctp:266
-msgid "Edit Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:267
-msgid "Delete Regexp"
-msgstr "Excluir o Regexp"
-
-#: View/Elements/side_menu.ctp:273
-msgid "View Warninglist"
-msgstr "Visualizar a lista de avisos"
-
-#: View/Elements/side_menu.ctp:276
-msgid "Update Warninglists"
-msgstr "Atualizar a lista de avisos"
-
-#: View/Elements/side_menu.ctp:282
-msgid "View Noticelist"
-msgstr "Visualizar a lista de notificações"
-
-#: View/Elements/side_menu.ctp:285
-msgid "Update Noticelists"
-msgstr "Atualizar a lista de notificações"
-
-#: View/Elements/side_menu.ctp:291
-msgid "List Whitelist"
-msgstr "Listar a lista de permissões"
-
-#: View/Elements/side_menu.ctp:293
-msgid "New Whitelist"
-msgstr "Nova Whitelist"
-
-#: View/Elements/side_menu.ctp:297
-msgid "Edit Whitelist"
-msgstr "Editar Whitelist"
-
-#: View/Elements/side_menu.ctp:298
-msgid "Delete Whitelist"
-msgstr "Deletar Whitelist"
-
-#: View/Elements/side_menu.ctp:305
-#: View/Users/edit.ctp:4
-msgid "Edit My Profile"
-msgstr "Editar Meu Perfil"
-
-#: View/Elements/side_menu.ctp:306
-#: View/Pages/doc/administration.ctp:126
-#: View/Users/admin_edit.ctp:70
-#: View/Users/change_pw.ctp:4
-msgid "Change Password"
-msgstr "Mudar Senha"
-
-#: View/Elements/side_menu.ctp:321;389
-msgid "View Organisation"
-msgstr "Ver Organizações"
-
-#: View/Elements/side_menu.ctp:328
-#: View/SharingGroups/edit.ctp:3
-msgid "Edit Sharing Group"
-msgstr "Editar Grupo de Compartilhamento"
-
-#: View/Elements/side_menu.ctp:329
-msgid "View Sharing Group"
-msgstr "Visualizar Grupos de Compartilhamento"
-
-#: View/Elements/side_menu.ctp:342
-msgid "Explore Remote Event"
-msgstr "Explorar o evento remoto"
-
-#: View/Elements/side_menu.ctp:343
-msgid "Fetch This Event"
-msgstr "Buscar este evento"
-
-#: View/Elements/side_menu.ctp:343
-#: View/Feeds/preview_index.ctp:65
-#: View/Servers/preview_index.ctp:147
-msgid "Are you sure you want to fetch and save this event on your instance?"
-msgstr "Tem certeza que deseja buscar e salvar esse evento em sua instância?"
-
-#: View/Elements/side_menu.ctp:344;347
-msgid "Explore Remote Server"
-msgstr "Explorar o Servidor Remoto"
-
-#: View/Elements/side_menu.ctp:350
-#: View/Servers/edit.ctp:4
-msgid "Edit Server"
-msgstr "Editar servidor"
-
-#: View/Elements/side_menu.ctp:356
-msgid "New Server"
-msgstr "Novo Servidor"
-
-#: View/Elements/side_menu.ctp:363
-msgid "View User"
-msgstr "Ver Usuários"
-
-#: View/Elements/side_menu.ctp:364
-msgid "Reset Password"
-msgstr "Alterar Senha"
-
-#: View/Elements/side_menu.ctp:365
-msgid "Edit User"
-msgstr "Editar Usuário"
-
-#: View/Elements/side_menu.ctp:366
-msgid "Delete User"
-msgstr "Excluir Usuário"
-
-#: View/Elements/side_menu.ctp:366
-#: View/Elements/Users/userIndexTable.ctp:91
-msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
-msgstr "Tem certeza que deseja excluir # %s? É altamente recomendável nunca excluir usuários mas desativá-los em vez disso."
-
-#: View/Elements/side_menu.ctp:370
-#: View/Roles/admin_edit.ctp:4
-msgid "Edit Role"
-msgstr "Editar Função"
-
-#: View/Elements/side_menu.ctp:371
-msgid "Delete Role"
-msgstr "Remover Função"
-
-#: View/Elements/side_menu.ctp:385
-#: View/Organisations/admin_edit.ctp:4
-msgid "Edit Organisation"
-msgstr "Editar Organização"
-
-#: View/Elements/side_menu.ctp:386
-#: View/Organisations/ajax/merge.ctp:5
-msgid "Merge Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:398
-#: View/Servers/server_settings.ctp:5
-msgid "Server Settings & Maintenance"
-msgstr "Configuração de Servidores & Manutenção"
-
-#: View/Elements/side_menu.ctp:406
-msgid "Blacklists Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:410
-msgid "Blacklists Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:426;433
-msgid "View Thread"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:427
-#: View/Posts/add.ctp:4
-msgid "Add Post"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:434
-#: View/Posts/edit.ctp:4
-msgid "Edit Post"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:439
-msgid "List Threads"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:440
-msgid "New Thread"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:445
-msgid "List Favourite Tags"
-msgstr "Listar Tags Favoritas"
-
-#: View/Elements/side_menu.ctp:455
-msgid "Edit Tag"
-msgstr "Editar Tag"
-
-#: View/Elements/side_menu.ctp:461;473
-msgid "View Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:474
-msgid "Delete Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:492
-msgid "View Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:494
-#: View/Templates/edit.ctp:6
-msgid "Edit Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:502
-msgid "Add Feed"
-msgstr "Adicionar Feed"
-
-#: View/Elements/side_menu.ctp:503
-msgid "Import Feeds from JSON"
-msgstr "Importar Feeds do formato JSON"
-
-#: View/Elements/side_menu.ctp:504
-#: View/Feeds/compare_feeds.ctp:7
-msgid "Feed overlap analysis matrix"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:505
-msgid "Export Feed settings"
-msgstr "Exportar configurações de Feed"
-
-#: View/Elements/side_menu.ctp:507
-msgid "Edit Feed"
-msgstr "Editar Feed"
-
-#: View/Elements/side_menu.ctp:509
-msgid "PreviewIndex"
-msgstr "PreviewIndex"
-
-#: View/Elements/side_menu.ctp:511
-msgid "PreviewEvent"
-msgstr "PreviewEvent"
-
-#: View/Elements/side_menu.ctp:516
-msgid "View News"
-msgstr "Ver Novidades"
-
-#: View/Elements/side_menu.ctp:520
-#: View/News/add.ctp:6
-msgid "Add News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:522
-#: View/News/edit.ctp:6
-msgid "Edit News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:533
-msgid "Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:533
-msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:534
-msgid "Force Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:534
-msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:538;546
-msgid "View Galaxy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:539
-msgid "View Cluster"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:556
-msgid "Update Objects"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:561
-msgid "View Object Template"
-msgstr ""
-
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:84
+#: View/Layouts/default.ctp:87
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -3975,8 +4000,11 @@ msgid "Display"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Jobs/index.ctp:62
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
 #: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr ""
 
@@ -3989,12 +4017,12 @@ msgstr ""
 msgid "Toggle fullscreen"
 msgstr ""
 
-#: View/Elements/view_mitre_attack_matrix.ctp:27
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all events on current page"
 msgstr ""
 
@@ -4034,35 +4062,58 @@ msgstr ""
 msgid "#Posts"
 msgstr "#Postagens"
 
-#: View/Elements/Events/eventIndexTable.ctp:167
-msgid " correlation(s)"
-msgstr " correlação(ões)"
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/dashboard/dashboard_events.ctp:4;5
+#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
+#: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/preview_index.ctp:174
+#: View/Taxonomies/index.ctp:47
+#: View/Warninglists/index.ctp:60
+msgid "View"
+msgstr "Visualizar"
 
-#: View/Elements/Events/eventIndexTable.ctp:177;182
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
 msgid " proposal(s)"
 msgstr " proposta(s)"
 
-#: View/Elements/Events/eventIndexTable.ctp:187
+#: View/Elements/Events/eventIndexTable.ctp:190
 msgid "NEW"
 msgstr "NOVO"
 
-#: View/Elements/Events/eventIndexTable.ctp:207
-#: View/Jobs/index.ctp:15;63
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-msgid "All"
-msgstr "Todos(as)"
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
+msgstr "Publicar evento"
 
-#: View/Elements/Events/eventIndexTable.ctp:218
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:12
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
 msgid "Are you sure this event is complete and everyone should be informed?"
 msgstr "Tem certeza que este evento está completo, e que todos devem ser informados?"
 
-#: View/Elements/Events/eventIndexTable.ctp:219
+#: View/Elements/Events/eventIndexTable.ctp:222
 msgid "Not published"
 msgstr "Não publicado"
 
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr "Tem certeza que deseja excluir # %s?"
+
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid "Show "
 msgstr "Exibir "
@@ -4072,51 +4123,66 @@ msgid " more..."
 msgstr " mais..."
 
 #: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:295
+#: View/Events/view.ctp:346
 msgid "Collapse…"
 msgstr "Fechar…"
 
-#: View/Elements/Events/View/row_attribute.ctp:262
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr ""
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:343
 msgid "Restore attribute"
 msgstr "Restaurar atributo"
 
-#: View/Elements/Events/View/row_attribute.ctp:263;303
+#: View/Elements/Events/View/row_attribute.ctp:344;384
 msgid "Permanently delete attribute"
 msgstr "Excluir permanentemente o atributo"
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Propose enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Propose enrichment through Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:279
+#: View/Elements/Events/View/row_attribute.ctp:360
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:280
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:290;295
+#: View/Elements/Events/View/row_attribute.ctp:371;376
 msgid "Add enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:295
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Add enrichment via Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:307
+#: View/Elements/Events/View/row_attribute.ctp:388
 msgid "Soft-delete attribute"
 msgstr ""
 
@@ -4138,24 +4204,36 @@ msgid "Expand or Collapse"
 msgstr "Expandir ou Recolher"
 
 #: View/Elements/Events/View/row_object.ctp:69
-msgid "Meta-category: "
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
 msgstr ""
 
 #: View/Elements/Events/View/row_object.ctp:70
+msgid "Meta-category: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:71
 #: View/Elements/Feeds/View/row_object.ctp:21
 msgid "Description: "
 msgstr "Descrição: "
 
-#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Events/View/row_object.ctp:72
 #: View/Elements/Feeds/View/row_object.ctp:22
 msgid "Template: "
 msgstr "Template: "
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Permanently delete object"
 msgstr "Excluir permanentemente o objeto"
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Soft delete object"
 msgstr ""
 
@@ -4196,6 +4274,7 @@ msgstr ""
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
 #: View/Sightings/ajax/advanced.ctp:10
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 msgid "Add sighting"
 msgstr ""
 
@@ -4204,7 +4283,6 @@ msgid "Mark as false-positive"
 msgstr ""
 
 #: View/Elements/Events/View/sighting_field.ctp:14
-#: View/Events/view.ctp:203
 msgid "Advanced sightings"
 msgstr ""
 
@@ -4232,7 +4310,7 @@ msgstr ""
 
 #: View/Elements/Feeds/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object.ctp:20
-#: View/ObjectTemplates/view.ctp:19
+#: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:23
 msgid "Meta-category"
 msgstr ""
@@ -4247,7 +4325,7 @@ msgid "all"
 msgstr ""
 
 #: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/view.ctp:126
+#: View/Events/view.ctp:131
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
 #: View/Servers/preview_event.ctp:36
 #: View/Sightings/ajax/list_sightings.ctp:5
@@ -4273,12 +4351,13 @@ msgstr ""
 #: View/Elements/Servers/View/row_attribute.ctp:93
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/healthElements/files.ctp:61
-#: View/Elements/healthElements/workers.ctp:61;62;63
-#: View/Events/automation.ctp:403;410;417;438;445
+#: View/Elements/healthElements/workers.ctp:66;67;68
+#: View/Events/automation.ctp:234;241;248;269;276
 #: View/Events/export.ctp:68;88
-#: View/Taxonomies/view.ctp:96;107;152
-#: View/Users/admin_view.ctp:83;92;122
-#: View/Users/view.ctp:62
+#: View/Events/legacy_automation.ctp:403;410;417;438;445
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
 msgid "N/A"
 msgstr ""
 
@@ -4287,23 +4366,24 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
 #: View/Galaxies/view.ctp:14
-#: View/ObjectTemplates/view.ctp:11
+#: View/ObjectTemplates/view.ctp:4
 #: View/Objects/revise_object.ctp:19
 #: View/Organisations/ajax/merge.ctp:57;64
 #: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/view.ctp:9
-#: View/SharingGroups/add.ctp:11;31;51
-#: View/SharingGroups/edit.ctp:11;31;59
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
 #: View/SharingGroups/view.ctp:42;67
 #: View/Templates/view.ctp:9
 #: View/Users/statistics_orgs.ctp:31
-#: View/Warninglists/view.ctp:9
+#: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr ""
 
 #: View/Elements/Servers/View/row_object.ctp:21
 #: View/Elements/healthElements/files.ctp:8
-#: View/Elements/healthElements/settings_tab.ctp:16
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:10
 #: View/Elements/templateElements/populateTemplateDescription.ctp:12
 #: View/Elements/templateElements/populateTemplateFile.ctp:10
@@ -4311,19 +4391,19 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:27
 #: View/Galaxies/view.ctp:20
-#: View/ObjectTemplates/view.ctp:21
+#: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:16;94
-#: View/Organisations/view.ctp:32;89;90
+#: View/Organisations/view.ctp:15;58;59
 #: View/Pages/doc/administration.ctp:48;241
-#: View/Pages/doc/categories_and_types.ctp:50;67
+#: View/Pages/doc/categories_and_types.ctp:44;61
 #: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
 #: View/Servers/preview_event.ctp:65
-#: View/SharingGroups/add.ctp:15
-#: View/SharingGroups/edit.ctp:15
-#: View/SharingGroups/index.ctp:28
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
 #: View/Taxonomies/view.ctp:14
 #: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:14
+#: View/Warninglists/view.ctp:11
 msgid "Description"
 msgstr ""
 
@@ -4342,11 +4422,17 @@ msgstr ""
 msgid "Referenced by"
 msgstr ""
 
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
+
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:2
+#: View/Roles/view.ctp:24
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_view.ctp:19
-#: View/Users/view.ctp:19
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
 msgstr ""
 
@@ -4357,7 +4443,7 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:17
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:54
+#: View/ShadowAttributes/index.ctp:64
 msgid "Created"
 msgstr ""
 
@@ -4369,6 +4455,11 @@ msgstr ""
 msgid "Create new credentials and inform user"
 msgstr ""
 
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr "Tem certeza que deseja excluir # %s? É altamente recomendável nunca excluir usuários mas desativá-los em vez disso."
+
 #: View/Elements/dashboard/dashboard_events.ctp:2
 msgid "Changes since last visit"
 msgstr ""
@@ -4397,6 +4488,417 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr "Exibir Gráfico de Correlação"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr "Editar evento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr "Apagar Evento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr "Publicar o evento para ZMQ"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr "Executar em existentes"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr "Excluir o Regexp"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr "Visualizar a lista de avisos"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr "Atualizar a lista de avisos"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr "Visualizar a lista de notificações"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr "Atualizar a lista de notificações"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr "Listar a lista de permissões"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr "Nova Whitelist"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr "Editar Whitelist"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr "Deletar Whitelist"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr "Editar Meu Perfil"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr "Mudar Senha"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr "Alterar Senha"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr "Ver Organizações"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr "Editar Grupo de Compartilhamento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr "Visualizar Grupos de Compartilhamento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr "Explorar o Servidor Remoto"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr "Explorar o evento remoto"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr "Buscar este evento"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr "Tem certeza que deseja buscar e salvar esse evento em sua instância?"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr "Editar servidor"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr "Ver Usuários"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr "Editar Usuário"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr "Excluir Usuário"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr "Editar Função"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr "Remover Função"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr "Adicionar Organização"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr "Editar Organização"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr "Listar Tags Favoritas"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr "Editar Tag"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr "Adicionar Feed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr "Importar Feeds do formato JSON"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr "Exportar configurações de Feed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr "Editar Feed"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr "PreviewIndex"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr "PreviewEvent"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr "Ver Novidades"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr ""
+
 #: View/Elements/healthElements/diagnostics.ctp:5
 msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
 msgstr ""
@@ -4421,11 +4923,10 @@ msgstr ""
 msgid "Outdated version"
 msgstr "Versão desatualizada"
 
-#: View/Elements/healthElements/diagnostics.ctp:26;156;170;195
-#: View/Elements/healthElements/workers.ctp:18;71
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
+#: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
-#: View/Users/admin_view.ctp:81
 msgid "OK"
 msgstr "OK"
 
@@ -4445,131 +4946,135 @@ msgstr "Status…"
 msgid "Current branch…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Pull the latest MISP version from github"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Update MISP"
 msgstr "Atualizar MISP"
 
-#: View/Elements/healthElements/diagnostics.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "Writeable Directories and files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:67
+#: View/Elements/healthElements/diagnostics.ctp:65
 msgid "The following directories and files have to be writeable for MISP to function properly. Make sure that the apache user has write privileges for the directories below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:68
+#: View/Elements/healthElements/diagnostics.ctp:66
 msgid "Directories"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:75
+#: View/Elements/healthElements/diagnostics.ctp:73
 msgid "Directory "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:83
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Writeable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:90;104
+#: View/Elements/healthElements/diagnostics.ctp:88;102
 msgid "File "
 msgstr "Arquivo "
 
-#: View/Elements/healthElements/diagnostics.ctp:97
+#: View/Elements/healthElements/diagnostics.ctp:95
 msgid "Readable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:112
+#: View/Elements/healthElements/diagnostics.ctp:110
 msgid "PHP Settings"
 msgstr "Configurações do PHP"
 
-#: View/Elements/healthElements/diagnostics.ctp:115;127
+#: View/Elements/healthElements/diagnostics.ctp:113;125
 msgid "Up to date"
 msgstr "Atualizado"
 
-#: View/Elements/healthElements/diagnostics.ctp:121
-#: View/Elements/healthElements/workers.ctp:78;80
-#: View/Organisations/view.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:119
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: View/Elements/healthElements/diagnostics.ctp:123
+#: View/Elements/healthElements/diagnostics.ctp:121
 msgid "Issues determining version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:130;139
+#: View/Elements/healthElements/diagnostics.ctp:128;137
 msgid "Update highly recommended"
 msgstr "Atualização altamente recomendada"
 
-#: View/Elements/healthElements/diagnostics.ctp:133;142
+#: View/Elements/healthElements/diagnostics.ctp:131;140
 msgid "Version unsupported, update ASAP"
 msgstr "Versão não suportada, atualize assim que possível"
 
-#: View/Elements/healthElements/diagnostics.ctp:146
+#: View/Elements/healthElements/diagnostics.ctp:144
 msgid "PHP ini path"
 msgstr "PHP ini path"
 
-#: View/Elements/healthElements/diagnostics.ctp:147
+#: View/Elements/healthElements/diagnostics.ctp:145
 msgid "PHP Version"
 msgstr "Versão do PHP"
 
-#: View/Elements/healthElements/diagnostics.ctp:147;148
+#: View/Elements/healthElements/diagnostics.ctp:145;146
 msgid "recommended"
 msgstr "recomendado"
 
-#: View/Elements/healthElements/diagnostics.ctp:148
+#: View/Elements/healthElements/diagnostics.ctp:146
 msgid "PHP CLI Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:149
+#: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
 msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:156
+#: View/Elements/healthElements/diagnostics.ctp:155
 #: View/Events/filter_event_index.ctp:32;190
 #: View/Pages/doc/using_the_system.ctp:66;171
 msgid "Low"
 msgstr "Baixo"
 
-#: View/Elements/healthElements/diagnostics.ctp:160
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP Extensions"
 msgstr "Extensões do PHP"
 
-#: View/Elements/healthElements/diagnostics.ctp:170
+#: View/Elements/healthElements/diagnostics.ctp:169
 msgid "Not loaded"
 msgstr "Não carregado"
 
-#: View/Elements/healthElements/diagnostics.ctp:175
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:183
+#: View/Elements/healthElements/diagnostics.ctp:182
 msgid "Advanced attachment handler"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:184
+#: View/Elements/healthElements/diagnostics.ctp:183
 msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PyMISP"
 msgstr "PyMISP"
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "Not installed or version outdated."
 msgstr "Não instalado ou versão desatualizada."
 
-#: View/Elements/healthElements/diagnostics.ctp:201
+#: View/Elements/healthElements/diagnostics.ctp:200
 msgid "STIX and Cybox libraries"
 msgstr "Bibliotecas STIX e Cybox"
 
-#: View/Elements/healthElements/diagnostics.ctp:202
+#: View/Elements/healthElements/diagnostics.ctp:201
 msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:203
+#: View/Elements/healthElements/diagnostics.ctp:202
 msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
 msgstr ""
 
@@ -4806,72 +5311,35 @@ msgid "Permissions"
 msgstr "Permissões"
 
 #: View/Elements/healthElements/files.ctp:73
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
 #: View/Roles/admin_index.ctp:67
-#: View/SharingGroups/index.ctp:68
+#: View/SharingGroups/index.ctp:87
 msgid "Are you sure you want to delete %s?"
 msgstr "Tem certeza que deseja excluir %s?"
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:5
 msgid "Good, but there are some optional settings that are incorrect / not set."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:6
 msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
-msgid "Overall health"
+msgid "Test"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:17
-msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:26
-msgid " settings incorrectly or not set"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:27
-msgid " incorrect settings."
-msgstr " configurações incorretas."
-
-#: View/Elements/healthElements/overview.ctp:33
-msgid "Critical issues revealed by the diagnostics"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:34
-msgid " issues detected."
-msgstr " problemas detectados."
-
-#: View/Elements/healthElements/overview.ctp:35
-msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:9
-msgid "Toggle subgroup"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:13
-#: View/Pages/doc/administration.ctp:45
-msgid "Priority"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:14
-#: View/Pages/doc/administration.ctp:46
-msgid "Setting"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:15
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
 #: View/Events/filter_event_index.ctp:134
 #: View/Events/resolved_attributes.ctp:45
 #: View/Events/show_i_o_c_results.ctp:13
@@ -4886,128 +5354,166 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: View/Elements/healthElements/settings_tab.ctp:17
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:3;15;27;36
-#: View/Events/index.ctp:30;58
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
-#: View/Users/admin_index.ctp:28
-msgid "Modify filters"
-msgstr ""
-
-#: View/Elements/healthElements/tabs.ctp:3
+#: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:28
-#: View/Pages/doc/administration.ctp:38
-msgid "Diagnostics"
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:37
-#: View/Pages/doc/administration.ctp:39
-msgid "Workers"
+#: View/Elements/healthElements/tabs.ctp:34
+#: View/Pages/doc/administration.ctp:38
+msgid "Diagnostics"
 msgstr ""
 
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:48
+#: View/Elements/healthElements/tabs.ctp:50;65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:5
-msgid "Warning"
-msgstr "Aviso"
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
+msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:5
 msgid "MISP cannot access your /proc directory to check the status of the worker processes, which means that dead workers will not be detected by the diagnostic tool. If you would like to regain this functionality, make sure that the open_basedir directive is not set, or that /proc is included in it."
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:10
-msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgid "Note:"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "You have set the \"manage_workers\" variable to \"false\", therefore worker controls have been disabled."
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:15
+msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:20
 msgid "Worker started with the correct user, but the current status is unknown."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:24
+#: View/Elements/healthElements/workers.ctp:29
 msgid "There are issues with the worker(s), but at least one healthy worker is monitoring the queue."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:30
+#: View/Elements/healthElements/workers.ctp:35
 msgid "Worker type: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:32
+#: View/Elements/healthElements/workers.ctp:37
 msgid "Jobs in the queue: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:40
+#: View/Elements/healthElements/workers.ctp:45
 msgid "Queue status: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:51
+#: View/Elements/healthElements/workers.ctp:56
 msgid "Worker PID"
 msgstr "Worker PID"
 
-#: View/Elements/healthElements/workers.ctp:52
+#: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
-#: View/Users/admin_view.ctp:7
-#: View/Users/view.ctp:2
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
 msgid "User"
 msgstr "Usuário"
 
-#: View/Elements/healthElements/workers.ctp:53
+#: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:54
+#: View/Elements/healthElements/workers.ctp:59
 msgid "Information"
 msgstr "Informação"
 
-#: View/Elements/healthElements/workers.ctp:64
+#: View/Elements/healthElements/workers.ctp:69
 msgid "Worker not running!"
 msgstr "Worker não está funcionando!"
 
-#: View/Elements/healthElements/workers.ctp:72
+#: View/Elements/healthElements/workers.ctp:77
 msgid "The worker appears to be healthy."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:75
+#: View/Elements/healthElements/workers.ctp:80
 msgid "The worker was started with a user other than the apache user. MISP cannot check whether the worker is alive or not."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:81
+#: View/Elements/healthElements/workers.ctp:86
 msgid "Cannot check whether the worker is alive or dead."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:85
+#: View/Elements/healthElements/workers.ctp:90
 msgid "Dead"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:86
+#: View/Elements/healthElements/workers.ctp:91
 msgid "The Worker appears to be dead."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:100
+#: View/Elements/healthElements/workers.ctp:106
 msgid "Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:111
+#: View/Elements/healthElements/workers.ctp:119
 msgid "Start a worker"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:119
+#: View/Elements/healthElements/workers.ctp:130
 msgid "Restart all workers"
 msgstr ""
 
@@ -5138,16 +5644,16 @@ msgstr ""
 #: View/Objects/revise_object.ctp:45
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
-#: View/Pages/doc/categories_and_types.ctp:66
+#: View/Pages/doc/categories_and_types.ctp:60
 #: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
-#: View/ShadowAttributes/index.ctp:36;51
-#: View/SharingGroups/add.ctp:30
-#: View/SharingGroups/edit.ctp:30
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
 #: View/Sightings/ajax/list_sightings.ctp:7
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:35
-#: View/Warninglists/view.ctp:24
+#: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr ""
 
@@ -5186,7 +5692,7 @@ msgid "Template Name"
 msgstr ""
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:60
+#: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr ""
@@ -5206,7 +5712,7 @@ msgid "s"
 msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
-#: View/ObjectReferences/ajax/add.ctp:60
+#: View/ObjectReferences/ajax/add.ctp:86
 #: View/Objects/revise_object.ctp:43
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
@@ -5220,9 +5726,9 @@ msgstr ""
 #: View/Feeds/freetext_index.ctp:31
 #: View/Objects/add.ctp:95
 #: View/Objects/revise_object.ctp:44
-#: View/Pages/doc/categories_and_types.ctp:17;23;37;43;49
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
 #: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
-#: View/ShadowAttributes/index.ctp:48
+#: View/ShadowAttributes/index.ctp:58
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_add_file.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
@@ -5232,7 +5738,7 @@ msgid "Category"
 msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
-#: View/Pages/doc/categories_and_types.ctp:63
+#: View/Pages/doc/categories_and_types.ctp:57
 #: View/Pages/doc/using_the_system.ctp:109
 #: View/Pages/doc/md/categories_and_types.ctp:33
 msgid "Types"
@@ -5461,45 +5967,33 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
-#: View/Events/add.ctp:3
-msgid "The event created %s, but not synchronised to other MISP instances until it is published."
-msgstr ""
-
-#: View/Events/add.ctp:3
-msgid "will be restricted to your organisation"
-msgstr ""
-
-#: View/Events/add.ctp:3
-msgid "will be visible to the organisations having an account on this platform"
-msgstr ""
-
-#: View/Events/add.ctp:48
+#: View/Events/add.ctp:44
 #: View/Events/edit.ctp:35
 msgid "Threat Level "
 msgstr ""
 
-#: View/Events/add.ctp:52
+#: View/Events/add.ctp:48
 #: View/Events/edit.ctp:38
 msgid "Analysis "
 msgstr ""
 
-#: View/Events/add.ctp:56
+#: View/Events/add.ctp:52
 #: View/Events/edit.ctp:43
-#: View/ShadowAttributes/index.ctp:42
+#: View/ShadowAttributes/index.ctp:52
 msgid "Event Info"
 msgstr ""
 
-#: View/Events/add.ctp:60
+#: View/Events/add.ctp:56
 #: View/Events/edit.ctp:47
 msgid "Quick Event Description or Tracking Info"
 msgstr ""
 
-#: View/Events/add.ctp:63
+#: View/Events/add.ctp:59
 #: View/Events/edit.ctp:50
 msgid "Extends event"
 msgstr ""
 
-#: View/Events/add.ctp:66
+#: View/Events/add.ctp:62
 #: View/Events/edit.ctp:53
 msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr ""
@@ -5510,7 +6004,8 @@ msgstr ""
 
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
-#: View/Events/upload_stix.ctp:22
+#: View/Events/upload_analysis_file.ctp:22
+#: View/Events/upload_stix.ctp:29
 msgid "Upload"
 msgstr ""
 
@@ -5548,7 +6043,7 @@ msgid "Details"
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:89
+#: View/Jobs/index.ctp:124
 msgid "Failed"
 msgstr ""
 
@@ -5561,781 +6056,677 @@ msgid "Event with this UUID already exists."
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr ""
 
 #: View/Events/automation.ctp:3
-msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
-"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
-"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgid "Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.\n"
+"    To to make this functionality available for automated tools an authentication key is used."
 msgstr ""
 
 #: View/Events/automation.ctp:6
-msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgid "Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP."
 msgstr ""
 
-#: View/Events/automation.ctp:7
+#: View/Events/automation.ctp:9
+#: View/Events/legacy_automation.ctp:7
 msgid "Your current key is: <code>%s</code>.\n"
 "    You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:8
+#: View/Events/automation.ctp:10
+#: View/Events/legacy_automation.ctp:8
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:10
-msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
-msgstr ""
-
-#: View/Events/automation.ctp:11
-msgid "Please use the use the following header"
-msgstr ""
-
-#: View/Events/automation.ctp:12
-msgid "Authorization"
-msgstr ""
-
-#: View/Events/automation.ctp:13
-msgid "XML Export"
-msgstr ""
-
 #: View/Events/automation.ctp:14
-msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+#: View/Logs/admin_index.ctp:20;21
+msgid "Search"
 msgstr ""
 
-#: View/Events/automation.ctp:15;47;76
-msgid "You can configure your tools to automatically download the following file"
+#: View/Events/automation.ctp:16
+#: View/Events/legacy_automation.ctp:264
+msgid "It is possible to search the database for attributes based on a list of criteria."
 msgstr ""
 
 #: View/Events/automation.ctp:17
-msgid "If you only want to fetch a specific event append the eventid number"
+#: View/Events/legacy_automation.ctp:265
+msgid "To return an event or a list of events in a desired format, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:19;144
-msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+#: View/Events/automation.ctp:18
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
 msgstr ""
 
-#: View/Events/automation.ctp:26
-msgid "The xml download also accepts two additional the following optional parameters in the URL"
+#: View/Events/automation.ctp:21
+msgid "Set the return format of the search (Currently supported: json, xml, openioc, suricata, snort - more formats are being moved to restSearch with the goal being that all searches happen through this API). Can be passed as the first parameter after restSearch or via the JSON payload."
 msgstr ""
 
-#: View/Events/automation.ctp:29;52;85
-msgid "Restrict the download to a single event"
+#: View/Events/automation.ctp:22
+msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
 msgstr ""
 
-#: View/Events/automation.ctp:30
-msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+#: View/Events/automation.ctp:23
+msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
 msgstr ""
 
-#: View/Events/automation.ctp:31;54;87;112;134
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:24
+#: View/Events/legacy_automation.ctp:268;297
+msgid "Search for the given value in the attributes' value field."
 msgstr ""
 
-#: View/Events/automation.ctp:37;64;91;117;140;203;254;279
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:38;65;92;118;141;204;255;280
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:39;119;142;205;256;281;306
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:41;70;97;122;259;290
-msgid "The keywords false or null should be used for optional empty parameters in the URL."
-msgstr ""
-
-#: View/Events/automation.ctp:43
-msgid "Also check out the %s to read about the REST API."
-msgstr ""
-
-#: View/Events/automation.ctp:45
-msgid "CSV Export"
-msgstr ""
-
-#: View/Events/automation.ctp:46
-msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
-msgstr ""
-
-#: View/Events/automation.ctp:49
-msgid "You can specify additional flags for CSV exports as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:53
-msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
-msgstr ""
-
-#: View/Events/automation.ctp:58
-msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:61;270;299
-msgid "The attribute category, any valid MISP attribute category is accepted."
-msgstr ""
-
-#: View/Events/automation.ctp:62;199;269;298
+#: View/Events/automation.ctp:25
+#: View/Events/legacy_automation.ctp:62;199;269;298
 msgid "The attribute type, any valid MISP attribute type is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:63
-msgid "Include the event data with each attribute."
+#: View/Events/automation.ctp:26
+#: View/Events/legacy_automation.ctp:61;270;299
+msgid "The attribute category, any valid MISP attribute category is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:66
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+#: View/Events/automation.ctp:27
+#: View/Events/legacy_automation.ctp:271;300
+msgid "Search by the creator organisation by supplying the organisation identifier."
 msgstr ""
 
-#: View/Events/automation.ctp:67
-msgid "The CSV created when this setting is set to true will not contain the header row.\n"
-"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:71
-msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:74
-msgid "NIDS rules export"
-msgstr ""
-
-#: View/Events/automation.ctp:75
-msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:81
-msgid "The full API syntax is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:84
-msgid "The export format, can be \"suricata\" or \"snort\""
-msgstr ""
-
-#: View/Events/automation.ctp:86
-msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
-msgstr ""
-
-#: View/Events/automation.ctp:93
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:94
-msgid "Restrict the export to only use the given types."
-msgstr ""
-
-#: View/Events/automation.ctp:95;120;174;206;257
-msgid "All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:96
-msgid "All tags will be included even if not exportable."
-msgstr ""
-
-#: View/Events/automation.ctp:98
-msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
-msgstr ""
-
-#: View/Events/automation.ctp:100
-msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
-msgstr ""
-
-#: View/Events/automation.ctp:102
-msgid "Hash database export"
-msgstr ""
-
-#: View/Events/automation.ctp:103
-msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:104;188
-msgid "You can configure your tools to automatically download the following files"
-msgstr ""
-
-#: View/Events/automation.ctp:109
-msgid "The API's full format is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:111
-msgid "The export format, can be \"md5\" or \"sha1\""
-msgstr ""
-
-#: View/Events/automation.ctp:123
-msgid "For example, to only show sha1 values from events tagged tag1, use"
-msgstr ""
-
-#: View/Events/automation.ctp:126
-msgid "STIX export"
-msgstr ""
-
-#: View/Events/automation.ctp:127
-msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
-msgstr ""
-
-#: View/Events/automation.ctp:129
-msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:132;171
-msgid "The event's ID"
-msgstr ""
-
-#: View/Events/automation.ctp:133
-msgid "Encode attachments where applicable"
-msgstr ""
-
-#: View/Events/automation.ctp:151
-msgid "Various ways to narrow down the search results of the STIX export"
-msgstr ""
-
-#: View/Events/automation.ctp:152
-msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
-msgstr ""
-
-#: View/Events/automation.ctp:154
-msgid "To export the same events using a POST request use"
-msgstr ""
-
-#: View/Events/automation.ctp:156
-msgid "Together with this JSON object in the POST message"
-msgstr ""
-
-#: View/Events/automation.ctp:158
-msgid "XML is automagically assumed when using the stix export"
-msgstr ""
-
-#: View/Events/automation.ctp:160
-msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
-msgstr ""
-
-#: View/Events/automation.ctp:163
-msgid "RPZ export"
-msgstr ""
-
-#: View/Events/automation.ctp:164
-msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
-msgstr ""
-
-#: View/Events/automation.ctp:165
-msgid "It is possible to further restrict the exported values using the following filters"
-msgstr ""
-
-#: View/Events/automation.ctp:167
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
-"        "
-msgstr ""
-
-#: View/Events/automation.ctp:170
-msgid "Use semicolons instead (the search will automatically search for colons instead)"
-msgstr ""
-
-#: View/Events/automation.ctp:172
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
-msgstr ""
-
-#: View/Events/automation.ctp:173
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
-msgstr ""
-
-#: View/Events/automation.ctp:176
-msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:180
-msgid "To override the above values, either use the url parameters as described below"
-msgstr ""
-
-#: View/Events/automation.ctp:182
-msgid "or POST an XML or JSON object with the above listed options"
-msgstr ""
-
-#: View/Events/automation.ctp:186
-msgid "Text export"
-msgstr ""
-
-#: View/Events/automation.ctp:187
-msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:194
-msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
-msgstr ""
-
-#: View/Events/automation.ctp:197
-msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
-msgstr ""
-
-#: View/Events/automation.ctp:200
+#: View/Events/automation.ctp:28
+#: View/Events/legacy_automation.ctp:200
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'."
 msgstr ""
 
-#: View/Events/automation.ctp:201
-msgid "Only export the attributes of the given event ID"
+#: View/Events/automation.ctp:29
+#: View/Events/legacy_automation.ctp:278
+msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
 msgstr ""
 
-#: View/Events/automation.ctp:202
-msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+#: View/Events/automation.ctp:30;151
+#: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:207
-msgid "Include not published Events."
+#: View/Events/automation.ctp:31;152
+#: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:208;275
-msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:32
+#: View/Events/legacy_automation.ctp:282;307
+msgid "The events that should be included / excluded from the search"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:33
+#: View/Events/legacy_automation.ctp:283;308
+msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
+msgstr ""
+
+#: View/Events/automation.ctp:34
+#: View/Events/legacy_automation.ctp:284
+msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
+msgstr ""
+
+#: View/Events/automation.ctp:35
+#: View/Events/legacy_automation.ctp:285;309
+msgid "Restrict the results by uuid."
+msgstr ""
+
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:37
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:38
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:39
+#: View/Events/legacy_automation.ctp:288;311
+msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
+msgstr ""
+
+#: View/Events/automation.ctp:40
+#: View/Events/legacy_automation.ctp:289;313
+msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
+msgstr ""
+
+#: View/Events/automation.ctp:41
+#: View/Events/legacy_automation.ctp:314
+msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
+msgstr ""
+
+#: View/Events/automation.ctp:42
+#: View/Events/legacy_automation.ctp:315
+msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
+msgstr ""
+
+#: View/Events/automation.ctp:43
+#: View/Events/legacy_automation.ctp:316
+msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:44
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:45
+msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
+msgstr ""
+
+#: View/Events/automation.ctp:46
+msgid "Filter on the event's info field."
+msgstr ""
+
+#: View/Events/automation.ctp:47
+msgid "Search for a full or a substring (delimited by % for substrings) in the event info, event tags, attribute tags, attribute values or attribute comment fields."
+msgstr ""
+
+#: View/Events/automation.ctp:48
+msgid "CSV only, select the fields that you wish to include in the CSV export. By setting event level fields additionally, includeContext is not required to get event metadata."
+msgstr ""
+
+#: View/Events/automation.ctp:49
+msgid "CSV only, add additional event level data to the export. The additional fields can be added via requested_attributes too with more granularity."
+msgstr ""
+
+#: View/Events/automation.ctp:79
+msgid "CSV specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:81
+msgid "Limit the list of fields to be returned in the CSV."
+msgstr ""
+
+#: View/Events/automation.ctp:82
+msgid "Include the event level meta-data with each attribute."
+msgstr ""
+
+#: View/Events/automation.ctp:83
+msgid "The CSV created when this setting is set to true will not contain the header row."
+msgstr ""
+
+#: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
+msgid "RPZ specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:95
+#: View/Events/legacy_automation.ctp:164
+msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
+msgstr ""
+
+#: View/Events/automation.ctp:98
+#: View/Events/legacy_automation.ctp:176
+msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
+msgstr ""
+
+#: View/Events/automation.ctp:102
+#: View/Events/legacy_automation.ctp:180
+msgid "To override the above values, either use the url parameters as described below"
+msgstr ""
+
+#: View/Events/automation.ctp:104
+#: View/Events/legacy_automation.ctp:182
+msgid "or POST an XML or JSON object with the above listed options"
+msgstr ""
+
+#: View/Events/automation.ctp:108
+#: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:109
+#: View/Events/legacy_automation.ctp:212
 msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
 msgstr ""
 
-#: View/Events/automation.ctp:213
+#: View/Events/automation.ctp:110
+#: View/Events/legacy_automation.ctp:213
 msgid "You can configure your tools to automatically download a file one of the Bro types."
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:116
+#: View/Events/legacy_automation.ctp:219
 msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
 msgstr ""
 
-#: View/Events/automation.ctp:222
+#: View/Events/automation.ctp:119
+#: View/Events/legacy_automation.ctp:222
 msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
 msgstr ""
 
-#: View/Events/automation.ctp:240
+#: View/Events/automation.ctp:137
+#: View/Events/legacy_automation.ctp:240
 msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
 msgstr ""
 
-#: View/Events/automation.ctp:242
+#: View/Events/automation.ctp:139
+#: View/Events/legacy_automation.ctp:242
 msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:249;301
+#: View/Events/automation.ctp:146
+#: View/Events/legacy_automation.ctp:249;301
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
 "    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
 "    Use semicolons instead (the search will automatically search for colons instead)."
 msgstr ""
 
-#: View/Events/automation.ctp:252
+#: View/Events/automation.ctp:149
+#: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:150
+#: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:154
+#: View/Events/legacy_automation.ctp:95;120;174;206;257
+msgid "All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/automation.ctp:156
+#: View/Events/legacy_automation.ctp:41;70;97;122;259;290
+msgid "The keywords false or null should be used for optional empty parameters in the URL."
+msgstr ""
+
+#: View/Events/automation.ctp:157
+#: View/Events/legacy_automation.ctp:260
 msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
 msgstr ""
 
-#: View/Events/automation.ctp:263
-msgid "Searches with JSON/XML/OpenIOC results"
-msgstr ""
-
-#: View/Events/automation.ctp:264
-msgid "It is possible to search the database for attributes based on a list of criteria."
-msgstr ""
-
-#: View/Events/automation.ctp:265
-msgid "To return an event or a list of events in a desired format, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:267
-msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
-msgstr ""
-
-#: View/Events/automation.ctp:268;297
-msgid "Search for the given value in the attributes' value field."
-msgstr ""
-
-#: View/Events/automation.ctp:271;300
-msgid "Search by the creator organisation by supplying the organisation identifier."
-msgstr ""
-
-#: View/Events/automation.ctp:272
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
-msgstr ""
-
-#: View/Events/automation.ctp:278
-msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
-msgstr ""
-
-#: View/Events/automation.ctp:282;307
-msgid "The events that should be included / excluded from the search"
-msgstr ""
-
-#: View/Events/automation.ctp:283;308
-msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
-msgstr ""
-
-#: View/Events/automation.ctp:284
-msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
-msgstr ""
-
-#: View/Events/automation.ctp:285;309
-msgid "Restrict the results by uuid."
-msgstr ""
-
-#: View/Events/automation.ctp:286;310
-msgid "Restrict the results by the last publish timestamp (newer than)."
-msgstr ""
-
-#: View/Events/automation.ctp:287
-msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
-msgstr ""
-
-#: View/Events/automation.ctp:288;311
-msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
-msgstr ""
-
-#: View/Events/automation.ctp:289;313
-msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
-msgstr ""
-
-#: View/Events/automation.ctp:291
-msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
-msgstr ""
-
-#: View/Events/automation.ctp:294;320;349
-msgid "POST message payload (json)"
-msgstr ""
-
-#: View/Events/automation.ctp:296
-msgid "To just return a list of attributes, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:304
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
-msgstr ""
-
-#: View/Events/automation.ctp:305
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
-msgstr ""
-
-#: View/Events/automation.ctp:312
-msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
-msgstr ""
-
-#: View/Events/automation.ctp:314
-msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
-msgstr ""
-
-#: View/Events/automation.ctp:315
-msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
-msgstr ""
-
-#: View/Events/automation.ctp:316
-msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
-msgstr ""
-
-#: View/Events/automation.ctp:317
-msgid "Only return attributes from events that have received a modification after the given timestamp."
-msgstr ""
-
-#: View/Events/automation.ctp:322
-msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
-msgstr ""
-
-#: View/Events/automation.ctp:324
-msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
-"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:327
-msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
-msgstr ""
-
-#: View/Events/automation.ctp:329
+#: View/Events/automation.ctp:160
+#: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:330
+#: View/Events/automation.ctp:161
+#: View/Events/legacy_automation.ctp:330
 msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:332
+#: View/Events/automation.ctp:163
+#: View/Events/legacy_automation.ctp:332
 msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
 "    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
 "    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:168
+#: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:169
+#: View/Events/legacy_automation.ctp:338
 msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:340
+#: View/Events/automation.ctp:171
+#: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:341
+#: View/Events/automation.ctp:172
+#: View/Events/legacy_automation.ctp:341
 msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
 msgstr ""
 
-#: View/Events/automation.ctp:342
+#: View/Events/automation.ctp:173
+#: View/Events/legacy_automation.ctp:342
 msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
 msgstr ""
 
-#: View/Events/automation.ctp:343
+#: View/Events/automation.ctp:174
+#: View/Events/legacy_automation.ctp:343
 msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
 msgstr ""
 
-#: View/Events/automation.ctp:345
+#: View/Events/automation.ctp:176
+#: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:353
+#: View/Events/automation.ctp:180
+#: View/Events/legacy_automation.ctp:294;320;349
+msgid "POST message payload (json)"
+msgstr ""
+
+#: View/Events/automation.ctp:184
+#: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:354
+#: View/Events/automation.ctp:185
+#: View/Events/legacy_automation.ctp:354
 msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
 msgstr ""
 
-#: View/Events/automation.ctp:355
+#: View/Events/automation.ctp:186
+#: View/Events/legacy_automation.ctp:355
 msgid "If set, it will return all samples from events that have a match for the hash provided above."
 msgstr ""
 
-#: View/Events/automation.ctp:356
+#: View/Events/automation.ctp:187
+#: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:357
+#: View/Events/automation.ctp:188
+#: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:359
+#: View/Events/automation.ctp:190
+#: View/Events/legacy_automation.ctp:359
 msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
 msgstr ""
 
-#: View/Events/automation.ctp:360
+#: View/Events/automation.ctp:191
+#: View/Events/legacy_automation.ctp:360
 msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
 msgstr ""
 
-#: View/Events/automation.ctp:361
+#: View/Events/automation.ctp:192
+#: View/Events/legacy_automation.ctp:361
 msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
 msgstr ""
 
-#: View/Events/automation.ctp:362
+#: View/Events/automation.ctp:193
+#: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:371
+#: View/Events/automation.ctp:202
+#: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:372
+#: View/Events/automation.ctp:203
+#: View/Events/legacy_automation.ctp:372
 msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
 msgstr ""
 
-#: View/Events/automation.ctp:373
+#: View/Events/automation.ctp:204
+#: View/Events/legacy_automation.ctp:373
 msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:374
+#: View/Events/automation.ctp:205
+#: View/Events/legacy_automation.ctp:374
 msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
 msgstr ""
 
-#: View/Events/automation.ctp:375
+#: View/Events/automation.ctp:206
+#: View/Events/legacy_automation.ctp:375
 msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 msgstr ""
 
-#: View/Events/automation.ctp:376
+#: View/Events/automation.ctp:207
+#: View/Events/legacy_automation.ctp:376
 msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
 msgstr ""
 
-#: View/Events/automation.ctp:377
+#: View/Events/automation.ctp:208
+#: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:378
+#: View/Events/automation.ctp:209
+#: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:379
+#: View/Events/automation.ctp:210
+#: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr ""
 
-#: View/Events/automation.ctp:380
+#: View/Events/automation.ctp:211
+#: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:381
+#: View/Events/automation.ctp:212
+#: View/Events/legacy_automation.ctp:381
 msgid "You can add or remove an existing tag from an event in the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:384
+#: View/Events/automation.ctp:215
+#: View/Events/legacy_automation.ctp:384
 msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
 msgstr ""
 
-#: View/Events/automation.ctp:386
+#: View/Events/automation.ctp:217
+#: View/Events/legacy_automation.ctp:386
 msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:388
+#: View/Events/automation.ctp:219
+#: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:389
+#: View/Events/automation.ctp:220
+#: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr ""
 
-#: View/Events/automation.ctp:393
+#: View/Events/automation.ctp:224
+#: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:394
+#: View/Events/automation.ctp:225
+#: View/Events/legacy_automation.ctp:394
 #: View/Pages/doc/using_the_system.ctp:445
-#: View/SharingGroups/add.ctp:52
-#: View/SharingGroups/edit.ctp:60
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
 msgid "URL"
 msgstr ""
 
-#: View/Events/automation.ctp:395
+#: View/Events/automation.ctp:226
+#: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:396
+#: View/Events/automation.ctp:227
+#: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:397
-#: View/Servers/rest.ctp:53
+#: View/Events/automation.ctp:228
+#: View/Events/legacy_automation.ctp:397
+#: View/Servers/rest.ctp:115
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:402
+#: View/Events/automation.ctp:233
+#: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:404;424;425;431;432
+#: View/Events/automation.ctp:235;255;256;262;263
+#: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:409
+#: View/Events/automation.ctp:240
+#: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:411;418
+#: View/Events/automation.ctp:242;249
+#: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:416
+#: View/Events/automation.ctp:247
+#: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:423
+#: View/Events/automation.ctp:254
+#: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:430
+#: View/Events/automation.ctp:261
+#: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:437
+#: View/Events/automation.ctp:268
+#: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:439;446
+#: View/Events/automation.ctp:270;277
+#: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
 #: View/Pages/doc/using_the_system.ctp:254
 msgid "Message"
 msgstr ""
 
-#: View/Events/automation.ctp:444
+#: View/Events/automation.ctp:275
+#: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:449
+#: View/Events/automation.ctp:280
+#: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:454
+#: View/Events/automation.ctp:285
+#: View/Events/legacy_automation.ctp:454
 msgid "None of the above fields are mandatory, but at least one of them has to be provided."
 msgstr ""
 
-#: View/Events/automation.ctp:456
+#: View/Events/automation.ctp:287
+#: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:457
+#: View/Events/automation.ctp:288
+#: View/Events/legacy_automation.ctp:457
 msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
 msgstr ""
 
-#: View/Events/automation.ctp:461
+#: View/Events/automation.ctp:292
+#: View/Events/legacy_automation.ctp:461
 msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
 "    An example for a valid lookup"
 msgstr ""
 
-#: View/Events/automation.ctp:472
+#: View/Events/automation.ctp:303
+#: View/Events/legacy_automation.ctp:472
 msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
 msgstr ""
 
-#: View/Events/automation.ctp:473
+#: View/Events/automation.ctp:304
+#: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:474
+#: View/Events/automation.ctp:305
+#: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:475
+#: View/Events/automation.ctp:306
+#: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:476
+#: View/Events/automation.ctp:307
+#: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:477
+#: View/Events/automation.ctp:308
+#: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:478
+#: View/Events/automation.ctp:309
+#: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:479
+#: View/Events/automation.ctp:310
+#: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:480
+#: View/Events/automation.ctp:311
+#: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:481
+#: View/Events/automation.ctp:312
+#: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:482
+#: View/Events/automation.ctp:313
+#: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:483
+#: View/Events/automation.ctp:314
+#: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:484
+#: View/Events/automation.ctp:315
+#: View/Events/legacy_automation.ctp:484
 msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:485
+#: View/Events/automation.ctp:316
+#: View/Events/legacy_automation.ctp:485
 msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
+#: View/Events/automation.ctp:319
+msgid "Freetext Import API"
+msgstr ""
+
+#: View/Events/automation.ctp:321
+msgid "The freetext import tool is also exposed to the API."
+msgstr ""
+
+#: View/Events/automation.ctp:322
+msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
+msgstr ""
+
+#: View/Events/automation.ctp:323
+msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:324
+msgid "The contents of the POST body should be the text to be parsed."
+msgstr ""
+
 #: View/Events/contact.ctp:8
 msgid "Contact organization reporting event "
 msgstr ""
@@ -6529,7 +6920,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:9;101
+#: View/Jobs/index.ctp:9;136
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr ""
@@ -6553,7 +6944,7 @@ msgid "All communities"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:53
+#: View/Feeds/index.ctp:103
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -6605,47 +6996,378 @@ msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/Organisations/view.ctp:97;98
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:33
 msgid "Events"
 msgstr ""
 
-#: View/Events/index.ctp:30
-msgid "Filter events"
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
 msgstr ""
 
-#: View/Events/index.ctp:31
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr ""
 
-#: View/Events/index.ctp:44
-msgid "Quickfilter"
+#: View/Events/index.ctp:73
+msgid "My events only"
 msgstr ""
 
-#: View/Events/index.ctp:44
-#: View/Organisations/index.ctp:59
-#: View/Servers/preview_index.ctp:45
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr ""
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr ""
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr ""
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
 msgid "Filter"
 msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My events only"
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
 msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My Events"
+#: View/Events/legacy_automation.ctp:3
+msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
+"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
 msgstr ""
 
-#: View/Events/index.ctp:72
-msgid "My organisation's events only"
+#: View/Events/legacy_automation.ctp:6
+msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
-#: View/Events/index.ctp:72
-msgid "Org Events"
+#: View/Events/legacy_automation.ctp:10
+msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:11
+msgid "Please use the use the following header"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:12
+msgid "Authorization"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:13
+msgid "XML Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:14
+msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:15;47;76
+msgid "You can configure your tools to automatically download the following file"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:17
+msgid "If you only want to fetch a specific event append the eventid number"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:19;144
+msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:26
+msgid "The xml download also accepts two additional the following optional parameters in the URL"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:29;52;85
+msgid "Restrict the download to a single event"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:30
+msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:31;54;87;112;134
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:43
+msgid "Also check out the %s to read about the REST API."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:45
+msgid "CSV Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:46
+msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:49
+msgid "You can specify additional flags for CSV exports as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:53
+msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:58
+msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:63
+msgid "Include the event data with each attribute."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:66
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:67
+msgid "The CSV created when this setting is set to true will not contain the header row.\n"
+"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:71
+msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:74
+msgid "NIDS rules export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:75
+msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:81
+msgid "The full API syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:84
+msgid "The export format, can be \"suricata\" or \"snort\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:86
+msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:93
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:94
+msgid "Restrict the export to only use the given types."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:96
+msgid "All tags will be included even if not exportable."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:98
+msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:100
+msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:102
+msgid "Hash database export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:103
+msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:104;188
+msgid "You can configure your tools to automatically download the following files"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:109
+msgid "The API's full format is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:111
+msgid "The export format, can be \"md5\" or \"sha1\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:123
+msgid "For example, to only show sha1 values from events tagged tag1, use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:126
+msgid "STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:127
+msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:129
+msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:132;171
+msgid "The event's ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:133
+msgid "Encode attachments where applicable"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:151
+msgid "Various ways to narrow down the search results of the STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:152
+msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:154
+msgid "To export the same events using a POST request use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:156
+msgid "Together with this JSON object in the POST message"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:158
+msgid "XML is automagically assumed when using the stix export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:160
+msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:163
+msgid "RPZ export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:165
+msgid "It is possible to further restrict the exported values using the following filters"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:167
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
+"        "
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:170
+msgid "Use semicolons instead (the search will automatically search for colons instead)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:172
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:173
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:186
+msgid "Text export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:187
+msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:194
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:197
+msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:201
+msgid "Only export the attributes of the given event ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:202
+msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:207
+msgid "Include not published Events."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:208;275
+msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:263
+msgid "Searches with JSON/XML/OpenIOC results"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:267
+msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:272
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:291
+msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:296
+msgid "To just return a list of attributes, use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:304
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:305
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:312
+msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:322
+msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:324
+msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
+"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:327
+msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
 msgstr ""
 
 #: View/Events/merge.ctp:4
@@ -6671,19 +7393,19 @@ msgid "Proposals"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:93
+#: View/Events/view.ctp:106
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:113
-#: View/Jobs/index.ctp:65
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
 #: View/Logs/admin_search.ctp:6
 #: View/Pages/doc/administration.ctp:87;104;116;181;195
 #: View/Pages/doc/using_the_system.ctp:166
-#: View/Users/admin_view.ctp:24
-#: View/Users/view.ctp:9
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
 msgid "Email"
 msgstr ""
 
@@ -6761,11 +7483,8 @@ msgid "Successfully added attributes"
 msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Events/view.ctp:56
 #: View/Feeds/preview_event.ctp:11
 #: View/Galaxies/view.ctp:18
-#: View/ObjectTemplates/view.ctp:15
-#: View/Organisations/view.ctp:54
 #: View/Organisations/ajax/merge.ctp:58
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
@@ -6788,6 +7507,14 @@ msgstr ""
 msgid "Visualisation"
 msgstr ""
 
+#: View/Events/upload_analysis_file.ctp:6
+msgid "Import analysis file"
+msgstr ""
+
+#: View/Events/upload_analysis_file.ctp:61
+msgid "Create Objects"
+msgstr ""
+
 #: View/Events/upload_stix.ctp:6
 msgid "Import %s file"
 msgstr ""
@@ -6796,193 +7523,186 @@ msgstr ""
 msgid "%s file"
 msgstr ""
 
-#: View/Events/view.ctp:49
-msgid "Extended view"
+#: View/Events/upload_stix.ctp:24
+msgid "Include the original imported file as attachment"
 msgstr ""
 
-#: View/Events/view.ctp:51
+#: View/Events/view.ctp:53
 #: View/Servers/preview_event.ctp:12
 #: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Event ID"
 msgstr ""
 
-#: View/Events/view.ctp:63
+#: View/Events/view.ctp:57
 msgid "Source Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:68
+#: View/Events/view.ctp:66
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:83
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
 msgid "Owner org"
 msgstr ""
 
-#: View/Events/view.ctp:131
+#: View/Events/view.ctp:135
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
 #: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
 msgstr ""
 
-#: View/Events/view.ctp:139
+#: View/Events/view.ctp:140
 #: View/Feeds/preview_event.ctp:37
 #: View/Pages/doc/using_the_system.ctp:70;177;210
 #: View/Servers/preview_event.ctp:48
 msgid "Analysis"
 msgstr ""
 
-#: View/Events/view.ctp:159
+#: View/Events/view.ctp:161
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr ""
 
-#: View/Events/view.ctp:165;167
+#: View/Events/view.ctp:165
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:169
+#: View/Events/view.ctp:173
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:171
+#: View/Events/view.ctp:177
+msgid "First recorded change"
+msgstr ""
+
+#: View/Events/view.ctp:181
 msgid "Last change"
 msgstr ""
 
-#: View/Events/view.ctp:176
+#: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:210
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:194
-msgid "Currently in "
+#: View/Events/view.ctp:217
+msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:202
-msgid "- restricted to own organisation only."
+#: View/Events/view.ctp:217
+msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:203
-msgid "Advanced Sightings"
-msgstr ""
-
-#: View/Events/view.ctp:219
-msgid "you"
-msgstr ""
-
-#: View/Events/view.ctp:220
-msgid " has"
-msgstr ""
-
-#: View/Events/view.ctp:223
-msgid "You have"
-msgstr ""
-
-#: View/Events/view.ctp:226
+#: View/Events/view.ctp:265
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:227
-msgid "%s requested that %s take over this event."
-msgstr ""
-
-#: View/Events/view.ctp:227
+#: View/Events/view.ctp:277
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:232
-msgid "Correlation"
-msgstr ""
-
-#: View/Events/view.ctp:238;247
-#: View/Users/admin_view.ctp:125
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:238
-msgid "enable"
-msgstr ""
-
-#: View/Events/view.ctp:242;249
-#: View/ObjectTemplates/index.ctp:32
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
 #: View/Taxonomies/view.ctp:24
-#: View/Warninglists/view.ctp:38
 msgid "Enabled"
 msgstr ""
 
-#: View/Events/view.ctp:242
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr ""
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:277
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr ""
+
+#: View/Events/view.ctp:328
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:335
+#: View/Events/view.ctp:386;415
 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."
+#: View/Events/view.ctp:387;416
+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
+#: View/Events/view.ctp:424
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Discussion"
 msgstr ""
 
@@ -7018,16 +7738,24 @@ msgstr ""
 msgid " Event #"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:7
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:6
 msgid "Publish Event%s"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:8
+msgid "Unpublish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:20
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
-#: View/Feeds/index.ctp:54
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Feeds/index.ctp:104
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -7037,10 +7765,6 @@ msgstr ""
 msgid "Choose the format that you wish to download the event in"
 msgstr ""
 
-#: View/Events/ajax/exportChoice.ctp:17;18;27;28
-msgid "Export as %s"
-msgstr ""
-
 #: View/Events/ajax/importChoice.ctp:2
 msgid "Choose the format that you would like to use for the import"
 msgstr ""
@@ -7211,7 +7935,7 @@ msgstr ""
 
 #: View/Feeds/add.ctp:156
 #: View/Feeds/edit.ctp:153
-#: View/Feeds/index.ctp:55
+#: View/Feeds/index.ctp:105
 msgid "Delta Merge"
 msgstr ""
 
@@ -7252,16 +7976,16 @@ msgstr ""
 
 #: View/Feeds/add.ctp:196
 #: View/Feeds/edit.ctp:191
-#: View/Servers/add.ctp:113
-#: View/Servers/edit.ctp:152;158
+#: View/Servers/add.ctp:102
+#: View/Servers/edit.ctp:147;153
 msgid "Modify"
 msgstr ""
 
-#: View/Feeds/compare_feeds.ctp:58
+#: View/Feeds/compare_feeds.ctp:66
 msgid "None or less than 1% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
-#: View/Feeds/compare_feeds.ctp:59
+#: View/Feeds/compare_feeds.ctp:67
 msgid "%s\\% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
@@ -7282,53 +8006,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr ""
 
 #: View/Feeds/edit.ctp:207
-#: View/Servers/add.ctp:143
-#: View/Servers/edit.ctp:186
+#: View/Servers/add.ctp:132
+#: View/Servers/edit.ctp:181
 msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
 msgstr ""
 
 #: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:185
+#: View/Servers/add.ctp:133
+#: View/Servers/edit.ctp:180
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
 #: View/Feeds/edit.ctp:209
-#: View/Servers/add.ctp:145
-#: View/Servers/edit.ctp:187
+#: View/Servers/add.ctp:134
+#: View/Servers/edit.ctp:182
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:146
-#: View/Servers/edit.ctp:188
+#: View/Servers/add.ctp:135
+#: View/Servers/edit.ctp:183
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
 #: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:189
+#: View/Servers/add.ctp:136
+#: View/Servers/edit.ctp:184
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:212
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:185
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:191
+#: View/Servers/edit.ctp:186
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:192
+#: View/Servers/edit.ctp:187
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority."
 msgstr ""
 
 #: View/Feeds/edit.ctp:215
-#: View/Servers/add.ctp:151
-#: View/Servers/edit.ctp:194
+#: View/Servers/add.ctp:140
+#: View/Servers/edit.ctp:189
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -7380,130 +8104,104 @@ msgstr ""
 msgid "Fetch and store all feed data"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
+#: View/Feeds/index.ctp:33
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
-msgid "Enable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:28
+#: View/Feeds/index.ctp:39
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:28
-msgid "Disable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:29
+#: View/Feeds/index.ctp:45
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:29
-msgid "Enable Caching for Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:51
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:30
-msgid "Disable Caching for  Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
-msgid "Default feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:61
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:31
+#: View/Feeds/index.ctp:66
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:32
+#: View/Feeds/index.ctp:71
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:32
-msgid "All Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:33
+#: View/Feeds/index.ctp:76
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:33
-msgid "Enabled Feeds"
+#: View/Feeds/index.ctp:95
+msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:48
+#: View/Feeds/index.ctp:96
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:98
 msgid "Feed Format"
 msgstr ""
 
-#: View/Feeds/index.ctp:50
-#: View/Jobs/index.ctp:76
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr ""
 
-#: View/Feeds/index.ctp:56
+#: View/Feeds/index.ctp:106
 msgid "Override IDS"
 msgstr ""
 
-#: View/Feeds/index.ctp:60
+#: View/Feeds/index.ctp:110
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:108
-#: View/Servers/index.ctp:73;74
+#: View/Feeds/index.ctp:158
+#: View/Servers/index.ctp:74;75
 msgid "Rules"
 msgstr ""
 
-#: View/Feeds/index.ctp:135
+#: View/Feeds/index.ctp:185
 msgid "Error: Invalid event!"
 msgstr ""
 
-#: View/Feeds/index.ctp:140
+#: View/Feeds/index.ctp:190
 msgid "Fixed event %s"
 msgstr ""
 
-#: View/Feeds/index.ctp:143
+#: View/Feeds/index.ctp:193
 msgid "New fixed event"
 msgstr ""
 
-#: View/Feeds/index.ctp:195
+#: View/Feeds/index.ctp:245
+#: View/Servers/index.ctp:94
 msgid "Age: "
 msgstr ""
 
-#: View/Feeds/index.ctp:197
+#: View/Feeds/index.ctp:247
+#: View/Servers/index.ctp:102
 msgid "Not cached"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:210
+#: View/Feeds/index.ctp:260
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 msgid "Are you sure you want to permanently remove the feed (%s)?"
 msgstr ""
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:267
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -7525,46 +8223,30 @@ msgid "Namespace"
 msgstr ""
 
 #: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:17
+#: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:19
+#: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:2
-msgid "Select Cluster"
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:11
-msgid "search clusters…"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "Galaxy Cluster Deletion"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:28
-msgid "Back to Galaxy Selection"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies."
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:2
-msgid "Select Cluster Source"
+#: View/GalaxyClusters/ajax/index.ctp:82
+msgid "Delete galaxy cluster"
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All clusters"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All Galaxies"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:2
-msgid "Select Galaxy Namespace Source"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All namespaces"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All Namespaces"
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
 msgstr ""
 
 #: View/Jobs/index.ctp:12
@@ -7579,37 +8261,37 @@ msgstr ""
 msgid "Completed."
 msgstr ""
 
-#: View/Jobs/index.ctp:63
+#: View/Jobs/index.ctp:68;98
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:74;99
 msgid "Show default queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:99
 #: View/Roles/admin_index.ctp:22
 #: View/Roles/index.ctp:22
 msgid "Default"
 msgstr ""
 
-#: View/Jobs/index.ctp:65
-msgid "Show email queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
-msgid "Show cache queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:101
 msgid "Cache"
 msgstr ""
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:127
 msgid "No worker active"
 msgstr ""
 
-#: View/Jobs/index.ctp:124
+#: View/Jobs/index.ctp:159
 msgid "View stacktrace"
 msgstr ""
 
@@ -7629,10 +8311,6 @@ msgstr ""
 msgid "No error data found. Generally job error data is purged from Redis after 24 hours, however, you can still view the errors in the log files in \"/app/tmp/logs\"."
 msgstr ""
 
-#: View/Jobs/ajax/error.ctp:34
-msgid "Close"
-msgstr ""
-
 #: View/Logs/admin_index.ctp:2
 #: View/Logs/event_index.ctp:6
 msgid "Logs"
@@ -7674,22 +8352,20 @@ msgstr ""
 msgid "from IP"
 msgstr ""
 
-#: View/Logs/admin_index.ctp:20;21
-msgid "Search"
-msgstr ""
-
-#: View/Logs/admin_index.ctp:59
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr ""
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:50
-#: View/ObjectTemplates/view.ctp:13
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/Templates/view.ctp:33
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
 msgstr ""
 
@@ -7775,12 +8451,12 @@ msgstr ""
 msgid "Target UUID"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:53
+#: View/ObjectReferences/ajax/add.ctp:54
 #: View/Objects/orphaned_object_diagnostics.ctp:38
 msgid "Object"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:68
+#: View/ObjectReferences/ajax/add.ctp:120
 msgid "Target Details"
 msgstr ""
 
@@ -7801,7 +8477,7 @@ msgid " The Attribute will be permanently deleted and unrecoverable. Also, this
 msgstr ""
 
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:24
-#: View/Pages/doc/categories_and_types.ctp:46
+#: View/Pages/doc/categories_and_types.ctp:40
 #: View/Pages/doc/md/categories_and_types.ctp:23
 msgid "Categories"
 msgstr ""
@@ -7822,43 +8498,35 @@ msgstr ""
 msgid "Object Template index"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:54
-#: View/ObjectTemplates/view.ctp:23
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:107
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:108
+#: View/ObjectTemplates/index.ctp:119
 msgid "Are you sure you want to delete template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:7
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/ObjectTemplates/view.ctp:33
 msgid " Object Template"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:9
-msgid "Object Template ID"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:2
-msgid "Select Object Category"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All meta-categories"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All Objects"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:50
-msgid "Back to categories"
-msgstr ""
-
 #: View/Objects/add.ctp:6
 msgid " Object"
 msgstr ""
@@ -7935,15 +8603,6 @@ msgstr ""
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:49
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/ajax/merge.ctp:65
-#: View/SharingGroups/add.ctp:32
-#: View/SharingGroups/edit.ctp:32
-msgid "UUID"
-msgstr ""
-
 #: View/Objects/ajax/delete.ctp:6
 msgid "Object Deletion"
 msgstr ""
@@ -7965,6 +8624,7 @@ msgid "Simply paste a list of all the organisation UUIDs that you wish to block
 msgstr ""
 
 #: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr ""
 
@@ -8089,9 +8749,9 @@ msgstr ""
 msgid "Click here"
 msgstr ""
 
-#: View/Organisations/index.ctp:5
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:51
+#: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr ""
@@ -8100,7 +8760,7 @@ msgstr ""
 msgid ", both local and remote"
 msgstr ""
 
-#: View/Organisations/index.ctp:9
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr ""
@@ -8109,7 +8769,7 @@ msgstr ""
 msgid " on other instances"
 msgstr ""
 
-#: View/Organisations/index.ctp:13
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr ""
@@ -8126,55 +8786,52 @@ msgstr ""
 msgid "View all"
 msgstr ""
 
-#: View/Organisations/index.ctp:65
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:30
 msgid "Logo"
 msgstr ""
 
-#: View/Organisations/index.ctp:76
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr ""
 
-#: View/Organisations/index.ctp:117
+#: View/Organisations/index.ctp:138
 #: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 ""
 
-#: View/Organisations/view.ctp:3
-msgid "Organisation "
-msgstr ""
-
-#: View/Organisations/view.ctp:7
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:4
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/Users/admin_view.ctp:9
-#: View/Users/view.ctp:4
-#: View/Warninglists/view.ctp:4
-msgid "Id"
-msgstr ""
-
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:12
 #: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr ""
 
-#: View/Organisations/view.ctp:26
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:40
-msgid "E-mail domain restrictions"
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
 msgstr ""
 
-#: View/Organisations/view.ctp:93;94
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr ""
+
+#: View/Organisations/view.ctp:62;63
 msgid "Members"
 msgstr ""
 
@@ -8187,7 +8844,6 @@ msgid "Available Organisations"
 msgstr ""
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
 msgid "Added Organisations"
 msgstr ""
 
@@ -8252,6 +8908,14 @@ msgstr ""
 msgid "Events need to have no validation issues"
 msgstr ""
 
+#: View/Pages/administration.ctp:15
+msgid "Recorrelate attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:16
+msgid "Recorrelate proposals"
+msgstr ""
+
 #: View/Pages/administration.ctp:18
 msgid "Verify Certificates"
 msgstr ""
@@ -8268,6 +8932,10 @@ msgstr ""
 msgid "Hotfix 2.3.57: Increase the max length of the organization field when adding a new server connection."
 msgstr ""
 
+#: View/Pages/administration.ctp:20
+msgid "Convert log fields to text"
+msgstr ""
+
 #: View/Pages/administration.ctp:20
 msgid "Hotfix 2.3.78: Some of the log fields that were varchar(255) ended up truncating the data. This function will change them to \"text\""
 msgstr ""
@@ -8280,18 +8948,34 @@ msgstr ""
 msgid "Hotfix 2.3.107: it was previously possible to get duplicate attribute UUIDs in the database, this script will remove all duplicates and ensure that duplicates will not be entered into the database in the future."
 msgstr ""
 
+#: View/Pages/administration.ctp:22
+msgid "Remove duplicate events (with the same UUID)"
+msgstr ""
+
 #: View/Pages/administration.ctp:22
 msgid "Hotfix 2.3.115: In some rare situations it could occur that a duplicate of an event was created on an instance, with the exact same uuid. This action will remove any such duplicates and make sure that this cannot happen again."
 msgstr ""
 
+#: View/Pages/administration.ctp:23
+msgid "Prune orphaned attributes"
+msgstr ""
+
 #: View/Pages/administration.ctp:23
 msgid "In some rare occasions it can happen that you end up with some attributes in your database that do not belong to an event - for example during a race condition between an event insert and a delete. This tool will collect and delete any such orphaned attributes. If you ever run into an issue where you cannot add an attribute with a specific valid value, this is probably the reason."
 msgstr ""
 
+#: View/Pages/administration.ctp:24
+msgid "Clean regex table of potentially malicious entries"
+msgstr ""
+
 #: View/Pages/administration.ctp:24
 msgid "Hotfix 2.3.160: Prior to this version it was possible for a user/admin with Regex permission to create a malicious regular expression that could be used to execute arbitrary code. Since this version it is no longer possible to input such expressions, but already existing malicious entries still have to be cleaned using this tool."
 msgstr ""
 
+#: View/Pages/administration.ctp:25
+msgid "Remove URL type attribute sanitisation"
+msgstr ""
+
 #: View/Pages/administration.ctp:25
 msgid "Hotfix 2.3.173: Sanitised URLs can cause issues with the NIDS exports and as of this version attributes will be modified on entry to correct this. To correct existing entries, run this script."
 msgstr ""
@@ -8345,7 +9029,6 @@ msgid "If the migration of your data from 2.4 is not complete this will lead to
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:3
-#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:3
 #: View/Pages/doc/general.ctp:3
 #: View/Pages/doc/quickstart.ctp:3;14
@@ -8355,7 +9038,6 @@ msgid "Quick Start"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:4
-#: View/Pages/doc/categories_and_types.ctp:4
 #: View/Pages/doc/concepts.ctp:4
 #: View/Pages/doc/general.ctp:4;14
 #: View/Pages/doc/quickstart.ctp:4
@@ -8365,7 +9047,6 @@ msgid "General Layout"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:5
-#: View/Pages/doc/categories_and_types.ctp:5
 #: View/Pages/doc/concepts.ctp:5;14
 #: View/Pages/doc/general.ctp:5
 #: View/Pages/doc/quickstart.ctp:5
@@ -8375,7 +9056,6 @@ msgid "General Concepts"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:6
-#: View/Pages/doc/categories_and_types.ctp:6
 #: View/Pages/doc/concepts.ctp:6
 #: View/Pages/doc/general.ctp:6
 #: View/Pages/doc/quickstart.ctp:6
@@ -8385,7 +9065,6 @@ msgid "User Management and Global actions"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:7
-#: View/Pages/doc/categories_and_types.ctp:7
 #: View/Pages/doc/concepts.ctp:7
 #: View/Pages/doc/general.ctp:7
 #: View/Pages/doc/quickstart.ctp:7
@@ -8428,7 +9107,7 @@ msgid "FAQ"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:22
-#: View/Pages/doc/categories_and_types.ctp:9
+#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:9
 #: View/Pages/doc/general.ctp:9
 #: View/Pages/doc/quickstart.ctp:9
@@ -8486,6 +9165,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
+#: View/Servers/edit.ctp:82
 msgid "Misc settings"
 msgstr ""
 
@@ -8704,8 +9384,8 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_view.ctp:40
-#: View/Users/view.ctp:34
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
 msgid "Authkey"
 msgstr ""
 
@@ -8758,8 +9438,8 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_view.ctp:29
-#: View/Users/view.ctp:24
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr ""
 
@@ -8780,8 +9460,6 @@ msgid "Shows the currently assigned NIDS ID."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:109;125
-#: View/Users/admin_view.ctp:100
-#: View/Users/view.ctp:55
 msgid "Termsaccepted"
 msgstr ""
 
@@ -8790,7 +9468,7 @@ msgid "This flag indicates whether the user has accepted the terms of use or not
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:110
-#: View/Users/admin_view.ctp:120
+#: View/Users/admin_view.ctp:84
 msgid "Newsread"
 msgstr ""
 
@@ -8852,7 +9530,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:133;184;197
 #: View/Pages/doc/using_the_system.ctp:269
-#: View/Taxonomies/view.ctp:78
+#: View/Taxonomies/view.ctp:89
 msgid "Action"
 msgstr ""
 
@@ -9329,16 +10007,16 @@ msgstr ""
 msgid "This will create a new password hash using the currently set salt."
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:13
+#: View/Pages/doc/categories_and_types.ctp:7
 msgid "Attribute Categories and Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:14
+#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/md/categories_and_types.ctp:1
 msgid "Attribute Categories vs. Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:80
+#: View/Pages/doc/categories_and_types.ctp:74
 msgid "Click here to get the .md version for gitbook generation."
 msgstr ""
 
@@ -9347,7 +10025,7 @@ msgid "Admins and Site Admins"
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:16
-msgid "There are two types of admins in MISP: Admins (also refered to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
+msgid "There are two types of admins in MISP: Admins (also referred to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:17
@@ -9478,10 +10156,6 @@ msgstr ""
 msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:20
-msgid "Event Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:20
 msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
 msgstr ""
@@ -9490,18 +10164,10 @@ msgstr ""
 msgid "Input filters alter what and how data can be entered into this instance. Apart from the basic validation of attribute entry by type, it is possible for the site administrators to define regular expression replacements and blacklists for certain values in addition to blocking certain values from being exportable. Users can view these replacement and blacklist rules here whilst administrator can alter them."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:22;54
-msgid "Global Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:22
 msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:23;66
-msgid "Sync Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:23
 msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
 msgstr ""
@@ -9627,6 +10293,11 @@ msgstr ""
 msgid "A link to this user guide."
 msgstr ""
 
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr "Termos &amp; Condições"
+
 #: View/Pages/doc/general.ctp:61
 msgid "View the terms &amp; conditions again."
 msgstr ""
@@ -9892,7 +10563,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:47
+#: View/Users/statistics_data.ctp:53
 msgid "Activity Heatmap"
 msgstr ""
 
@@ -10814,12 +11485,6 @@ msgstr ""
 msgid "As described earlier, users with tagging rights can arbitrarily tag events using tags chosen from a pool of available options. If you have tagging privileges and would like to create a new tag, navigate to Event Actions - Add Tag. You'll be presented with the following form"
 msgstr ""
 
-#: View/Pages/doc/using_the_system.ctp:303
-#: View/Templates/add.ctp:17
-#: View/Templates/edit.ctp:17
-msgid "Add tag"
-msgstr ""
-
 #: View/Pages/doc/using_the_system.ctp:303
 msgid "Enter a name for the tag and click on the color field to be able to pick a colour for it."
 msgstr ""
@@ -11149,8 +11814,8 @@ msgid "Make sure that you enter the authentication key that you have been given
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:397
-#: View/Servers/add.ctp:7
-#: View/Servers/edit.ctp:7
+#: View/Servers/add.ctp:8
+#: View/Servers/edit.ctp:8
 msgid "Base URL"
 msgstr ""
 
@@ -11251,7 +11916,7 @@ msgid "Clicking the delete button will delete the link to the instance."
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:418
-#: View/Servers/index.ctp:92
+#: View/Servers/index.ctp:128
 msgid "Push all"
 msgstr ""
 
@@ -11260,7 +11925,7 @@ msgid " By clicking this button, all events that are eligible to be pushed on th
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:419
-#: View/Servers/index.ctp:89
+#: View/Servers/index.ctp:125
 msgid "Pull all"
 msgstr ""
 
@@ -11414,7 +12079,7 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
-#: View/Roles/view.ctp:14
+#: View/Roles/view.ctp:5
 msgid "Permission level"
 msgstr ""
 
@@ -11422,136 +12087,155 @@ msgstr ""
 msgid "Add Server"
 msgstr ""
 
-#: View/Servers/add.ctp:10
-#: View/Servers/edit.ctp:10
+#: View/Servers/add.ctp:6
+#: View/Servers/edit.ctp:6
+msgid "Instance identification"
+msgstr ""
+
+#: View/Servers/add.ctp:11
+#: View/Servers/edit.ctp:11
 msgid "Instance name"
 msgstr ""
 
-#: View/Servers/add.ctp:16
+#: View/Servers/add.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change."
 msgstr ""
 
-#: View/Servers/add.ctp:19
-#: View/Servers/edit.ctp:19
+#: View/Servers/add.ctp:20
+#: View/Servers/edit.ctp:20
 msgid "Internal instance"
 msgstr ""
 
-#: View/Servers/add.ctp:29
+#: View/Servers/add.ctp:30
+#: View/Servers/edit.ctp:31
+msgid "Instance ownership and credentials"
+msgstr ""
+
+#: View/Servers/add.ctp:31
+#: View/Servers/edit.ctp:32
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr ""
 
-#: View/Servers/add.ctp:35
+#: View/Servers/add.ctp:37
 msgid "Remote Sync Organisation Type"
 msgstr ""
 
-#: View/Servers/add.ctp:40
-#: View/Servers/edit.ctp:37
+#: View/Servers/add.ctp:42
+#: View/Servers/edit.ctp:43
 msgid "External Organisation"
 msgstr ""
 
-#: View/Servers/add.ctp:46
-#: View/Servers/edit.ctp:48
-msgid "Local Organisation"
+#: View/Servers/add.ctp:48
+msgid "Owner of remote instance"
 msgstr ""
 
-#: View/Servers/add.ctp:52
-#: View/Servers/edit.ctp:59
+#: View/Servers/add.ctp:54
+#: View/Servers/edit.ctp:65
 msgid "Remote Organisation's Name"
 msgstr ""
 
-#: View/Servers/add.ctp:56
-#: View/Servers/edit.ctp:63
+#: View/Servers/add.ctp:58
+#: View/Servers/edit.ctp:69
 msgid "Remote Organisation's Uuid"
 msgstr ""
 
-#: View/Servers/add.ctp:97
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:78
+msgid "Enabled synchronisation methods"
+msgstr ""
+
+#: View/Servers/add.ctp:86
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:103
+#: View/Servers/add.ctp:92
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:108
-#: View/Servers/edit.ctp:147
+#: View/Servers/add.ctp:97
+#: View/Servers/edit.ctp:142
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:109;115
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:98;104
+#: View/Servers/edit.ctp:143;149
 msgid "Events with the following tags allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:110;116
-#: View/Servers/edit.ctp:149;155
+#: View/Servers/add.ctp:99;105
+#: View/Servers/edit.ctp:144;150
 msgid "Events with the following tags blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:111;117
-#: View/Servers/edit.ctp:150;156
+#: View/Servers/add.ctp:100;106
+#: View/Servers/edit.ctp:145;151
 msgid "Events with the following organisations allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:112;118
-#: View/Servers/edit.ctp:151;157
+#: View/Servers/add.ctp:101;107
+#: View/Servers/edit.ctp:146;152
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:114
-#: View/Servers/edit.ctp:153
+#: View/Servers/add.ctp:103
+#: View/Servers/edit.ctp:148
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:142
-#: View/Servers/edit.ctp:184
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:179
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:148
+#: View/Servers/add.ctp:137
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:149
+#: View/Servers/add.ctp:138
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:150
+#: View/Servers/add.ctp:139
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr ""
 
-#: View/Servers/edit.ctp:16
+#: View/Servers/edit.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change. This also requires that the current instance's host organisation and the remote sync organisation are the same."
 msgstr ""
 
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:37
 msgid "Organisation Type"
 msgstr ""
 
-#: View/Servers/edit.ctp:69
+#: View/Servers/edit.ctp:54
+msgid "Local Organisation"
+msgstr ""
+
+#: View/Servers/edit.ctp:75
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:104
+#: View/Servers/edit.ctp:99
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:112;134
+#: View/Servers/edit.ctp:107;129
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:113;135
+#: View/Servers/edit.ctp:108;130
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:126
+#: View/Servers/edit.ctp:121
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:193
+#: View/Servers/edit.ctp:188
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:250;254
+#: View/Servers/edit.ctp:245;249
 msgid "Not set."
 msgstr ""
 
@@ -11564,7 +12248,7 @@ msgid "Example:"
 msgstr ""
 
 #: View/Servers/filter_event_index.ctp:21
-msgid "Apply filters to the remote instance"
+msgid "Apply filters to the remote instance's index"
 msgstr ""
 
 #: View/Servers/index.ctp:2
@@ -11575,34 +12259,38 @@ msgstr ""
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:30
+#: View/Servers/index.ctp:31
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Internal instance that ignores distribution level degradation *WARNING: Only use this setting if you have several internal instances and the sync link is to an internal extension of the current MISP community*"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:86
+#: View/Servers/index.ctp:122
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:88
+#: View/Servers/index.ctp:124
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
+#: View/Servers/index.ctp:131
+msgid "Cache instance"
+msgstr ""
+
 #: View/Servers/preview_event.ctp:7
 msgid "You are currently viewing an event on the remote instance %s "
 msgstr ""
@@ -11619,15 +12307,15 @@ msgstr ""
 msgid "You are currently viewing the event index of the remote instance %s"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "published"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:147
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr ""
 
@@ -11671,19 +12359,23 @@ msgstr ""
 msgid "No succeeded pushes"
 msgstr ""
 
-#: View/Servers/rest.ctp:7;17
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:54
+#: View/Servers/rest.ctp:116
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:55
+#: View/Servers/rest.ctp:117
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:56
+#: View/Servers/rest.ctp:118
 msgid "Headers"
 msgstr ""
 
@@ -11703,6 +12395,10 @@ msgstr ""
 msgid "Available Instances"
 msgstr ""
 
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
+msgid "Added Instances"
+msgstr ""
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 msgid "Add servers to sharing group"
 msgstr ""
@@ -11750,39 +12446,31 @@ msgstr ""
 msgid "IDS Signature?"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:21
-msgid "Only list proposals of my organisation"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:21
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:26
-msgid "List all proposals"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:26
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:33
+#: View/ShadowAttributes/index.ctp:43
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:39
+#: View/ShadowAttributes/index.ctp:49
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:45
+#: View/ShadowAttributes/index.ctp:55
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:71
+#: View/ShadowAttributes/index.ctp:81
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:73
+#: View/ShadowAttributes/index.ctp:83
 msgid "New Attribute"
 msgstr ""
 
@@ -11810,166 +12498,166 @@ msgstr ""
 msgid "New Sharing Group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
-msgid "General tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
 msgid "General"
 msgstr "Geral"
 
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
 msgid "Organisations tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
-msgid "MISP instances tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
 msgid "MISP Instances"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
-msgid "Sharing group summary"
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:12
-#: View/SharingGroups/edit.ctp:12
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
 msgid "Example: Multinational sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:13
-#: View/SharingGroups/edit.ctp:13
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
 msgid "Releasable to"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:14
-#: View/SharingGroups/edit.ctp:14
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
 msgid "Example: Community1, Organisation1, Organisation2"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:16
-#: View/SharingGroups/edit.ctp:16
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
 msgid "A description of the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:18
-#: View/SharingGroups/edit.ctp:18
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
 msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:19
-#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
 msgid "Make the sharing group selectable (active)"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:21;38;59
-#: View/SharingGroups/edit.ctp:21;38;67
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
 msgid "Next page"
 msgstr "Próxima página"
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation(s) to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisations to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:33
-#: View/SharingGroups/edit.ctp:33
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
 #: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:37;58;74
-#: View/SharingGroups/edit.ctp:37;66;82
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
 msgid "Previous page"
 msgstr "Página anterior"
 
-#: View/SharingGroups/add.ctp:42
-#: View/SharingGroups/edit.ctp:50
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
 msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:43
-#: View/SharingGroups/edit.ctp:51
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
 msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:47
-#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:53
-#: View/SharingGroups/edit.ctp:61
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
 #: View/SharingGroups/view.ctp:69
 msgid "All orgs"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:63
+#: View/SharingGroups/add.ctp:103
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:64
+#: View/SharingGroups/add.ctp:104
 msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/add.ctp:105
 msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/add.ctp:106
 msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:67
-#: View/SharingGroups/edit.ctp:75
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
 msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:75
-#: View/SharingGroups/edit.ctp:83
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
 msgid "Submit and create sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:95
+#: View/SharingGroups/add.ctp:135
 msgid "Local instance"
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:71
+#: View/SharingGroups/edit.ctp:111
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
 "                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
 "                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:74
+#: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
@@ -11977,23 +12665,15 @@ msgstr ""
 msgid "Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:20
-msgid "View only active sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:20
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:21
-msgid "View only passive sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:21
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:61
+#: View/SharingGroups/index.ctp:80
 msgid "Distribution List"
 msgstr ""
 
@@ -12037,6 +12717,18 @@ msgstr ""
 msgid "Delete sighting"
 msgstr ""
 
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
+msgid "Add Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
+msgstr ""
+
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
 msgid "Remove Sighting"
 msgstr ""
@@ -12049,6 +12741,26 @@ msgstr ""
 msgid "Remove sighting"
 msgstr ""
 
+#: View/TagCollections/add.ctp:8
+msgid "Edit Tag Collection"
+msgstr ""
+
+#: View/TagCollections/add.ctp:16
+msgid "Visible to all orgs"
+msgstr ""
+
+#: View/TagCollections/import.ctp:4
+msgid "Paste tag collection data"
+msgstr ""
+
+#: View/TagCollections/import.ctp:5
+msgid "Paste a MISP tag collection JSON below to add tag collections."
+msgstr ""
+
+#: View/TagCollections/import.ctp:10
+msgid "Tag collection JSON"
+msgstr ""
+
 #: View/Tags/add.ctp:12
 #: View/Tags/edit.ctp:12
 msgid "Restrict tagging to org"
@@ -12059,6 +12771,10 @@ msgstr ""
 msgid "Restrict tagging to user"
 msgstr ""
 
+#: View/Tags/edit.ctp:31
+msgid "Unselectable Tag"
+msgstr ""
+
 #: View/Tags/index.ctp:10
 msgid "Your Favourite Tags"
 msgstr ""
@@ -12091,57 +12807,6 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:2
-msgid "Select Tag"
-msgstr "Selecionar tag"
-
-#: View/Tags/ajax/select_tag.ctp:16
-#: View/Tags/ajax/taxonomy_choice.ctp:4
-msgid "search tags…"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:25
-msgid "Attach tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Return to taxonomy selection"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Select Taxonomy"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Back to Taxonomy Selection"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:2
-msgid "Select Tag Source"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:10
-msgid "Favourite Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:14
-msgid "Custom Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:17
-msgid "All Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:21
-#: View/Taxonomies/view.ctp:2
-msgid "Taxonomy Library"
-msgstr ""
-
 #: View/Tasks/index.ctp:4
 msgid "Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks."
 msgstr ""
@@ -12179,7 +12844,8 @@ msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:41
-#: View/Taxonomies/view.ctp:29;143
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr ""
 
@@ -12189,7 +12855,8 @@ msgid "Are you sure you want to disable this taxonomy library?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:31;147
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr ""
 
@@ -12206,19 +12873,27 @@ msgstr ""
 msgid "Create and/or update selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:116
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
 msgid "Hidden"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:125
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:142
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: View/Taxonomies/view.ctp:147
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr ""
 
@@ -12246,6 +12921,30 @@ msgstr ""
 msgid "Create / update all taxonomy entries as tags"
 msgstr ""
 
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
 #: View/TemplateElements/ajax/ajaxIndex.ctp:2
 msgid "Template Elements"
 msgstr ""
@@ -12498,6 +13197,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
 msgid "Terms accepted"
 msgstr "Termos aceitos"
 
@@ -12564,15 +13265,19 @@ msgstr ""
 msgid "All users"
 msgstr "Todos os usuários"
 
-#: View/Users/admin_email.ctp:36
+#: View/Users/admin_email.ctp:19
+msgid "All users of the same organisation"
+msgstr ""
+
+#: View/Users/admin_email.ctp:39
 msgid "Enter a custom message"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "New user registration"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "Password reset"
 msgstr ""
 
@@ -12596,10 +13301,6 @@ msgstr "Aplicar filtros"
 msgid "Users"
 msgstr "Usuários"
 
-#: View/Users/admin_index.ctp:40
-msgid "Filter user index"
-msgstr ""
-
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr ""
@@ -12612,42 +13313,48 @@ msgstr ""
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr ""
 
-#: View/Users/admin_view.ctp:35
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
 msgid "Contactalert"
 msgstr ""
 
-#: View/Users/admin_view.ctp:46
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/admin_view.ctp:44
 msgid "Invited By"
 msgstr "Convidado Por"
 
-#: View/Users/admin_view.ctp:51
-msgid "Org admin"
-msgstr "Org admin"
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
+msgstr ""
 
-#: View/Users/admin_view.ctp:74
-#: View/Users/view.ctp:67
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr ""
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:80
-#: View/Users/view.ctp:73
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
 msgid "GnuPG status"
 msgstr ""
 
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:83
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
 msgid "SMIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:95
-msgid "Nids Sid"
-msgstr ""
-
-#: View/Users/admin_view.ctp:110
-msgid "Password change"
-msgstr ""
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr ""
@@ -12680,37 +13387,37 @@ msgid "Proposals active"
 msgstr ""
 
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:34
+#: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
 msgstr ""
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:39
+#: View/Users/statistics_data.ctp:45
 msgid "Discussion posts"
 msgstr ""
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:48
+#: View/Users/statistics_data.ctp:54
 msgid "A heatmap showing user activity for each day during this month and the 4 months that preceded it. Use the buttons below to only show the heatmap of a specific organisation."
 msgstr ""
 
 #: View/Users/statistics.ctp:60
-#: View/Users/statistics_data.ctp:65
+#: View/Users/statistics_data.ctp:71
 msgid "Go left"
 msgstr ""
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:71
+#: View/Users/statistics_data.ctp:77
 msgid "Go right"
 msgstr ""
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:118
+#: View/Users/statistics_data.ctp:124
 msgid "The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings."
 msgstr ""
 
 #: View/Users/statistics.ctp:117
-#: View/Users/statistics_data.ctp:122
+#: View/Users/statistics_data.ctp:128
 msgid "The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer."
 msgstr ""
 
@@ -12718,6 +13425,18 @@ msgstr ""
 msgid "A heatmap showing the usage of ATT&CK Tactic."
 msgstr ""
 
+#: View/Users/statistics_data.ctp:32
+msgid "Users with PGP keys"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:36
+msgid "Local Organisations"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:38
+msgid "Average Users / Org"
+msgstr ""
+
 #: View/Users/statistics_orgs.ctp:17
 msgid "Organisation list"
 msgstr ""
@@ -12786,12 +13505,12 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
-#: View/Users/view.ctp:45
-msgid "Request API access"
+#: View/Users/ajax/emailConfirmTemplate.ctp:2
+msgid "Confirm sending"
 msgstr ""
 
-#: View/Users/view.ctp:50
-msgid "NIDS Start SID"
+#: View/Users/ajax/emailConfirmTemplate.ctp:4
+msgid "You are about to send a mail to %s recipient(s)?"
 msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:2
@@ -12854,7 +13573,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:29
+#: View/Warninglists/view.ctp:14;16
 msgid "Accepted attribute types"
 msgstr ""
 
@@ -12930,6 +13649,7 @@ msgstr "booleano"
 #: Model/Attribute.php:validation for field uuid
 #: Model/Event.php:validation for field uuid;validation for field extends_uuid
 #: Model/EventBlacklist.php:validation for field event_uuid
+#: Model/MispObject.php:validation for field uuid
 #: Model/OrgBlacklist.php:validation for field org_uuid
 #: Model/Organisation.php:validation for field uuid
 #: Model/ShadowAttribute.php:validation for field uuid
@@ -12938,6 +13658,7 @@ msgid "Please provide a valid UUID"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/MispObject.php:validation for field uuid
 msgid "The UUID provided is not unique"
 msgstr ""
 
@@ -12957,6 +13678,7 @@ msgstr ""
 #: Model/ServerTag.php:validation for field server_id;validation for field tag_id
 #: Model/SharingGroup.php:validation for field name
 #: Model/Tag.php:validation for field name;validation for field colour
+#: Model/TagCollection.php:validation for field name
 #: Model/TemplateElementAttribute.php:validation for field name;validation for field description
 #: Model/ThreatLevel.php:validation for field name;validation for field description;validation for field form_description
 #: Model/User.php:validation for field org_id;validation for field authkey
@@ -13056,6 +13778,7 @@ msgid "This field is required."
 msgstr "Este campo é obrigatório."
 
 #: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
 #: Model/Whitelist.php:validation for field name
 msgid "A similar name already exists."
 msgstr "Já existe um nome similar."
diff --git a/app/Locale/rus/LC_MESSAGES/default.po b/app/Locale/rus/LC_MESSAGES/default.po
index d028198c3..2a22ee9bc 100644
--- a/app/Locale/rus/LC_MESSAGES/default.po
+++ b/app/Locale/rus/LC_MESSAGES/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-01-22 21:26\n"
+"PO-Revision-Date: 2019-03-06 02:04\n"
 "Last-Translator: SteveClement <steve@localhost.lu>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -15,527 +15,572 @@ msgstr ""
 "Language: ru_RU\n"
 
 #: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:149;153;157
+#: Controller/AttributesController.php:125;129;133
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1001;1348;1352;1356;1385;1800;1876;1880;1884;2102;2166;2248;2903;5264;5429;5433;5442
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
 #: Controller/PostsController.php:56
+#: Model/Galaxy.php:292
 msgid "Invalid event"
+msgstr "Некорректное событие"
+
+#: Console/Command/ServerShell.php:49
+#: Controller/ServersController.php:632
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
 msgstr ""
 
-#: Controller/AppController.php:607
+#: Console/Command/ServerShell.php:51
+msgid "ERROR: %s"
+msgstr "ОШИБКА: %s"
+
+#: Controller/AppController.php:383
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr ""
+
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
+msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+msgstr ""
+
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
+msgid "You have to be logged in to do that."
+msgstr ""
+
+#: Controller/AppController.php:627
+msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
+msgstr ""
+
+#: Controller/AppController.php:752
 msgid "All done. attribute_count generated from scratch for "
 msgstr ""
 
-#: Controller/AppController.php:726
-#: Controller/AttributesController.php:2668
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
 #: Controller/ShadowAttributesController.php:1276
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr ""
 
-#: Controller/AttributesController.php:140;1392
+#: Controller/AttributesController.php:116;1403
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr ""
 
-#: Controller/AttributesController.php:143
+#: Controller/AttributesController.php:119
 msgid "You don't have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:163;489;666
+#: Controller/AttributesController.php:139;488;668
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1684;1705;1739
-#: Controller/ObjectsController.php:442
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
 msgid "You do not have permission to do that."
 msgstr ""
 
-#: Controller/AttributesController.php:414;864;869;873;1072;1152;2684;2698;2731;2753;2762;3309;3313;3409;3413
-#: Controller/ShadowAttributesController.php:824;1067;1091;1124;1134
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
 #: Controller/TagsController.php:491
 msgid "Invalid attribute"
-msgstr ""
+msgstr "Некорректный атрибут"
 
-#: Controller/AttributesController.php:424
-#: Controller/ShadowAttributesController.php:500
+#: Controller/AttributesController.php:421
+#: Controller/ShadowAttributesController.php:499
 msgid "You do not have the permission to view this event."
 msgstr ""
 
-#: Controller/AttributesController.php:472
+#: Controller/AttributesController.php:468
 msgid "Attribute not an attachment or malware-sample"
 msgstr ""
 
-#: Controller/AttributesController.php:504;677
-#: Controller/ShadowAttributesController.php:548
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
+msgid "Invalid Event."
+msgstr "Некорректное событие."
+
+#: Controller/AttributesController.php:503;679
+#: Controller/ShadowAttributesController.php:546
 msgid "PHP says file was not uploaded. Are you attacking me?"
 msgstr ""
 
-#: Controller/AttributesController.php:680
-#: Controller/ShadowAttributesController.php:551;561
+#: Controller/AttributesController.php:682
+#: Controller/ShadowAttributesController.php:549;559
 msgid "There was a problem to upload the file."
 msgstr ""
 
-#: Controller/AttributesController.php:824
+#: Controller/AttributesController.php:826
 msgid "The ThreatConnect data has been imported."
 msgstr ""
 
-#: Controller/AttributesController.php:827
+#: Controller/AttributesController.php:829
 msgid "%s entries imported."
 msgstr ""
 
-#: Controller/AttributesController.php:831
+#: Controller/AttributesController.php:833
 msgid "%s entries could not be imported."
 msgstr ""
 
-#: Controller/AttributesController.php:881;924;926
-#: Controller/ShadowAttributesController.php:831
+#: Controller/AttributesController.php:883;931;933
+#: Controller/ShadowAttributesController.php:829
 msgid "Invalid attribute."
-msgstr ""
+msgstr "Некорректный атрибут."
 
-#: Controller/AttributesController.php:920
+#: Controller/AttributesController.php:927
 msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
 msgstr ""
 
-#: Controller/AttributesController.php:936;1401
-#: Controller/EventsController.php:4635;4648;5213;5227
-msgid "Invalid Event."
-msgstr ""
-
-#: Controller/AttributesController.php:953
+#: Controller/AttributesController.php:960
 msgid "The attribute has been saved"
 msgstr ""
 
-#: Controller/AttributesController.php:985
+#: Controller/AttributesController.php:995
 msgid "The attribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/AttributesController.php:1076
+#: Controller/AttributesController.php:1087
 msgid "Invalid event id."
-msgstr ""
+msgstr "Некорректный Id события."
 
-#: Controller/AttributesController.php:1106
-#: Controller/EventsController.php:2023
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
+#: Controller/ShadowAttributesController.php:729
 msgid "Invalid input."
 msgstr "Некорректный ввод."
 
-#: Controller/AttributesController.php:1111
+#: Controller/AttributesController.php:1122
 msgid "Invalid field."
-msgstr ""
+msgstr "Недопустимое поле."
 
-#: Controller/AttributesController.php:1156
+#: Controller/AttributesController.php:1167
 msgid "Invalid attribute id."
-msgstr ""
+msgstr "Некорректный Id атрибута."
 
-#: Controller/AttributesController.php:1231;1241
+#: Controller/AttributesController.php:1242;1252
 msgid "Attribute deleted"
-msgstr ""
+msgstr "Атрибут удален"
 
-#: Controller/AttributesController.php:1236;1238
+#: Controller/AttributesController.php:1247;1249
 msgid "Attribute was not deleted"
-msgstr ""
+msgstr "Атрибут не был удален"
 
-#: Controller/AttributesController.php:1263;3155
-#: Controller/ShadowAttributesController.php:864
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
 msgid "Invalid Attribute"
-msgstr ""
+msgstr "Некорректный атрибут"
 
-#: Controller/AttributesController.php:1290
+#: Controller/AttributesController.php:1301
 msgid "Could not restore the attribute"
-msgstr ""
+msgstr "Не удалось восстановить атрибут"
 
-#: Controller/AttributesController.php:1311;1318;1322
+#: Controller/AttributesController.php:1322;1329;1333
 msgid "Attribute not found or not authorised."
 msgstr ""
 
-#: Controller/AttributesController.php:1372
+#: Controller/AttributesController.php:1383
 msgid "This function is only accessible via POST requests."
-msgstr ""
+msgstr "Эта функция доступна только через POST запросы."
 
-#: Controller/AttributesController.php:1427
+#: Controller/AttributesController.php:1438
 msgid "No matching attributes found."
-msgstr ""
-
-#: Controller/AttributesController.php:1461
-msgid "This method can only be accessed via AJAX."
-msgstr ""
+msgstr "Подходящих атрибутов не найдено."
 
 #: Controller/AttributesController.php:1472
-msgid "You are not authorized to edit this event."
-msgstr ""
+msgid "This method can only be accessed via AJAX."
+msgstr "Этот метод доступен только через AJAX."
 
-#: Controller/AttributesController.php:1537
+#: Controller/AttributesController.php:1482
+msgid "You are not authorized to edit this event."
+msgstr "Вы не авторизованы для редактирования этого события."
+
+#: Controller/AttributesController.php:1580
 msgid "No event ID provided."
 msgstr ""
 
-#: Controller/AttributesController.php:1640
-msgid "Invalid tag"
-msgstr ""
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
+msgid "Synonyms: "
+msgstr "Синонимы: "
 
-#: Controller/AttributesController.php:2107;2282;2391;2441;2524;2610
-#: Controller/EventsController.php:2484;2600;2662;2720;3079;3301;3993;4011
-msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
-msgstr ""
-
-#: Controller/AttributesController.php:2112;2277;2384
-#: Controller/EventsController.php:3084
+#: Controller/AttributesController.php:1997;2104
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr ""
 
-#: Controller/AttributesController.php:2123
-msgid "Content type and parameter mismatch. Expecting JSON."
-msgstr ""
-
-#: Controller/AttributesController.php:2128
-msgid "Content type and parameter mismatch. Expecting XML."
-msgstr ""
-
-#: Controller/AttributesController.php:2132;2290
+#: Controller/AttributesController.php:2010
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
 msgstr ""
 
-#: Controller/AttributesController.php:2310
+#: Controller/AttributesController.php:2030
 msgid "You don't have access to that event."
 msgstr ""
 
-#: Controller/AttributesController.php:2373
+#: Controller/AttributesController.php:2093
 msgid "No matches."
-msgstr ""
+msgstr "Нет совпадений."
 
-#: Controller/AttributesController.php:2395;2404
+#: Controller/AttributesController.php:2115;2124
 msgid "Invalid attribute or no authorisation to view it."
 msgstr ""
 
-#: Controller/AttributesController.php:2445;2528;2614
-#: Controller/EventsController.php:2488;2605;2667;2724;3305;3997;4015
-msgid "You have to be logged in to do that."
-msgstr ""
-
-#: Controller/AttributesController.php:2472
+#: Controller/AttributesController.php:2192
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
 msgstr ""
 
-#: Controller/AttributesController.php:2536
+#: Controller/AttributesController.php:2256
 msgid "Invalid event ID format."
-msgstr ""
+msgstr "Некорректный формат ID события."
 
-#: Controller/AttributesController.php:2645
+#: Controller/AttributesController.php:2365
 #: Controller/ShadowAttributesController.php:1254
 msgid "All done. "
-msgstr ""
+msgstr "Всё готово. "
 
-#: Controller/AttributesController.php:2677;2724
+#: Controller/AttributesController.php:2397;2444
 #: Controller/ShadowAttributesController.php:1062
 msgid "Invalid field requested."
-msgstr ""
+msgstr "Недопустимое поле запроса."
 
-#: Controller/AttributesController.php:2680;2727
+#: Controller/AttributesController.php:2400;2447
 msgid "This function can only be accessed via AJAX."
-msgstr ""
+msgstr "Эта функция доступна только через AJAX."
 
-#: Controller/AttributesController.php:2792;2800
-#: Controller/EventsController.php:3689;3967
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr ""
 
-#: Controller/AttributesController.php:2821
+#: Controller/AttributesController.php:2541
 msgid "This action can only be accessed via AJAX."
-msgstr ""
+msgstr "Это действие доступно только через AJAX."
 
-#: Controller/AttributesController.php:2830;3081;3095;3106
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
 msgid "You are not authorised to do that."
 msgstr ""
 
-#: Controller/AttributesController.php:2935
-#: Controller/EventsController.php:4431
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
 msgid "This functionality requires API key access."
-msgstr ""
+msgstr "Эта функция требует ключ доступа к API."
 
-#: Controller/AttributesController.php:2943
+#: Controller/AttributesController.php:2663
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
-msgstr ""
+msgstr "Это действие только для API. Пожалуйста, обратитесь к странице автоматизации для получения информации о том, как его использовать."
 
-#: Controller/AttributesController.php:2955
+#: Controller/AttributesController.php:2675
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr ""
 
-#: Controller/AttributesController.php:3116
+#: Controller/AttributesController.php:2836
 msgid "Invalid script."
-msgstr ""
+msgstr "Некорректный сценарий."
 
-#: Controller/AttributesController.php:3181
+#: Controller/AttributesController.php:2901
 msgid "No valid enrichment options found for this attribute."
 msgstr ""
 
-#: Controller/AttributesController.php:3245
+#: Controller/AttributesController.php:2964
 msgid "Invalid type requested."
-msgstr ""
+msgstr "Недопустимый тип запроса."
 
-#: Controller/AttributesController.php:3476
-#: Controller/EventsController.php:5209
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr ""
 
-#: Controller/AttributesController.php:3480;3495
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3243;3258
+#: Controller/ShadowAttributesController.php:677
 msgid "Invalid Attribute."
-msgstr ""
+msgstr "Некорректный атрибут."
 
-#: Controller/AttributesController.php:3483;3498
-#: Controller/EventsController.php:5216;5230
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
 msgid "You don't have permission to do that."
-msgstr ""
+msgstr "У вас недостаточно прав для этого."
 
 #: Controller/EventBlacklistsController.php:15
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr ""
 
-#: Controller/EventsController.php:804
+#: Controller/EventsController.php:848
 msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:806
+#: Controller/EventsController.php:850
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:812
+#: Controller/EventsController.php:856
 msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:814
+#: Controller/EventsController.php:858
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr ""
 
-#: Controller/EventsController.php:1527
+#: Controller/EventsController.php:1559
+msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
+msgstr ""
+
+#: Controller/EventsController.php:1769
 msgid "You don't have permissions to create events"
 msgstr ""
 
-#: Controller/EventsController.php:1533
+#: Controller/EventsController.php:1775
 msgid "No valid event data received."
 msgstr ""
 
-#: Controller/EventsController.php:1569
+#: Controller/EventsController.php:1811
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr ""
 
-#: Controller/EventsController.php:1573;1577
+#: Controller/EventsController.php:1815;1819
 msgid "Invalid Sharing Group or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:1601
+#: Controller/EventsController.php:1843
 msgid "Event blocked by local blacklist."
-msgstr ""
+msgstr "Событие заблокировано локальным черным списком."
 
-#: Controller/EventsController.php:1614;1693;1955
+#: Controller/EventsController.php:1856;1933;2197
 msgid "The event has been saved"
-msgstr ""
+msgstr "Событие сохранено"
 
-#: Controller/EventsController.php:1622
+#: Controller/EventsController.php:1864
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr ""
 
-#: Controller/EventsController.php:1633
+#: Controller/EventsController.php:1870
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr ""
 
-#: Controller/EventsController.php:1635;1958
+#: Controller/EventsController.php:1872;2200
 msgid "The event could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/EventsController.php:1719
-msgid "You may only upload MISP XML or MISP JSON files."
+#: Controller/EventsController.php:1912
+msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
 msgstr ""
 
-#: Controller/EventsController.php:1720
+#: Controller/EventsController.php:1959
+msgid "You may only upload MISP XML or MISP JSON files."
+msgstr "Вы можете загружать только файлы MISP XML или MISP JSON."
+
+#: Controller/EventsController.php:1960
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr ""
 
-#: Controller/EventsController.php:1768
+#: Controller/EventsController.php:2009
 msgid "STIX document imported, event's created: "
 msgstr ""
 
-#: Controller/EventsController.php:1771
+#: Controller/EventsController.php:2012
 msgid "STIX document imported."
-msgstr ""
+msgstr "Документ STIX импортирован."
 
-#: Controller/EventsController.php:1774
+#: Controller/EventsController.php:2015
 msgid "Could not import STIX document: "
-msgstr ""
+msgstr "Не удалось импортировать документ STIX: "
 
-#: Controller/EventsController.php:1781
+#: Controller/EventsController.php:2022
 msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
 msgstr ""
 
-#: Controller/EventsController.php:1805;1890
+#: Controller/EventsController.php:2046;2131
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr ""
 
-#: Controller/EventsController.php:1813
+#: Controller/EventsController.php:2054
 msgid "Invalid event ID entered."
 msgstr ""
 
-#: Controller/EventsController.php:1818
+#: Controller/EventsController.php:2059
 msgid "You are not authorised to read the selected event."
 msgstr ""
 
-#: Controller/EventsController.php:2109;2172
+#: Controller/EventsController.php:2349;2387;2450
 msgid "You don't have the permission to do that."
 msgstr ""
 
-#: Controller/EventsController.php:2259
+#: Controller/EventsController.php:2358
+msgid "Event unpublished."
+msgstr "Событие не опубликовано."
+
+#: Controller/EventsController.php:2537
 msgid "Email sent to the reporter."
 msgstr ""
 
-#: Controller/EventsController.php:2261
+#: Controller/EventsController.php:2539
 msgid "Sending of email failed"
-msgstr ""
+msgstr "Не удалось отправить email"
 
-#: Controller/EventsController.php:2397
+#: Controller/EventsController.php:2678
 msgid "This feature is currently disabled"
 msgstr ""
 
-#: Controller/EventsController.php:2439;4025
+#: Controller/EventsController.php:2720;3986
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
 msgstr ""
 
-#: Controller/EventsController.php:2475
+#: Controller/EventsController.php:2756
 msgid "Invalid Event ID."
-msgstr ""
+msgstr "Некорректный идентификатор события."
 
-#: Controller/EventsController.php:2522
+#: Controller/EventsController.php:2803
 msgid "No events found that match the passed parameters."
 msgstr ""
 
-#: Controller/EventsController.php:2547
+#: Controller/EventsController.php:2828
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
 msgstr ""
 
-#: Controller/EventsController.php:2622;2684
+#: Controller/EventsController.php:2903
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
 msgstr ""
 
-#: Controller/EventsController.php:2641
-#: Model/Attribute.php:1927
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
 msgid "Invalid hash type."
-msgstr ""
+msgstr "Некорректный тип хэша."
 
-#: Controller/EventsController.php:2871
+#: Controller/EventsController.php:3025
 msgid "Filename not allowed."
-msgstr ""
+msgstr "Имя файла не разрешен."
 
-#: Controller/EventsController.php:2892
+#: Controller/EventsController.php:3045
 msgid "Problem with writing the ioc file. Please report to administrator."
 msgstr ""
 
-#: Controller/EventsController.php:2986
+#: Controller/EventsController.php:3139
 msgid "This is not a valid MISP XML file."
 msgstr ""
 
-#: Controller/EventsController.php:3101
-msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type)."
-msgstr ""
-
-#: Controller/EventsController.php:3294
+#: Controller/EventsController.php:3291
 msgid "Not yet implemented"
-msgstr ""
+msgstr "Пока не реализовано"
 
-#: Controller/EventsController.php:3312;3316
+#: Controller/EventsController.php:3309;3313
 msgid "Invalid event or not authorised."
 msgstr ""
 
-#: Controller/EventsController.php:3336;3406
+#: Controller/EventsController.php:3333;3403
 msgid "You don't have the privileges to access this."
 msgstr ""
 
-#: Controller/EventsController.php:3920
-msgid "Could not add tags."
+#: Controller/EventsController.php:3610
+#: Controller/TagCollectionsController.php:307
+msgid "Invalid Tag."
+msgstr "Некорректный тэг."
+
+#: Controller/EventsController.php:3626
+#: Controller/TagCollectionsController.php:323
+msgid "Tag is already attached to this event."
 msgstr ""
 
-#: Controller/EventsController.php:3971;5055
-#: Controller/ObjectsController.php:46;140;144;438
+#: Controller/EventsController.php:3637;3643
+#: Controller/TagCollectionsController.php:330
+msgid "Tag(s) added."
+msgstr "Тэг(и) добавлены."
+
+#: Controller/EventsController.php:3639
+msgid "Tag could not be added."
+msgstr "Тэг не может быть добавлен."
+
+#: Controller/EventsController.php:3645
+#: Controller/TagCollectionsController.php:338
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
 msgid "Invalid event."
+msgstr "Некорректное событие."
+
+#: Controller/EventsController.php:3918
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
 msgstr ""
 
-#: Controller/EventsController.php:4085;4115;4131
+#: Controller/EventsController.php:4049;4079;4095
 msgid "You do not have the permission to do that."
-msgstr ""
+msgstr "У вас недостаточно прав для этого."
 
-#: Controller/EventsController.php:4196;4334
+#: Controller/EventsController.php:4160;4300
 msgid "Invalid ID"
 msgstr "Неверный ID"
 
-#: Controller/EventsController.php:4200;4338
+#: Controller/EventsController.php:4164;4304
 msgid "Event not found or you are not authorised to view it."
 msgstr ""
 
-#: Controller/EventsController.php:4434;4441
+#: Controller/EventsController.php:4405;4412
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4470
+#: Controller/EventsController.php:4441
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4478
+#: Controller/EventsController.php:4449
 msgid "Event not found"
-msgstr ""
+msgstr "Событий не найдено"
 
-#: Controller/EventsController.php:4501
+#: Controller/EventsController.php:4472
 msgid "Event not found."
-msgstr ""
+msgstr "Событий не найдено."
 
-#: Controller/EventsController.php:4511
+#: Controller/EventsController.php:4482
 msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
 msgstr ""
 
-#: Controller/EventsController.php:4536
+#: Controller/EventsController.php:4507
 msgid "The creation of a new event with the supplied information has failed."
 msgstr ""
 
-#: Controller/EventsController.php:4671;4693;4722;4747;4772;4802;4823
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
 msgid "Invalid type."
-msgstr ""
+msgstr "Недопустимый тип."
 
-#: Controller/EventsController.php:4866
+#: Controller/EventsController.php:4906
 msgid "Invalid method."
-msgstr ""
+msgstr "Некорректный метод."
 
-#: Controller/EventsController.php:4946
+#: Controller/EventsController.php:4989
 msgid "%s services are not enabled."
 msgstr ""
 
-#: Controller/EventsController.php:4950
+#: Controller/EventsController.php:4993
 msgid "Attribute not found or you are not authorised to see it."
 msgstr ""
 
-#: Controller/EventsController.php:4956
+#: Controller/EventsController.php:4999
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4973
+#: Controller/EventsController.php:5016
 msgid "no valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4995
+#: Controller/EventsController.php:5038
 msgid "%s service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5007
+#: Controller/EventsController.php:5050
 msgid ": Enriched via the %s"
 msgstr ""
 
-#: Controller/EventsController.php:5136
+#: Controller/EventsController.php:5184
 msgid "Import service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5303
-msgid "Invalid ID."
-msgstr ""
-
 #: Controller/EventsController.php:5351
-#: Controller/ShadowAttributesController.php:312;317;534
-msgid "Invalid Event"
-msgstr ""
+msgid "Invalid ID."
+msgstr "Неверный ID."
 
-#: Controller/EventsController.php:5369
+#: Controller/EventsController.php:5399
+#: Controller/ShadowAttributesController.php:311;316;532
+msgid "Invalid Event"
+msgstr "Некорректное событие"
+
+#: Controller/EventsController.php:5420
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr ""
 
@@ -543,122 +588,138 @@ msgstr ""
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:193;291
+#: Controller/FeedsController.php:205;303
 msgid "Feed added."
 msgstr ""
 
-#: Controller/FeedsController.php:201
+#: Controller/FeedsController.php:213
 msgid "Feed could not be added. Invalid field: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:226;326;348;470;502;682
+#: Controller/FeedsController.php:238;338;360;482;517;721
 msgid "Invalid feed."
 msgstr ""
 
-#: Controller/FeedsController.php:299
+#: Controller/FeedsController.php:311
 msgid "Feed could not be updated. Invalid fields: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:322
+#: Controller/FeedsController.php:334
 msgid "This action requires a post request."
 msgstr ""
 
-#: Controller/FeedsController.php:355;474
+#: Controller/FeedsController.php:367;486
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr ""
 
-#: Controller/FeedsController.php:368;434
+#: Controller/FeedsController.php:380;446
 msgid "Starting fetch from Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:379
+#: Controller/FeedsController.php:391
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:384;386
+#: Controller/FeedsController.php:396;398
 msgid "Fetching the feed has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:390
+#: Controller/FeedsController.php:402
 msgid "Fetching the feed has successfuly completed."
 msgstr ""
 
-#: Controller/FeedsController.php:451
+#: Controller/FeedsController.php:463
 msgid "Fetching the feed has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:481
+#: Controller/FeedsController.php:493
 msgid "Event added."
 msgstr ""
 
-#: Controller/FeedsController.php:484
+#: Controller/FeedsController.php:496
 msgid "Event already up to date."
 msgstr ""
 
-#: Controller/FeedsController.php:486
+#: Controller/FeedsController.php:498
 msgid "Event updated."
-msgstr ""
+msgstr "Событие обновлено."
 
-#: Controller/FeedsController.php:490
+#: Controller/FeedsController.php:502
 msgid "Could not %s event."
 msgstr ""
 
-#: Controller/FeedsController.php:493
+#: Controller/FeedsController.php:505
 msgid "Download failed."
-msgstr ""
+msgstr "Ошибка загрузки."
 
-#: Controller/FeedsController.php:561
+#: Controller/FeedsController.php:597
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr ""
 
-#: Controller/FeedsController.php:600;651
+#: Controller/FeedsController.php:636;687
 msgid "Invalid feed type."
 msgstr ""
 
-#: Controller/FeedsController.php:714
+#: Controller/FeedsController.php:753
 msgid "This event is blocked by the Feed filters."
 msgstr ""
 
-#: Controller/FeedsController.php:716
+#: Controller/FeedsController.php:755
 msgid "Could not download the selected Event"
 msgstr ""
 
-#: Controller/FeedsController.php:752;756
+#: Controller/FeedsController.php:791;795
 msgid "Invalid Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:777
+#: Controller/FeedsController.php:816
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: Controller/FeedsController.php:781
+#: Controller/FeedsController.php:820
 msgid "Feed not found."
 msgstr ""
 
-#: Controller/FeedsController.php:790
+#: Controller/FeedsController.php:829
 msgid "Data pulled."
 msgstr ""
 
-#: Controller/FeedsController.php:792
+#: Controller/FeedsController.php:831
 msgid "Could not pull the selected data. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:809
+#: Controller/FeedsController.php:848
 msgid "Starting feed caching."
 msgstr ""
 
-#: Controller/FeedsController.php:824
+#: Controller/FeedsController.php:863
 msgid "Caching the feeds has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:827
+#: Controller/FeedsController.php:866
 msgid "Caching the feeds has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:858
+#: Controller/FeedsController.php:900
 msgid "Invalid feed list received."
 msgstr ""
 
+#: Controller/GalaxiesController.php:92
+msgid "All clusters"
+msgstr "Все Кластеры"
+
+#: Controller/GalaxiesController.php:135
+msgid "All namespaces"
+msgstr ""
+
+#: Controller/GalaxiesController.php:250
+msgid "Failed to parse request."
+msgstr ""
+
+#: Controller/GalaxiesController.php:253
+msgid "No clusters picked."
+msgstr ""
+
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr ""
@@ -669,13 +730,25 @@ msgstr ""
 
 #: Controller/ObjectReferencesController.php:37
 msgid "Invalid object"
-msgstr ""
+msgstr "Недопустимый объект"
 
-#: Controller/ObjectReferencesController.php:187
+#: Controller/ObjectReferencesController.php:188
 msgid "Invalid object reference"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:88
+#: Controller/ObjectTemplatesController.php:31
+msgid "All Objects"
+msgstr "Все объекты"
+
+#: Controller/ObjectTemplatesController.php:99
+msgid "Invalid object template"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:103
+msgid "Invalid object template id."
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
 msgstr ""
 
@@ -694,25 +767,25 @@ msgstr ""
 #: Controller/ObjectsController.php:131
 #: Model/Template.php:25
 msgid "Invalid template."
-msgstr ""
+msgstr "Недопустимый шаблон."
 
-#: Controller/ObjectsController.php:303
+#: Controller/ObjectsController.php:311
 msgid "You don't have permissions to edit objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:317;328;427
+#: Controller/ObjectsController.php:325;336;439
 msgid "Invalid object."
-msgstr ""
+msgstr "Недопустимый объект."
 
-#: Controller/ObjectsController.php:421
+#: Controller/ObjectsController.php:433
 msgid "You don't have permissions to delete objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:531;538;542
+#: Controller/ObjectsController.php:543;550;554
 msgid "Object not found or not authorised."
 msgstr ""
 
-#: Controller/ObjectsController.php:799
+#: Controller/ObjectsController.php:811
 msgid "%s objects successfully reconstructed."
 msgstr ""
 
@@ -766,7 +839,7 @@ msgstr ""
 
 #: Controller/RolesController.php:33
 msgid "Invalid role"
-msgstr ""
+msgstr "Неверная Роль"
 
 #: Controller/RolesController.php:67;108
 msgid "The Role could not be saved. Please, try again."
@@ -774,125 +847,149 @@ msgstr ""
 
 #: Controller/RolesController.php:157
 msgid "Role deleted"
-msgstr ""
+msgstr "Роль удалена"
 
-#: Controller/ServersController.php:204;394
+#: Controller/ServersController.php:226;417
 msgid "The pull filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:214;404
+#: Controller/ServersController.php:236;427
 msgid "The push filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:268;434
+#: Controller/ServersController.php:291;457
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr ""
 
-#: Controller/ServersController.php:280
+#: Controller/ServersController.php:303
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format? Also, make sure the organisation's name doesn't clash with an existing one."
 msgstr ""
 
-#: Controller/ServersController.php:309;490
+#: Controller/ServersController.php:332;513
 msgid "The server has been saved"
 msgstr ""
 
-#: Controller/ServersController.php:316;497
+#: Controller/ServersController.php:339;520
 msgid "The server could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ServersController.php:369;565;590;598;659;1412
+#: Controller/ServersController.php:392;589;614;623;683;1360
 msgid "Invalid server"
-msgstr ""
+msgstr "Неверный сервер"
 
-#: Controller/ServersController.php:451
+#: Controller/ServersController.php:474
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr ""
 
-#: Controller/ServersController.php:572
+#: Controller/ServersController.php:596
 msgid "Server deleted"
-msgstr ""
+msgstr "Сервер удален"
 
-#: Controller/ServersController.php:575
+#: Controller/ServersController.php:599
 msgid "Server was not deleted"
 msgstr ""
 
-#: Controller/ServersController.php:602
+#: Controller/ServersController.php:626
 msgid "Pull setting not enabled for this server."
 msgstr ""
 
-#: Controller/ServersController.php:611
-msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+#: Controller/ServersController.php:659
+msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:1309
+#: Controller/ServersController.php:696
+msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
+msgstr ""
+
+#: Controller/ServersController.php:709
+msgid "Push complete. %s events pushed, %s events could not be pushed."
+msgstr ""
+
+#: Controller/ServersController.php:734
+msgid "Push queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:1257
 msgid "File not found."
-msgstr ""
+msgstr "Файл не найден."
 
-#: Controller/ServersController.php:1315
+#: Controller/ServersController.php:1263
 msgid "File could not be deleted."
-msgstr ""
+msgstr "Файл не может быть удален."
 
-#: Controller/ServersController.php:1338;1354
+#: Controller/ServersController.php:1286;1302
 msgid "Upload failed."
 msgstr "Загрузка не удалась."
 
-#: Controller/ServersController.php:1346
+#: Controller/ServersController.php:1294
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:212
+#: Controller/ServersController.php:1748
+msgid "Starting server caching."
+msgstr ""
+
+#: Controller/ServersController.php:1763
+msgid "Caching the servers has failed."
+msgstr ""
+
+#: Controller/ServersController.php:1766
+msgid "Caching the servers has successfully completed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:211
 msgid "Moving of the file that this attachment references failed."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:280
+#: Controller/ShadowAttributesController.php:279
 msgid "Could not discard proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:341
+#: Controller/ShadowAttributesController.php:340
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:389;392;401
+#: Controller/ShadowAttributesController.php:388;391;400
 msgid "The lines"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:441
+#: Controller/ShadowAttributesController.php:440
 msgid "The proposal has been saved"
-msgstr ""
+msgstr "Предложение было сохранено"
 
-#: Controller/ShadowAttributesController.php:453;763
+#: Controller/ShadowAttributesController.php:452;761
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:455
+#: Controller/ShadowAttributesController.php:454
 msgid "The proposal could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:492
+#: Controller/ShadowAttributesController.php:491
 msgid "Invalid Proposal"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:521
 msgid "Proposal not an attachment or malware-sample"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:617
 msgid "The attachment has been uploaded"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:619
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:624
+#: Controller/ShadowAttributesController.php:622
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:752
 msgid "The proposed Attribute has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:763
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
@@ -910,7 +1007,7 @@ msgstr ""
 
 #: Controller/ShadowAttributesController.php:983
 msgid "Invalid UUID"
-msgstr ""
+msgstr "Неверный UUID"
 
 #: Controller/ShadowAttributesController.php:1019
 msgid "This feature is only available using POST requests"
@@ -924,12 +1021,113 @@ msgstr ""
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr ""
 
+#: Controller/SightingsController.php:86
+msgid "Could not add the Sighting. Reason: "
+msgstr ""
+
+#: Controller/SightingsController.php:96;99
+msgid "Sighting added"
+msgstr ""
+
+#: Controller/SightingsController.php:152
+msgid "You are not authorised to remove sightings data as you don't have permission to modify your organisation's data."
+msgstr ""
+
+#: Controller/SightingsController.php:158
+msgid "Attribute not found"
+msgstr ""
+
+#: Controller/SightingsController.php:176
+msgid "Invalid request."
+msgstr "Неверный запрос."
+
+#: Controller/SightingsController.php:185
+msgid "Sighting added."
+msgstr ""
+
+#: Controller/SightingsController.php:187
+msgid "Sighting could not be added"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:56;177
+msgid "The tag collection has been saved"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:64;185
+msgid "The tag collection could not be added. Reason: "
+msgstr ""
+
+#: Controller/TagCollectionsController.php:85
+msgid "%s new tag collections added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:154
+msgid "Invalid Tag Collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:161
+msgid "You don't have editing rights on this Tag Collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:201;380
+msgid "Invalid tag collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:207
+msgid "Tag collection deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:215
+msgid "Tag collection could not be deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:224
+msgid "You are not allowed to delete that."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:332
+msgid "Tag(s) could not be added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:384
+msgid "Insufficient privileges to remove the tag from the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:395
+msgid "Invalid tag or tag not associated with the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:399
+msgid "Failed to remove tag from the collection."
+msgstr ""
+
 #: Controller/TagsController.php:367
 msgid "Tag deleted"
-msgstr ""
+msgstr "Тэг удален"
 
 #: Controller/TagsController.php:372
 msgid "Tag was not deleted"
+msgstr "Тэг не удален"
+
+#: Controller/TagsController.php:580
+msgid "Favourite Tags"
+msgstr "Любимые тэги"
+
+#: Controller/TagsController.php:586
+msgid "Tag Collections"
+msgstr "Коллекция тэгов"
+
+#: Controller/TagsController.php:591
+msgid "All Tags"
+msgstr "Все тэги"
+
+#: Controller/TagsController.php:601
+#: View/Taxonomies/view.ctp:2
+msgid "Taxonomy Library"
+msgstr ""
+
+#: Controller/TagsController.php:756
+msgid "Includes: "
 msgstr ""
 
 #: Controller/TemplatesController.php:408
@@ -940,15 +1138,15 @@ msgstr ""
 msgid "Event populated, but "
 msgstr ""
 
-#: Controller/UsersController.php:42;221
+#: Controller/UsersController.php:42;247
 msgid "Invalid user or not authorised."
 msgstr ""
 
-#: Controller/UsersController.php:54;430;657;907
+#: Controller/UsersController.php:54;456;683;929
 msgid "Invalid user"
-msgstr ""
+msgstr "Неверный пользователь"
 
-#: Controller/UsersController.php:119;564;728
+#: Controller/UsersController.php:119;590;754
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
@@ -958,61 +1156,77 @@ msgstr ""
 
 #: Controller/UsersController.php:150
 msgid "The profile could not be updated. Please, try again."
+msgstr "Профиль не может быть изменен. Пожалуйста, попробуйте еще раз."
+
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
 msgstr ""
 
-#: Controller/UsersController.php:198
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
 msgid "Password Changed."
-msgstr ""
+msgstr "Пароль изменен."
 
-#: Controller/UsersController.php:203
+#: Controller/UsersController.php:222
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr ""
 
-#: Controller/UsersController.php:575
+#: Controller/UsersController.php:601
 msgid "The user could not be saved. Invalid organisation."
 msgstr ""
 
-#: Controller/UsersController.php:597
+#: Controller/UsersController.php:623
 msgid "The user has been saved."
-msgstr ""
+msgstr "Пользователь сохранен."
 
-#: Controller/UsersController.php:606;843
+#: Controller/UsersController.php:632;865
 msgid "The user could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:835
+#: Controller/UsersController.php:857
 msgid "The user has been saved"
-msgstr ""
+msgstr "Пользователь сохранен"
 
-#: Controller/UsersController.php:915
+#: Controller/UsersController.php:937
 msgid "User deleted"
-msgstr ""
+msgstr "Пользователь удален"
 
-#: Controller/UsersController.php:919
+#: Controller/UsersController.php:941
 msgid "User was not deleted"
-msgstr ""
+msgstr "Пользователь не удален"
 
-#: Controller/UsersController.php:997
+#: Controller/UsersController.php:1019
 msgid "Invalid username or password, try again"
-msgstr ""
+msgstr "Неверное имя пользователя или пароль, попробуйте еще раз"
 
-#: Controller/UsersController.php:1080
+#: Controller/UsersController.php:1106
 msgid "Good-Bye"
-msgstr ""
+msgstr "До свидания"
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1147
 msgid "New authkey generated."
 msgstr ""
 
-#: Controller/UsersController.php:1230
+#: Controller/UsersController.php:1256
 msgid "You accepted the Terms and Conditions."
 msgstr ""
 
-#: Controller/UsersController.php:1419
+#: Controller/UsersController.php:1438
+msgid "Recipient email not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1443
+msgid "Recipient organisation not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1480
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr ""
 
-#: Controller/UsersController.php:1421
+#: Controller/UsersController.php:1482
 msgid "E-mails sent."
 msgstr ""
 
@@ -1040,972 +1254,1040 @@ msgstr ""
 msgid "%s was not deleted"
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:72
+#: Controller/Component/BlackListComponent.php:75
 msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:123
+#: Controller/Component/BlackListComponent.php:126
 msgid "Blacklist item added."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:152
+#: Controller/Component/BlackListComponent.php:155
 msgid "Invalid blacklist entry"
-msgstr ""
+msgstr "Неверная запись в черном списке"
 
-#: Controller/Component/BlackListComponent.php:156
+#: Controller/Component/BlackListComponent.php:159
 msgid "Blacklist entry removed"
-msgstr ""
+msgstr "Запись в черном списке удалена"
 
-#: Controller/Component/BlackListComponent.php:158
+#: Controller/Component/BlackListComponent.php:161
 msgid "Could not remove the blacklist entry"
 msgstr ""
 
-#: Model/Attribute.php:567
+#: Model/Attribute.php:591
 msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/Attribute.php:677
+#: Model/Attribute.php:703
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Attribute.php:802
+#: Model/Attribute.php:828
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Attribute.php:921
+#: Model/Attribute.php:953
 msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:928
+#: Model/Attribute.php:960
 msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:935
+#: Model/Attribute.php:967
 msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:946
+#: Model/Attribute.php:978
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:957
+#: Model/Attribute.php:989
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:972
+#: Model/Attribute.php:996
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:1011
 msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:990
+#: Model/Attribute.php:1029
 msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:995
+#: Model/Attribute.php:1034
 msgid "Invalid composite type. The format has to be %s."
 msgstr ""
 
-#: Model/Attribute.php:1006
+#: Model/Attribute.php:1045
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr ""
 
-#: Model/Attribute.php:1014
+#: Model/Attribute.php:1053
 msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1025
+#: Model/Attribute.php:1064
 msgid "Invalid CIDR notation value found."
 msgstr ""
 
-#: Model/Attribute.php:1032;1083
+#: Model/Attribute.php:1071;1122
 msgid "IP address has an invalid format."
-msgstr ""
+msgstr "IP адрес имеет неправильный формат."
 
-#: Model/Attribute.php:1037
+#: Model/Attribute.php:1076
 msgid "Port numbers have to be positive integers between 1 and 65535."
-msgstr ""
+msgstr "Номера портов должны быть положительными целыми числами от 1 до 65535."
 
-#: Model/Attribute.php:1066
+#: Model/Attribute.php:1105
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1086
+#: Model/Attribute.php:1125
 msgid "Domain name has an invalid format."
-msgstr ""
+msgstr "Неправильный формат доменного имени."
 
-#: Model/Attribute.php:1099
+#: Model/Attribute.php:1138
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1107
+#: Model/Attribute.php:1146
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr ""
 
-#: Model/Attribute.php:1118
+#: Model/Attribute.php:1157
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr ""
 
-#: Model/Attribute.php:1230
+#: Model/Attribute.php:1272
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr ""
 
-#: Model/Attribute.php:1236
+#: Model/Attribute.php:1278
 msgid "The value has to be a number greater or equal 0."
 msgstr ""
 
-#: Model/Attribute.php:1243
+#: Model/Attribute.php:1285
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:1923;1991
+#: Model/Attribute.php:1968;2036
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2527
+#: Model/Attribute.php:2616
 msgid "This field is mandatory."
-msgstr ""
+msgstr "Это поле является обязательным."
 
-#: Model/Attribute.php:2885
+#: Model/Attribute.php:3069
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
-#: Model/Event.php:4532
+#: Model/Event.php:5392
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:4534
+#: Model/Event.php:5394
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:4536
+#: Model/Event.php:5396
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:4539
+#: Model/Event.php:5399
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:4541
+#: Model/Event.php:5401
 msgid "Please "
-msgstr ""
+msgstr "Пожалуйста "
 
-#: Model/Event.php:4543
+#: Model/Event.php:5403
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:4575
+#: Model/Event.php:5435
 msgid "#"
-msgstr ""
+msgstr "#"
 
-#: Model/Event.php:4584
+#: Model/Event.php:5444
 msgid "%s not set"
 msgstr ""
 
-#: Model/Server.php:114
+#: Model/Event.php:5667
+msgid "Could not add tags."
+msgstr "Не удалось добавить тэги."
+
+#: Model/Galaxy.php:219;276;286;300
+msgid "Invalid %s."
+msgstr "Неверный %s."
+
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
 msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
 msgstr ""
 
-#: Model/Server.php:115
+#: Model/Server.php:122
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:125
+#: Model/Server.php:132
 msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
 msgstr ""
 
-#: Model/Server.php:126
+#: Model/Server.php:133
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:135
+#: Model/Server.php:142
 msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
 msgstr ""
 
-#: Model/Server.php:137
+#: Model/Server.php:144
 msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
 msgstr ""
 
-#: Model/Server.php:143
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:151
+#: Model/Server.php:166
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:161
+#: Model/Server.php:176
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr ""
 
-#: Model/Server.php:170
+#: Model/Server.php:185
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:195
 msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
 msgstr ""
 
-#: Model/Server.php:179
+#: Model/Server.php:204
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:187
+#: Model/Server.php:212
 msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
 msgstr ""
 
-#: Model/Server.php:196
+#: Model/Server.php:221
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:198
+#: Model/Server.php:223
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:204;212;230;254;262;270;278;335;383;391;457
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
 msgid "This setting is deprecated and can be safely removed."
 msgstr ""
 
-#: Model/Server.php:220
+#: Model/Server.php:245
 msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
 msgstr ""
 
-#: Model/Server.php:238
+#: Model/Server.php:263
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:246
+#: Model/Server.php:271
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:286
+#: Model/Server.php:311
 msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:294
+#: Model/Server.php:319
 msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:302
+#: Model/Server.php:327
 msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:310
+#: Model/Server.php:335
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:318
+#: Model/Server.php:343
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:327
+#: Model/Server.php:352
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:329
+#: Model/Server.php:354
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:343
+#: Model/Server.php:368
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:351
+#: Model/Server.php:376
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:359
+#: Model/Server.php:384
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:367
+#: Model/Server.php:392
 msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
 msgstr ""
 
-#: Model/Server.php:375
+#: Model/Server.php:400
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:399
+#: Model/Server.php:424
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:407
+#: Model/Server.php:432
 msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
 msgstr ""
 
-#: Model/Server.php:416
+#: Model/Server.php:441
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:424
+#: Model/Server.php:449
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:432
+#: Model/Server.php:457
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:440
+#: Model/Server.php:465
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr ""
 
-#: Model/Server.php:449
+#: Model/Server.php:474
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:465
+#: Model/Server.php:490
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:473
+#: Model/Server.php:498
 msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
 msgstr ""
 
-#: Model/Server.php:481
+#: Model/Server.php:506
 msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
 msgstr ""
 
-#: Model/Server.php:489
+#: Model/Server.php:514
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:498
+#: Model/Server.php:523
 msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
 msgstr ""
 
-#: Model/Server.php:507
+#: Model/Server.php:532
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:516
+#: Model/Server.php:541
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:550
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:524
+#: Model/Server.php:558
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:533
+#: Model/Server.php:567
 msgid "Used on the login page, before the MISP logo"
 msgstr ""
 
-#: Model/Server.php:541
+#: Model/Server.php:575
 msgid "Used on the login page, after the MISP logo"
 msgstr ""
 
-#: Model/Server.php:549
+#: Model/Server.php:583
 msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:557
+#: Model/Server.php:591
 msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:565
+#: Model/Server.php:599
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:573
+#: Model/Server.php:607
 msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
 msgstr ""
 
-#: Model/Server.php:581
+#: Model/Server.php:615
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:589
+#: Model/Server.php:623
 msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
 msgstr ""
 
-#: Model/Server.php:597
+#: Model/Server.php:631
 msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
 msgstr ""
 
-#: Model/Server.php:605
+#: Model/Server.php:639
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:614
+#: Model/Server.php:648
 msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:623
+#: Model/Server.php:657
 msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:631
+#: Model/Server.php:665
 msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
 msgstr ""
 
-#: Model/Server.php:638
+#: Model/Server.php:672
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:645
+#: Model/Server.php:679
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:654
+#: Model/Server.php:688
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:662
+#: Model/Server.php:696
 msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
 msgstr ""
 
-#: Model/Server.php:671
+#: Model/Server.php:705
 msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
 msgstr ""
 
-#: Model/Server.php:680
+#: Model/Server.php:714
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:689
+#: Model/Server.php:723
 msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:698
+#: Model/Server.php:732
 msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:707
+#: Model/Server.php:741
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:717
+#: Model/Server.php:751
 msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
 msgstr ""
 
-#: Model/Server.php:726
+#: Model/Server.php:760
 msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
 msgstr ""
 
-#: Model/Server.php:735
+#: Model/Server.php:769
 msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
 msgstr ""
 
-#: Model/Server.php:744
+#: Model/Server.php:778
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:753
+#: Model/Server.php:787
 msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
 msgstr ""
 
-#: Model/Server.php:762
-msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/webroot/css directory and enter the name here."
+#: Model/Server.php:796
+msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
 msgstr ""
 
-#: Model/Server.php:771
+#: Model/Server.php:805
 msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
 msgstr ""
 
-#: Model/Server.php:780
+#: Model/Server.php:814
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr ""
 
-#: Model/Server.php:789
+#: Model/Server.php:823
 msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
 msgstr ""
 
-#: Model/Server.php:799
+#: Model/Server.php:833
 msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
 msgstr ""
 
-#: Model/Server.php:808
+#: Model/Server.php:842
 msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:816
+#: Model/Server.php:850
 msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:824
+#: Model/Server.php:858
 msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
 msgstr ""
 
-#: Model/Server.php:832
+#: Model/Server.php:866
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:841
+#: Model/Server.php:875
 msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
 msgstr ""
 
-#: Model/Server.php:849
+#: Model/Server.php:883
+msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
+msgstr ""
+
+#: Model/Server.php:891
 msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
 msgstr ""
 
-#: Model/Server.php:861
+#: Model/Server.php:903
 msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
 msgstr ""
 
-#: Model/Server.php:869
+#: Model/Server.php:911
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:877
+#: Model/Server.php:919
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:885
+#: Model/Server.php:927
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:893
+#: Model/Server.php:935
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:901
+#: Model/Server.php:943
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:910
+#: Model/Server.php:952
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:921
+#: Model/Server.php:963
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr ""
 
-#: Model/Server.php:929
+#: Model/Server.php:971
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:937
+#: Model/Server.php:979
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:945
+#: Model/Server.php:987
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:953
+#: Model/Server.php:995
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:965
+#: Model/Server.php:1007
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:973
+#: Model/Server.php:1015
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:981
+#: Model/Server.php:1023
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:989
+#: Model/Server.php:1031
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:997
+#: Model/Server.php:1039
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1008
+#: Model/Server.php:1050
 msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
 msgstr ""
 
-#: Model/Server.php:1017
+#: Model/Server.php:1059
 msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
 msgstr ""
 
-#: Model/Server.php:1026
+#: Model/Server.php:1068
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr ""
 
-#: Model/Server.php:1034
+#: Model/Server.php:1076
 msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 msgstr ""
 
-#: Model/Server.php:1042
+#: Model/Server.php:1084
 msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
 msgstr ""
 
-#: Model/Server.php:1051
+#: Model/Server.php:1093
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1060
+#: Model/Server.php:1102
 msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
 msgstr ""
 
-#: Model/Server.php:1069
+#: Model/Server.php:1111
 msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
 msgstr ""
 
-#: Model/Server.php:1071
+#: Model/Server.php:1113
 msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
 msgstr ""
 
-#: Model/Server.php:1081
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1089
+#: Model/Server.php:1149
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr ""
 
-#: Model/Server.php:1100
+#: Model/Server.php:1160
 msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
 msgstr ""
 
-#: Model/Server.php:1108
+#: Model/Server.php:1168
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr ""
 
-#: Model/Server.php:1116
+#: Model/Server.php:1176
 msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
 msgstr ""
 
-#: Model/Server.php:1125
-msgid "The timeout duration of sessions (in MINUTES)."
-msgstr ""
-
-#: Model/Server.php:1133
-msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
-msgstr ""
-
-#: Model/Server.php:1144
-msgid "The default policy action for the values added to the RPZ."
-msgstr ""
-
-#: Model/Server.php:1153
-msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
-msgstr ""
-
-#: Model/Server.php:1161
-msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
-msgstr ""
-
-#: Model/Server.php:1169
-msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1177
-msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
 #: Model/Server.php:1185
-msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
 msgstr ""
 
 #: Model/Server.php:1193
+msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
+msgstr ""
+
+#: Model/Server.php:1204
+msgid "The default policy action for the values added to the RPZ."
+msgstr ""
+
+#: Model/Server.php:1213
+msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
+msgstr ""
+
+#: Model/Server.php:1221
+msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
+msgstr ""
+
+#: Model/Server.php:1229
+msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1237
+msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1245
+msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1253
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1201
+#: Model/Server.php:1261
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1217
+#: Model/Server.php:1277
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:1225
+#: Model/Server.php:1285
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1233
+#: Model/Server.php:1293
 msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
 msgstr ""
 
-#: Model/Server.php:1242
+#: Model/Server.php:1302
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1251
+#: Model/Server.php:1311
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1260
+#: Model/Server.php:1320
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1269
+#: Model/Server.php:1329
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1278
+#: Model/Server.php:1338
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1287
+#: Model/Server.php:1347
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1296
+#: Model/Server.php:1356
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1304
+#: Model/Server.php:1364
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1312
+#: Model/Server.php:1372
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1320
+#: Model/Server.php:1380
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1328
+#: Model/Server.php:1388
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1336
+#: Model/Server.php:1396
 msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1344
+#: Model/Server.php:1404
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1352
+#: Model/Server.php:1412
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1360
+#: Model/Server.php:1420
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1368
+#: Model/Server.php:1428
 msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1376
+#: Model/Server.php:1436
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1384
-msgid "The URL(s) at which to access ElasticSearch - comma seperate if you want to have more than one."
+#: Model/Server.php:1444
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1392
+#: Model/Server.php:1452
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1460
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1468
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1416
+#: Model/Server.php:1476
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1424
+#: Model/Server.php:1484
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr ""
 
-#: Model/Server.php:1432
+#: Model/Server.php:1492
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:1440
+#: Model/Server.php:1500
 msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
 msgstr ""
 
-#: Model/Server.php:1449
+#: Model/Server.php:1509
 msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
 msgstr ""
 
-#: Model/Server.php:1457
+#: Model/Server.php:1517
 msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
 msgstr ""
 
-#: Model/Server.php:1465
+#: Model/Server.php:1525
 msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
 msgstr ""
 
-#: Model/Server.php:1475
+#: Model/Server.php:1535
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1484
+#: Model/Server.php:1544
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1493
+#: Model/Server.php:1553
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1502
+#: Model/Server.php:1562
 msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
 msgstr ""
 
-#: Model/Server.php:1511
+#: Model/Server.php:1571
 msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
 msgstr ""
 
-#: Model/Server.php:1520
+#: Model/Server.php:1580
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr ""
 
-#: Model/Server.php:1529
+#: Model/Server.php:1589
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1537
+#: Model/Server.php:1597
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1545
+#: Model/Server.php:1605
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1553;1665
+#: Model/Server.php:1613;1725
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:1561;1682
+#: Model/Server.php:1621;1742
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:1569
+#: Model/Server.php:1629
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1577
+#: Model/Server.php:1637
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1585
+#: Model/Server.php:1645
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1593
+#: Model/Server.php:1653
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1601
+#: Model/Server.php:1661
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:1609
+#: Model/Server.php:1669
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:1617
+#: Model/Server.php:1677
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1625
+#: Model/Server.php:1685
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:1633
+#: Model/Server.php:1693
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1641
+#: Model/Server.php:1701
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1649
+#: Model/Server.php:1709
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:1657
+#: Model/Server.php:1717
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:1673
+#: Model/Server.php:1733
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:1690
+#: Model/Server.php:1750
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:1699
+#: Model/Server.php:1759
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:1708
+#: Model/Server.php:1768
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr ""
 
-#: Model/Server.php:1717
+#: Model/Server.php:1777
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:1726
+#: Model/Server.php:1786
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:1735
+#: Model/Server.php:1795
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:1745
+#: Model/Server.php:1805
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:1754
+#: Model/Server.php:1814
 msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
 msgstr ""
 
-#: Model/Server.php:2401
+#: Model/Server.php:1947
+msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/Server.php:2054
+msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+msgstr ""
+
+#: Model/Server.php:2056
+msgid "Sorry, this is not yet implemented"
+msgstr ""
+
+#: Model/Server.php:2057
+msgid "Something went wrong while trying to pull"
+msgstr ""
+
+#: Model/Server.php:2069;2071
+msgid "Unknown issue."
+msgstr ""
+
+#: Model/Server.php:2535
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:2404
+#: Model/Server.php:2538
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:2412
+#: Model/Server.php:2546
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:2527
+#: Model/Server.php:2661
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3130
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
 msgid "Organisation logos"
 msgstr ""
 
-#: Model/Server.php:3131
+#: Model/Server.php:3476
 msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
 msgstr ""
 
-#: Model/Server.php:3133
+#: Model/Server.php:3478
 msgid "48x48 pixel .png files"
 msgstr ""
 
-#: Model/Server.php:3136;3151
+#: Model/Server.php:3481;3496
 msgid "Filename must be in the following format: *.png"
 msgstr ""
 
-#: Model/Server.php:3140
+#: Model/Server.php:3485
 msgid "Additional image files"
 msgstr ""
 
-#: Model/Server.php:3141
+#: Model/Server.php:3486
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:3148
+#: Model/Server.php:3493
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:3765
+#: Model/Server.php:3665
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr ""
+
+#: Model/Server.php:4115
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:3766
+#: Model/Server.php:4116
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:3770
+#: Model/Server.php:4120
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:3771
+#: Model/Server.php:4121
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
@@ -2029,7 +2311,7 @@ msgstr ""
 
 #: View/Attributes/add.ctp:7
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr ""
@@ -2074,7 +2356,7 @@ msgstr ""
 #: View/Attributes/add.ctp:36
 #: View/Attributes/add_attachment.ctp:24
 #: View/Attributes/edit.ctp:24
-#: View/Events/add.ctp:24
+#: View/Events/add.ctp:20
 msgid "Distribution "
 msgstr ""
 
@@ -2082,7 +2364,7 @@ msgstr ""
 #: View/Attributes/add_attachment.ctp:33
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
-#: View/Events/add.ctp:34
+#: View/Events/add.ctp:30
 #: View/Events/edit.ctp:26
 #: View/Feeds/add.ctp:176
 #: View/Feeds/edit.ctp:172
@@ -2109,23 +2391,24 @@ msgstr ""
 msgid "for Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/add.ctp:87
+#: View/Attributes/add.ctp:91
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_mitre_attack_matrix.ctp:14;113
+#: View/Elements/view_galaxy_matrix.ctp:76;199
 #: View/Events/contact.ctp:29
 #: View/Events/edit.ctp:59
 #: View/Events/free_text_import.ctp:27
 #: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:78
+#: View/ObjectReferences/ajax/add.ctp:130
 #: View/Objects/add.ctp:147
 #: View/Objects/revise_object.ctp:85
 #: View/Organisations/admin_add.ctp:49
 #: View/Organisations/admin_edit.ctp:60
-#: View/Servers/add.ctp:126
-#: View/Servers/edit.ctp:167
-#: View/SharingGroups/add.ctp:75
+#: View/Servers/add.ctp:115
+#: View/Servers/edit.ctp:162
+#: View/SharingGroups/add.ctp:115
+#: View/TagCollections/add.ctp:21
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
 #: View/TemplateElements/ajax/template_element_add_file.ctp:67
 #: View/TemplateElements/ajax/template_element_add_text.ctp:29
@@ -2134,22 +2417,25 @@ msgstr ""
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/Users/admin_add.ctp:97
 #: View/Users/admin_edit.ctp:91
-#: View/Users/admin_email.ctp:51
+#: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
 #: View/Users/change_pw.ctp:23
 #: View/Users/edit.ctp:41
 #: View/Whitelists/admin_edit.ctp:12
 msgid "Submit"
-msgstr ""
+msgstr "Подтвердить"
 
-#: View/Attributes/add.ctp:88
+#: View/Attributes/add.ctp:92
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:62
+#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/exportSearch.ctp:32
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Elements/eventattributecreation.ctp:89
-#: View/Elements/view_mitre_attack_matrix.ctp:114
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/view_galaxy_matrix.ctp:200
 #: View/Elements/serverRuleElements/pull.ctp:70
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2158,21 +2444,18 @@ msgstr ""
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/ajax/enrich_event.ctp:21
+#: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:15
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/exportChoice.ctp:51
 #: View/Events/ajax/importChoice.ctp:12
 #: View/Events/ajax/quick_edit.ctp:6
-#: View/Galaxies/ajax/cluster_choice.ctp:32
-#: View/Galaxies/ajax/galaxy_choice.ctp:22
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:15
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
-#: View/ObjectReferences/ajax/add.ctp:82
+#: View/ObjectReferences/ajax/add.ctp:134
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/ObjectTemplates/ajax/object_choice.ctp:10
 #: View/Objects/add.ctp:153
 #: View/Objects/revise_object.ctp:87
 #: View/Objects/ajax/delete.ctp:24
@@ -2187,11 +2470,12 @@ msgstr ""
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
 #: View/Sightings/ajax/advanced.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
-#: View/Tags/ajax/select_tag.ctp:32
-#: View/Tags/ajax/taxonomy_choice.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:6
 #: View/TemplateElements/ajax/template_element_add_file.ctp:73
@@ -2201,6 +2485,7 @@ msgstr ""
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:35
 #: View/Templates/ajax/template_choices.ctp:15
 #: View/Users/admin_filter_user_index.ctp:107
+#: View/Users/ajax/emailConfirmTemplate.ctp:14
 #: View/Users/ajax/fetchpgpkey.ctp:24
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
@@ -2239,10 +2524,8 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:4
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_view.ctp:14
-#: View/Users/view.ctp:14
 msgid "Org"
-msgstr ""
+msgstr "Организация"
 
 #: View/Attributes/alternate_search_result.ctp:8
 #: View/EventBlacklists/edit.ctp:17
@@ -2255,7 +2538,7 @@ msgid "Event date"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Event graph"
 msgstr ""
 
@@ -2283,12 +2566,12 @@ msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:26
 #: View/Noticelists/view.ctp:36
-#: View/Warninglists/view.ctp:54
+#: View/Warninglists/view.ctp:35
 msgid "Values"
-msgstr ""
+msgstr "Значения"
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:75
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:46
@@ -2320,9 +2603,9 @@ msgstr ""
 #: View/Attributes/edit.ctp:16
 #: View/Pages/doc/using_the_system.ctp:368
 msgid "disabled"
-msgstr ""
+msgstr "отключено"
 
-#: View/Attributes/edit.ctp:64
+#: View/Attributes/edit.ctp:68
 #: View/ShadowAttributes/add.ctp:55
 #: View/ShadowAttributes/edit.ctp:45;54
 msgid "Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this."
@@ -2330,17 +2613,13 @@ msgstr ""
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
 #: View/Users/statistics_data.ctp:19
 msgid "Attributes"
-msgstr ""
-
-#: View/Attributes/index.ctp:7
-msgid "Results for all attributes"
-msgstr ""
+msgstr "Атрибуты"
 
 #: View/Attributes/index.ctp:8
 msgid " with the value containing "
@@ -2354,176 +2633,266 @@ msgstr ""
 msgid " from the events "
 msgstr ""
 
-#: View/Attributes/index.ctp:12
-msgid " of category "
+#: View/Attributes/index.ctp:11
+msgid " carrying the tag(s) "
 msgstr ""
 
-#: View/Attributes/index.ctp:13
+#: View/Attributes/index.ctp:12
 msgid " of type "
 msgstr ""
 
-#: View/Attributes/index.ctp:14
-msgid " created by the organisation "
+#: View/Attributes/index.ctp:13
+msgid " of category "
 msgstr ""
 
-#: View/Attributes/index.ctp:28;173
-#: View/Elements/eventattribute.ctp:60;258
+#: View/Attributes/index.ctp:14
+msgid " created by organisation "
+msgstr ""
+
+#: View/Attributes/index.ctp:26
+msgid "Results for all attributes"
+msgstr ""
+
+#: View/Attributes/index.ctp:39;132
+#: View/Elements/eventattribute.ctp:60;229
 #: View/Elements/eventdiscussion.ctp:15;126
+#: View/Elements/generic_table.ctp:16
+#: View/Elements/generic_table_row.ctp:16
 #: View/Elements/Feeds/eventattribute.ctp:20;86
 #: View/Elements/Servers/eventattribute.ctp:20;86
 #: View/EventBlacklists/index.ctp:13;54
-#: View/Events/index.ctp:12;89
+#: View/Events/index.ctp:12;115
 #: View/Events/proposal_event_index.ctp:12;95
 #: View/Events/ajax/index.ctp:13;39
 #: View/Feeds/freetext_index.ctp:22;86
-#: View/Feeds/index.ctp:20;230
-#: View/Feeds/preview_index.ctp:14;82
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
 #: View/Galaxies/index.ctp:13;53
-#: View/GalaxyClusters/ajax/index.ctp:11;96
+#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:33;162
-#: View/Logs/admin_index.ctp:37;111
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
 #: View/Logs/event_index.ctp:17;61
 #: View/News/index.ctp:39
 #: View/Noticelists/index.ctp:13;83
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
-#: View/ObjectTemplates/index.ctp:13;126
+#: View/ObjectTemplates/index.ctp:13;137
 #: View/OrgBlacklists/index.ctp:13;52
-#: View/Organisations/index.ctp:42;138
+#: View/Organisations/index.ctp:42;159
 #: View/Regexp/admin_index.ctp:13;51
 #: View/Regexp/index.ctp:13;45
 #: View/Roles/admin_index.ctp:13;82
 #: View/Roles/index.ctp:13;55
-#: View/Servers/index.ctp:13;117
-#: View/Servers/preview_index.ctp:15;164
-#: View/ShadowAttributes/index.ctp:12;108
-#: View/SharingGroups/index.ctp:13;86
+#: View/Servers/index.ctp:13;156
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;63
-#: View/Taxonomies/view.ctp:53;169
+#: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:12;56
+#: View/Users/admin_index.ctp:12;86
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
 #: View/Whitelists/index.ctp:14;42
 msgid "previous"
-msgstr ""
+msgstr "пред"
 
-#: View/Attributes/index.ctp:30;175
-#: View/Elements/eventattribute.ctp:62;260
+#: View/Attributes/index.ctp:41;134
+#: View/Elements/eventattribute.ctp:62;231
 #: View/Elements/eventdiscussion.ctp:17;128
+#: View/Elements/generic_table.ctp:18
+#: View/Elements/generic_table_row.ctp:18
 #: View/Elements/Feeds/eventattribute.ctp:22;88
 #: View/Elements/Servers/eventattribute.ctp:22;88
 #: View/EventBlacklists/index.ctp:15;56
-#: View/Events/index.ctp:14;91
+#: View/Events/index.ctp:14;117
 #: View/Events/proposal_event_index.ctp:14;97
 #: View/Events/ajax/index.ctp:15;41
 #: View/Feeds/freetext_index.ctp:24;88
-#: View/Feeds/index.ctp:22;232
-#: View/Feeds/preview_index.ctp:16;84
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
 #: View/Galaxies/index.ctp:15;55
-#: View/GalaxyClusters/ajax/index.ctp:13;98
+#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:35;164
-#: View/Logs/admin_index.ctp:39;113
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
 #: View/Logs/event_index.ctp:19;63
 #: View/News/index.ctp:41
 #: View/Noticelists/index.ctp:15;85
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
-#: View/ObjectTemplates/index.ctp:15;128
+#: View/ObjectTemplates/index.ctp:15;139
 #: View/OrgBlacklists/index.ctp:15;54
-#: View/Organisations/index.ctp:44;140
+#: View/Organisations/index.ctp:44;161
 #: View/Regexp/admin_index.ctp:15;53
 #: View/Regexp/index.ctp:15;47
 #: View/Roles/admin_index.ctp:15;84
 #: View/Roles/index.ctp:15;57
-#: View/Servers/index.ctp:15;119
-#: View/Servers/preview_index.ctp:17;166
-#: View/ShadowAttributes/index.ctp:14;110
-#: View/SharingGroups/index.ctp:15;88
+#: View/Servers/index.ctp:15;158
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;65
-#: View/Taxonomies/view.ctp:55;171
+#: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:14;58
+#: View/Users/admin_index.ctp:14;88
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
 #: View/Whitelists/index.ctp:16;44
 msgid "next"
+msgstr "след"
+
+#: View/Attributes/index.ctp:53
+#: View/Elements/eventattribute.ctp:152
+#: View/Elements/Events/eventIndexTable.ctp:37
+#: View/Elements/Feeds/eventattribute.ctp:45
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/view.ctp:117
+#: View/Feeds/preview_event.ctp:16
+#: View/Noticelists/view.ctp:43
+#: View/Pages/doc/using_the_system.ctp:164;207;318
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
+#: View/Tags/index.ctp:10
+#: View/Templates/add.ctp:12
+#: View/Templates/edit.ctp:12
+#: View/Templates/view.ctp:19
+msgid "Tags"
 msgstr ""
 
-#: View/Attributes/index.ctp:148
-msgid "Are you sure you want to delete this attribute?"
+#: View/Attributes/index.ctp:54
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/Galaxies/index.ctp:2
+msgid "Galaxies"
 msgstr ""
 
-#: View/Attributes/index.ctp:151
-msgid "Propose an edit"
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:161
+msgid "Correlate"
 msgstr ""
 
-#: View/Attributes/index.ctp:155
-#: View/Elements/Events/eventIndexTable.ctp:82;86;229
-#: View/Elements/Users/userIndexTable.ctp:94
-#: View/Elements/dashboard/dashboard_events.ctp:4;5
-#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
-#: View/Events/proposal_event_index.ctp:45;49
-#: View/Feeds/preview_index.ctp:66
-#: View/Noticelists/index.ctp:66
-#: View/ObjectTemplates/index.ctp:104
-#: View/Organisations/index.ctp:122
-#: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/preview_index.ctp:148
-#: View/Taxonomies/index.ctp:47
-#: View/Warninglists/index.ctp:60
-msgid "View"
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Events/view.ctp:314
+#: View/Feeds/preview_event.ctp:73
+#: View/Pages/doc/using_the_system.ctp:235
+#: View/Servers/preview_event.ctp:95
+msgid "Related Events"
 msgstr ""
 
-#: View/Attributes/index.ctp:166
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:163
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+msgid "Feed hits"
+msgstr ""
+
+#: View/Attributes/index.ctp:61
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
+msgid "Sightings"
+msgstr ""
+
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
+#: View/Tags/index.ctp:73
+msgid "Activity"
+msgstr "Активность"
+
+#: View/Attributes/index.ctp:63
+#: View/Elements/eventattribute.ctp:168
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/healthElements/files.ctp:33
+#: View/Elements/healthElements/workers.ctp:60
+#: View/Elements/templateElements/templateRowAttribute.ctp:94
+#: View/Elements/templateElements/templateRowFile.ctp:71
+#: View/Elements/templateElements/templateRowText.ctp:28
+#: View/EventBlacklists/index.ctp:27
+#: View/Events/export.ctp:31
+#: View/Events/resolved_attributes.ctp:53
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:51
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:66
+#: View/OrgBlacklists/index.ctp:26
+#: View/Organisations/index.ctp:102
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:25
+#: View/Roles/admin_index.ctp:35
+#: View/Servers/index.ctp:37
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:27
+#: View/Templates/index.ctp:27
+#: View/Threads/index.ctp:28
+#: View/Warninglists/index.ctp:38
+#: View/Whitelists/admin_index.ctp:24
+msgid "Actions"
+msgstr "Действия"
+
+#: View/Attributes/index.ctp:125
 #: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
 #: View/EventBlacklists/index.ctp:47
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:223
-#: View/Feeds/preview_index.ctp:74
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
 #: View/Galaxies/index.ctp:46
-#: View/GalaxyClusters/ajax/index.ctp:90
+#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:155
-#: View/Logs/admin_index.ctp:104
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
 #: View/Logs/event_index.ctp:54
 #: View/News/index.ctp:33
 #: View/Noticelists/index.ctp:76
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:66
-#: View/ObjectTemplates/index.ctp:119
+#: View/ObjectTemplates/index.ctp:130
 #: View/OrgBlacklists/index.ctp:45
-#: View/Organisations/index.ctp:131
+#: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
 #: View/Roles/admin_index.ctp:75
 #: View/Roles/index.ctp:48
-#: View/Servers/index.ctp:110
-#: View/Servers/preview_index.ctp:156
-#: View/ShadowAttributes/index.ctp:101
-#: View/SharingGroups/index.ctp:79
+#: View/Servers/index.ctp:149
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:56
-#: View/Taxonomies/view.ctp:162
+#: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:49
+#: View/Users/admin_index.ctp:79
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
 #: View/Whitelists/index.ctp:35
 msgid "Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}"
-msgstr ""
+msgstr "Страница {:page} из {:pages}, показано {:current} записей из {:count}, начиная с {:start}, заканчивая {:end}"
 
 #: View/Attributes/report_validation_issues_attributes.ctp:2
 msgid "Listing invalid attribute validations"
@@ -2541,7 +2910,7 @@ msgstr ""
 #: View/Elements/templateElements/populateTemplateFile.ctp:21
 #: View/Errors/error403.ctp:3
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #: View/Attributes/report_validation_issues_attributes.ctp:13
 msgid "[Attribute details]"
@@ -2564,26 +2933,22 @@ msgid "Containing the following expressions"
 msgstr ""
 
 #: View/Attributes/search.ctp:11
-msgid "Being an attribute matching the following tags"
+msgid "Having tag or being an attribute of an event having the tag"
 msgstr ""
 
 #: View/Attributes/search.ctp:12
 msgid "Being attributes of the following event IDs, event UUIDs or attribute UUIDs"
 msgstr ""
 
-#: View/Attributes/search.ctp:13
-msgid "Being an attribute of an event matching the following tags"
-msgstr ""
-
-#: View/Attributes/search.ctp:20
+#: View/Attributes/search.ctp:15
 msgid "From the following organisation(s)"
 msgstr ""
 
-#: View/Attributes/search.ctp:36
-msgid "Only find IOCs to use in IDS"
+#: View/Attributes/search.ctp:29
+msgid "Only find IOCs flagged as to_ids"
 msgstr ""
 
-#: View/Attributes/search.ctp:40
+#: View/Attributes/search.ctp:33
 msgid "Alternate Search Result (Events)"
 msgstr ""
 
@@ -2601,26 +2966,26 @@ msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90
-#: View/Elements/galaxyQuickView.ctp:23
-#: View/Elements/side_menu.ctp:351
-#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/eventIndexTable.ctp:229
 #: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:30
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Roles/admin_index.ctp:67
-#: View/Servers/index.ctp:99
+#: View/Servers/index.ctp:138
 #: View/Tags/index.ctp:125
 msgid "Delete"
 msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
@@ -2634,34 +2999,36 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:56
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:168
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
 #: View/Events/ajax/handleSelected.ctp:17
 #: View/Events/ajax/toggle_correlation.ctp:20
 #: View/Feeds/preview_event.ctp:56
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:79
 #: View/Servers/ajax/update.ctp:11
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
 #: View/Templates/view.ctp:41
-#: View/Users/admin_view.ctp:32;37;104;114;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:27
 msgid "Yes"
 msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:21
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
@@ -2675,29 +3042,30 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:58;176
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:166
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/handleSelected.ctp:22
 #: View/Events/ajax/toggle_correlation.ctp:25
 #: View/Feeds/preview_event.ctp:61;66
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:89
 #: View/Servers/ajax/update.ctp:16
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
 #: View/Templates/view.ctp:42
-#: View/Users/admin_view.ctp:32;37;106;116;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
 msgid "No"
@@ -2706,7 +3074,6 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:5
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:5
 #: View/Attributes/ajax/attributeEditValueForm.ctp:6
 msgid "Accept change"
@@ -2715,7 +3082,6 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:6
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
 msgid "Discard change"
@@ -2732,7 +3098,7 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/view.ctp:143
+#: View/Events/view.ctp:145
 #: View/Feeds/add.ctp:167
 #: View/Feeds/edit.ctp:164
 #: View/Feeds/freetext_index.ctp:36
@@ -2743,7 +3109,7 @@ msgstr ""
 #: View/Templates/populate_event_from_template_attributes.ctp:11
 #: View/Threads/index.ctp:27
 msgid "Distribution"
-msgstr ""
+msgstr "Распределение"
 
 #: View/Attributes/ajax/attributeEditMassForm.ctp:33
 #: View/Pages/doc/using_the_system.ctp:96
@@ -2754,6 +3120,50 @@ msgstr ""
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr ""
 
+#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+msgid "Tags to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+msgid "Tags to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+msgid "Clusters to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+msgid "Clusters to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr "вкл"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr "выкл"
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
 #: View/Attributes/ajax/attributeRestorationForm.ctp:5
 msgid "Attribute Restoration"
 msgstr ""
@@ -2762,13 +3172,22 @@ msgstr ""
 msgid "Are you sure you want to undelete Attribute #%s?"
 msgstr ""
 
+#: View/Attributes/ajax/exportSearch.ctp:2
+msgid "Choose the format that you wish to download the search results in"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:10;23
+#: View/Events/ajax/exportChoice.ctp:17;18;27;28
+msgid "Export as %s"
+msgstr ""
+
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
 msgid "Remove Tag"
-msgstr ""
+msgstr "Удалить Тэг"
 
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:8
 msgid "Remove tag "
-msgstr ""
+msgstr "Удалить тэг "
 
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:8
 msgid "from "
@@ -2776,22 +3195,12 @@ msgstr ""
 
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 msgid "Remove"
-msgstr ""
+msgstr "Удалить"
 
 #: View/Attributes/ajax/toggle_correlation.ctp:6
 msgid "Toggle Correlation %s "
 msgstr ""
 
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "on"
-msgstr ""
-
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "off"
-msgstr ""
-
 #: View/Attributes/ajax/toggle_correlation.ctp:11
 msgid "Re-enable the correlation for this attribute."
 msgstr ""
@@ -2804,232 +3213,58 @@ msgstr ""
 msgid "Toggle correlation for attribute"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:25
+#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Elements/ajaxTagCollectionTags.ctp:16
 #: View/Elements/ajaxTags.ctp:14
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
-msgstr ""
+msgstr "Удалить тэг"
+
+#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Pages/doc/using_the_system.ctp:303
+#: View/Templates/add.ctp:17
+#: View/Templates/edit.ctp:17
+msgid "Add tag"
+msgstr "Добавить тэг"
 
 #: View/Elements/ajaxTags.ctp:17
 msgid "Remove tag %s"
-msgstr ""
+msgstr "Удалить тэг %s"
 
 #: View/Elements/ajaxTags.ctp:27;30
 #: View/Templates/add.ctp:28
 #: View/Templates/edit.ctp:28
 msgid "Add a tag"
-msgstr ""
+msgstr "Добавить тэг"
 
-#: View/Elements/eventattribute.ctp:71;269
+#: View/Elements/eventattribute.ctp:71;240
 #: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
 #: View/Elements/Servers/eventattribute.ctp:28;31;94;97
 msgid "view all"
-msgstr ""
+msgstr "см. все"
 
-#: View/Elements/eventattribute.ctp:117
-#: View/Pages/doc/using_the_system.ctp:86
-msgid "Add attribute"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:118
-msgid "Edit selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:119
-msgid "Tag selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:120
-msgid "Delete selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:121
-msgid "Accept selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:122
-msgid "Discard selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:123
-msgid "Sightings display for selected attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:127
-msgid "Populate using a template"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:129
-msgid "Populate using the freetext import tool"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:131
-msgid "Replace all attributes of a category/type combination within the event"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:140;159
-msgid "Show all attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:144
-msgid "Only show %s related attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:148
-msgid "Only show proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:148
-#: View/Logs/event_index.ctp:44
-msgid "Proposal"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:149
-msgid "Only show correlating attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Only show potentially false positive attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Warnings"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:152
-msgid "Include deleted attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show attribute context fields"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show context fields"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:157
-msgid "Filter on attributes value"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:159
-#: View/Events/index.ctp:41
-#: View/Servers/preview_index.ctp:42
-#: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:37
-msgid "Remove filters"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 msgid "Select all attributes/proposals on current page"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:188
-#: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/view.ctp:121
-#: View/Feeds/preview_event.ctp:16
-#: View/Noticelists/view.ctp:43
-#: View/Pages/doc/using_the_system.ctp:164;207;318
-#: View/Servers/preview_event.ctp:27
-#: View/Servers/preview_index.ctp:68
-#: View/Tags/index.ctp:10
-#: View/Templates/add.ctp:12
-#: View/Templates/edit.ctp:12
-#: View/Templates/view.ctp:19
-msgid "Tags"
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:189
-#: View/Elements/global_menu.ctp:56
-#: View/Events/view.ctp:387
-#: View/Galaxies/index.ctp:2
-msgid "Galaxies"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:191
-msgid "Correlate"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:192
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:263
-#: View/Feeds/preview_event.ctp:73
-#: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:95
-msgid "Related Events"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:193
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
-msgid "Feed hits"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:196
-#: View/Events/view.ctp:198
-msgid "Sightings"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:197
-#: View/Events/view.ctp:205
-#: View/Tags/index.ctp:73
-msgid "Activity"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:198
-#: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/healthElements/files.ctp:33
-#: View/Elements/healthElements/workers.ctp:55
-#: View/Elements/templateElements/templateRowAttribute.ctp:94
-#: View/Elements/templateElements/templateRowFile.ctp:71
-#: View/Elements/templateElements/templateRowText.ctp:28
-#: View/EventBlacklists/index.ctp:27
-#: View/Events/export.ctp:31
-#: View/Events/resolved_attributes.ctp:53
-#: View/Feeds/index.ctp:61
-#: View/Feeds/preview_index.ctp:38
-#: View/GalaxyClusters/ajax/index.ctp:51
-#: View/Noticelists/index.ctp:37
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:55
-#: View/OrgBlacklists/index.ctp:26
-#: View/Organisations/index.ctp:81
-#: View/Pages/doc/using_the_system.ctp:187;238;286;382
-#: View/Regexp/admin_index.ctp:25
-#: View/Roles/admin_index.ctp:35
-#: View/Servers/index.ctp:36
-#: View/Servers/preview_index.ctp:80
-#: View/SharingGroups/add.ctp:34;54
-#: View/SharingGroups/edit.ctp:34;62
-#: View/SharingGroups/index.ctp:30
-#: View/Sightings/ajax/list_sightings.ctp:11
-#: View/Tags/index.ctp:76
-#: View/Taxonomies/index.ctp:27
-#: View/Templates/index.ctp:27
-#: View/Threads/index.ctp:28
-#: View/Warninglists/index.ctp:38
-#: View/Whitelists/admin_index.ctp:24
-msgid "Actions"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:238
+#: View/Elements/eventattribute.ctp:209
 msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
 "a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
 "attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:242
+#: View/Elements/eventattribute.ctp:213
 msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
 msgstr ""
 
@@ -3037,6 +3272,140 @@ msgstr ""
 msgid "Create multiple attributes one per line"
 msgstr ""
 
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr "Показать все атрибуты"
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr "Предложение"
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr "Корреляция"
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr "Внимание"
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr "Добавить атрибут"
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr "Удален"
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr "Очистить фильтры"
+
 #: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr ""
@@ -3046,14 +3415,14 @@ msgid "Deactivated user"
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:223
-#: View/Elements/Events/View/row_attribute.ctp:299
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/View/row_attribute.ctp:380
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/Feeds/edit.ctp:193
 #: View/OrgBlacklists/edit.ctp:22
 #: View/Pages/doc/using_the_system.ctp:191
-#: View/Servers/index.ctp:98
-#: View/Tags/edit.ctp:35
+#: View/Servers/index.ctp:137
+#: View/Tags/edit.ctp:36
 #: View/Templates/edit.ctp:49
 msgid "Edit"
 msgstr ""
@@ -3081,14 +3450,14 @@ msgid "Insert a link to an event - just enter the event ID between the [event][/
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:180;191
+#: View/Events/view.ctp:196;207
 #: View/Objects/orphaned_object_diagnostics.ctp:21
 #: View/Pages/doc/administration.ctp:167
 #: View/Pages/doc/using_the_system.ctp:200;279
 #: View/Posts/add.ctp:33
-#: View/ShadowAttributes/index.ctp:31
+#: View/ShadowAttributes/index.ctp:41
 msgid "Event"
-msgstr ""
+msgstr "Событие"
 
 #: View/Elements/eventdiscussion.ctp:143
 #: View/Posts/add.ctp:34
@@ -3108,7 +3477,7 @@ msgstr ""
 #: View/Elements/eventdiscussion.ctp:144
 #: View/Posts/add.ctp:35
 msgid "Link"
-msgstr ""
+msgstr "Ссылка"
 
 #: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:36
@@ -3118,10 +3487,20 @@ msgstr ""
 #: View/Elements/eventdiscussion.ctp:145
 #: View/Posts/add.ctp:36
 msgid "Code"
-msgstr ""
+msgstr "Код"
 
 #: View/Elements/eventdiscussion.ctp:156
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
+msgstr "Отправить"
+
+#: View/Elements/flashErrorMessage.ctp:2
+msgid "Errors"
+msgstr "Ошибки"
+
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Jobs/ajax/error.ctp:34
+msgid "Close"
 msgstr ""
 
 #: View/Elements/footer.ctp:5
@@ -3135,10 +3514,10 @@ msgstr ""
 #: View/Elements/footer.ctp:15
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:60
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
 msgid "GnuPG key"
-msgstr ""
+msgstr "Ключ GnuPG"
 
 #: View/Elements/footer.ctp:17
 msgid "Could not locate the GnuPG public key."
@@ -3152,32 +3531,36 @@ msgstr ""
 msgid "View details about this galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:17
+#: View/Elements/galaxyQuickView.ctp:19
 #: View/Elements/galaxyQuickViewMini.ctp:69
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:18
+#: View/Elements/galaxyQuickView.ctp:20
 #: View/Elements/galaxyQuickViewMini.ctp:70
 msgid "View all events containing this cluster."
 msgstr ""
 
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
 #: View/Elements/galaxyQuickView.ctp:24
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:74
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 #: View/EventBlacklists/add.ctp:35
 #: View/EventBlacklists/edit.ctp:29
-#: View/Events/add.ctp:72
+#: View/Events/add.ctp:68
 #: View/Events/filter_event_index.ctp:125
 #: View/Feeds/add.ctp:198
 #: View/Feeds/import_feeds.ctp:19
@@ -3187,113 +3570,139 @@ msgstr ""
 #: View/Roles/admin_add.ctp:44
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 #: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:19
 #: View/Tags/add.ctp:35
 #: View/Users/admin_filter_user_index.ctp:62
 #: View/Whitelists/admin_add.ctp:13
 msgid "Add"
+msgstr "Добавить"
+
+#: View/Elements/generic_picker.ctp:205
+msgid "Due to the large number of options, no contextual information is provided."
 msgstr ""
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/side_menu.ctp:174;188
+#: View/Elements/generic_picker.ctp:273
+msgid "Nothing to pick"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:11
+#: View/Pages/doc/general.ctp:20
+msgid "Event Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
-msgstr ""
+msgstr "Список событий"
 
-#: View/Elements/global_menu.ctp:26
-#: View/Elements/side_menu.ctp:179;194
-#: View/Events/add.ctp:8
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
+#: View/Events/add.ctp:4
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
-msgstr ""
+msgstr "Добавить событие"
 
-#: View/Elements/global_menu.ctp:28
-#: View/Elements/side_menu.ctp:213
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
-msgstr ""
+msgstr "Список атрибутов"
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/side_menu.ctp:218
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:30
-#: View/Elements/side_menu.ctp:206
-#: View/Servers/rest.ctp:4
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
+#: View/Servers/rest.ctp:20
 msgid "REST client"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:32
-#: View/Elements/side_menu.ctp:238
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
+msgstr "Показать предложения"
+
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
+#: View/Pages/doc/general.ctp:39
+msgid "Events with proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:35
-#: View/Elements/side_menu.ctp:446
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
+msgstr "Список тэгов"
+
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
+msgid "List Tag Collections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:37
-#: View/Elements/side_menu.ctp:450
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 #: View/Tags/edit.ctp:4
 msgid "Add Tag"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:39
-#: View/Elements/side_menu.ctp:471
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:41
-#: View/Elements/side_menu.ctp:485
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:43
-#: View/Elements/side_menu.ctp:487
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:46
-#: View/Elements/side_menu.ctp:247
+#: View/Elements/global_menu.ctp:78
 #: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
-msgstr ""
+msgstr "Экспорт"
 
-#: View/Elements/global_menu.ctp:48
-#: View/Elements/side_menu.ctp:253
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
+#: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
 #: View/Pages/doc/using_the_system.ctp:15;361
 msgid "Automation"
-msgstr ""
+msgstr "Автоматизация"
 
-#: View/Elements/global_menu.ctp:60
-#: View/Elements/side_menu.ctp:529
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:67
+#: View/Elements/global_menu.ctp:101
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:72;76
+#: View/Elements/global_menu.ctp:104;109
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -3302,7 +3711,7 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:73;77
+#: View/Elements/global_menu.ctp:114;119
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -3311,82 +3720,88 @@ msgstr ""
 msgid "Signature Whitelist"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:79
-#: View/Elements/side_menu.ctp:274
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:80
-#: View/Elements/side_menu.ctp:283
+#: View/Elements/global_menu.ctp:128
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:90
+#: View/Elements/global_menu.ctp:135
+#: View/Pages/doc/general.ctp:22;54
+msgid "Global Actions"
+msgstr "Глобальные действия"
+
+#: View/Elements/global_menu.ctp:139
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
-msgstr ""
+msgstr "Новости"
 
-#: View/Elements/global_menu.ctp:91
-#: View/Elements/side_menu.ctp:311
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
-msgstr ""
+msgstr "Мой профиль"
 
-#: View/Elements/global_menu.ctp:92;203
-#: View/Elements/side_menu.ctp:312
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
-msgstr ""
+msgstr "Дашборд"
 
-#: View/Elements/global_menu.ctp:96
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
-#: View/Users/statistics_data.ctp:32
+#: View/Users/statistics_data.ctp:34
 msgid "Organisations"
-msgstr ""
+msgstr "Организации"
 
-#: View/Elements/global_menu.ctp:100
-#: View/Elements/side_menu.ctp:325
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
-msgstr ""
+msgstr "Настройка ролей"
 
-#: View/Elements/global_menu.ctp:102
-#: View/Elements/side_menu.ctp:552
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:104
-#: View/Elements/side_menu.ctp:331
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Sharing Groups"
-msgstr ""
+msgstr "Группы распространения"
 
-#: View/Elements/global_menu.ctp:106
-#: View/Elements/side_menu.ctp:332
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
 msgid "Add Sharing Group"
-msgstr ""
+msgstr "Добавить группу распространения"
 
-#: View/Elements/global_menu.ctp:109
-#: View/Elements/side_menu.ctp:334
-#: View/Events/automation.ctp:42
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
+#: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
-msgstr ""
+msgstr "Руководство пользователя"
 
-#: View/Elements/global_menu.ctp:110
-#: View/Elements/side_menu.ctp:335
-#: View/Pages/doc/general.ctp:61
-#: View/Pages/doc/user_management.ctp:54
-msgid "Terms &amp; Conditions"
-msgstr ""
+#: View/Elements/global_menu.ctp:186
+msgid "Categories & Types"
+msgstr "Категории и типы"
 
-#: View/Elements/global_menu.ctp:111
-#: View/Elements/side_menu.ctp:336
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
+msgstr "Условия и положения"
+
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -3397,132 +3812,141 @@ msgstr ""
 #: View/Users/statistics_tags.ctp:7
 #: View/Users/statistics_users.ctp:2
 msgid "Statistics"
-msgstr ""
+msgstr "Статистика"
 
-#: View/Elements/global_menu.ctp:113
+#: View/Elements/global_menu.ctp:201
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:114
+#: View/Elements/global_menu.ctp:205
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:125
-#: View/Elements/side_menu.ctp:354
+#: View/Elements/global_menu.ctp:212
+#: View/Pages/doc/general.ctp:23;66
+msgid "Sync Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:127
-#: View/Elements/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:136
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/administration.ctp:8
-#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
 #: View/Pages/doc/quickstart.ctp:8
 #: View/Pages/doc/user_management.ctp:14
 #: View/Pages/doc/using_the_system.ctp:21
 msgid "Administration"
-msgstr ""
+msgstr "Администрирование"
 
-#: View/Elements/global_menu.ctp:140
-#: View/Elements/side_menu.ctp:376
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
-msgstr ""
+msgstr "Список пользователей"
 
-#: View/Elements/global_menu.ctp:141
-#: View/Elements/side_menu.ctp:375
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
 msgid "Add User"
-msgstr ""
+msgstr "Добавить пользователя"
 
-#: View/Elements/global_menu.ctp:142
-#: View/Elements/side_menu.ctp:379
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
-msgstr ""
+msgstr "Связаться с пользователями"
 
-#: View/Elements/global_menu.ctp:144
-#: View/Elements/side_menu.ctp:316;391
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
 msgid "List Organisations"
-msgstr ""
+msgstr "Список организаций"
 
-#: View/Elements/global_menu.ctp:146
-#: View/Elements/side_menu.ctp:383
-msgid "Add Organisation"
-msgstr ""
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
+msgstr "Добавить организацию"
 
-#: View/Elements/global_menu.ctp:149
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
+msgstr "Список ролей"
+
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:151
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-msgid "Maintenance"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:158
-#: View/Elements/side_menu.ctp:401
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
-msgstr ""
+msgstr "Задачи"
 
-#: View/Elements/global_menu.ctp:160
-#: View/Elements/side_menu.ctp:403
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
+msgstr "Запланированные задания"
+
+#: View/Elements/global_menu.ctp:300
+msgid "Blacklist Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:165
-#: View/Elements/side_menu.ctp:407
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
 msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:169
+#: View/Elements/global_menu.ctp:314
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/side_menu.ctp:411
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
 msgid "Manage Org Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:180
+#: View/Elements/global_menu.ctp:327
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
-msgstr ""
+msgstr "Аудит"
 
-#: View/Elements/global_menu.ctp:184
-#: View/Elements/side_menu.ctp:417
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
-msgstr ""
+msgstr "Показать журналы"
 
-#: View/Elements/global_menu.ctp:185
-#: View/Elements/side_menu.ctp:418
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
-msgstr ""
+msgstr "Поиск в журналах"
 
-#: View/Elements/global_menu.ctp:207;209
+#: View/Elements/global_menu.ctp:362;367
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
-msgstr ""
+msgstr "Выход"
 
 #: View/Elements/histogram.ctp:1
 msgid "Attribute Types Histogram"
@@ -3540,407 +3964,8 @@ msgstr ""
 msgid "Attributes per organization"
 msgstr ""
 
-#: View/Elements/side_menu.ctp:17;78
-msgid "Populate From Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:24
-msgid "Freetext Import Result"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:31
-msgid "View Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:36;465;540
-msgid "View Correlation Graph"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:41
-msgid "View Event History"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:48
-#: View/Events/edit.ctp:8
-msgid "Edit Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:50
-msgid "Delete Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:50;267;298;351;371
-#: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Servers/index.ctp:99
-msgid "Are you sure you want to delete # %s?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:61
-msgid "Add Object"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:66
-msgid "Add Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:73
-msgid "Populate from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:86
-#: View/Events/ajax/enrich_event.ctp:2
-msgid "Enrich Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:91
-msgid "Merge attributes from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:98
-msgid "Propose Attribute"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:103
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:115
-#: View/Elements/Events/eventIndexTable.ctp:218
-msgid "Publish Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:123
-msgid "Publish (no email)"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:132
-msgid "Delegate Publishing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:143
-#: View/EventDelegations/ajax/accept_delegation.ctp:2
-msgid "Accept Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:151
-msgid "Discard Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:157
-msgid "Publish event to ZMQ"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:162
-msgid "Contact Reporter"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:169
-msgid "Download as..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:201
-msgid "Import from…"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:224
-msgid "Download results as JSON"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:228
-msgid "Download results as XML"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:232
-msgid "Download results as CSV"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:242
-#: View/Pages/doc/general.ctp:39
-msgid "Events with proposals"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:259
-msgid "List Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:261
-msgid "New Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:262
-msgid "Perform on existing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:266
-msgid "Edit Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:267
-msgid "Delete Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:273
-msgid "View Warninglist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:276
-msgid "Update Warninglists"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:282
-msgid "View Noticelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:285
-msgid "Update Noticelists"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:291
-msgid "List Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:293
-msgid "New Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:297
-msgid "Edit Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:298
-msgid "Delete Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:305
-#: View/Users/edit.ctp:4
-msgid "Edit My Profile"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:306
-#: View/Pages/doc/administration.ctp:126
-#: View/Users/admin_edit.ctp:70
-#: View/Users/change_pw.ctp:4
-msgid "Change Password"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:321;389
-msgid "View Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:328
-#: View/SharingGroups/edit.ctp:3
-msgid "Edit Sharing Group"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:329
-msgid "View Sharing Group"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:342
-msgid "Explore Remote Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:343
-msgid "Fetch This Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:343
-#: View/Feeds/preview_index.ctp:65
-#: View/Servers/preview_index.ctp:147
-msgid "Are you sure you want to fetch and save this event on your instance?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:344;347
-msgid "Explore Remote Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:350
-#: View/Servers/edit.ctp:4
-msgid "Edit Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:356
-msgid "New Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:363
-msgid "View User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:364
-msgid "Reset Password"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:365
-msgid "Edit User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:366
-msgid "Delete User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:366
-#: View/Elements/Users/userIndexTable.ctp:91
-msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:370
-#: View/Roles/admin_edit.ctp:4
-msgid "Edit Role"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:371
-msgid "Delete Role"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:385
-#: View/Organisations/admin_edit.ctp:4
-msgid "Edit Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:386
-#: View/Organisations/ajax/merge.ctp:5
-msgid "Merge Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:398
-#: View/Servers/server_settings.ctp:5
-msgid "Server Settings & Maintenance"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:406
-msgid "Blacklists Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:410
-msgid "Blacklists Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:426;433
-msgid "View Thread"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:427
-#: View/Posts/add.ctp:4
-msgid "Add Post"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:434
-#: View/Posts/edit.ctp:4
-msgid "Edit Post"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:439
-msgid "List Threads"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:440
-msgid "New Thread"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:445
-msgid "List Favourite Tags"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:455
-msgid "Edit Tag"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:461;473
-msgid "View Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:474
-msgid "Delete Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:492
-msgid "View Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:494
-#: View/Templates/edit.ctp:6
-msgid "Edit Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:502
-msgid "Add Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:503
-msgid "Import Feeds from JSON"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:504
-#: View/Feeds/compare_feeds.ctp:7
-msgid "Feed overlap analysis matrix"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:505
-msgid "Export Feed settings"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:507
-msgid "Edit Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:509
-msgid "PreviewIndex"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:511
-msgid "PreviewEvent"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:516
-msgid "View News"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:520
-#: View/News/add.ctp:6
-msgid "Add News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:522
-#: View/News/edit.ctp:6
-msgid "Edit News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:533
-msgid "Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:533
-msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:534
-msgid "Force Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:534
-msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:538;546
-msgid "View Galaxy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:539
-msgid "View Cluster"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:556
-msgid "Update Objects"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:561
-msgid "View Object Template"
-msgstr ""
-
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:84
+#: View/Layouts/default.ctp:87
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -3975,10 +4000,13 @@ msgid "Display"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Jobs/index.ctp:62
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
 #: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
 msgid "Filters"
-msgstr ""
+msgstr "Фильтры"
 
 #: View/Elements/view_event_graph.ctp:16
 msgid "History"
@@ -3989,18 +4017,18 @@ msgstr ""
 msgid "Toggle fullscreen"
 msgstr ""
 
-#: View/Elements/view_mitre_attack_matrix.ctp:27
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all events on current page"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:35
 msgid "Clusters"
-msgstr ""
+msgstr "Кластеры"
 
 #: View/Elements/Events/eventIndexTable.ctp:41
 msgid "Correlation Count"
@@ -4034,89 +4062,127 @@ msgstr ""
 msgid "#Posts"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:167
-msgid " correlation(s)"
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/dashboard/dashboard_events.ctp:4;5
+#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
+#: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/preview_index.ctp:174
+#: View/Taxonomies/index.ctp:47
+#: View/Warninglists/index.ctp:60
+msgid "View"
+msgstr "Показать"
+
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:177;182
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:187
+#: View/Elements/Events/eventIndexTable.ctp:190
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:207
-#: View/Jobs/index.ctp:15;63
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-msgid "All"
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:218
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:12
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
 msgid "Are you sure this event is complete and everyone should be informed?"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:219
+#: View/Elements/Events/eventIndexTable.ctp:222
 msgid "Not published"
 msgstr ""
 
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr ""
+
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid "Show "
-msgstr ""
+msgstr "Показать "
 
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid " more..."
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:295
+#: View/Events/view.ctp:346
 msgid "Collapse…"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:262
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr ""
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:343
 msgid "Restore attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:263;303
+#: View/Elements/Events/View/row_attribute.ctp:344;384
 msgid "Permanently delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Propose enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Propose enrichment through Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:279
+#: View/Elements/Events/View/row_attribute.ctp:360
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:280
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:290;295
+#: View/Elements/Events/View/row_attribute.ctp:371;376
 msgid "Add enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:295
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Add enrichment via Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:307
+#: View/Elements/Events/View/row_attribute.ctp:388
 msgid "Soft-delete attribute"
 msgstr ""
 
@@ -4138,24 +4204,36 @@ msgid "Expand or Collapse"
 msgstr ""
 
 #: View/Elements/Events/View/row_object.ctp:69
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
+msgstr "UUID"
+
+#: View/Elements/Events/View/row_object.ctp:70
 msgid "Meta-category: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:70
+#: View/Elements/Events/View/row_object.ctp:71
 #: View/Elements/Feeds/View/row_object.ctp:21
 msgid "Description: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Events/View/row_object.ctp:72
 #: View/Elements/Feeds/View/row_object.ctp:22
 msgid "Template: "
-msgstr ""
+msgstr "Шаблон: "
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Soft delete object"
 msgstr ""
 
@@ -4196,6 +4274,7 @@ msgstr ""
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
 #: View/Sightings/ajax/advanced.ctp:10
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 msgid "Add sighting"
 msgstr ""
 
@@ -4204,7 +4283,6 @@ msgid "Mark as false-positive"
 msgstr ""
 
 #: View/Elements/Events/View/sighting_field.ctp:14
-#: View/Events/view.ctp:203
 msgid "Advanced sightings"
 msgstr ""
 
@@ -4232,7 +4310,7 @@ msgstr ""
 
 #: View/Elements/Feeds/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object.ctp:20
-#: View/ObjectTemplates/view.ctp:19
+#: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:23
 msgid "Meta-category"
 msgstr ""
@@ -4247,7 +4325,7 @@ msgid "all"
 msgstr ""
 
 #: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/view.ctp:126
+#: View/Events/view.ctp:131
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
 #: View/Servers/preview_event.ctp:36
 #: View/Sightings/ajax/list_sightings.ctp:5
@@ -4262,48 +4340,50 @@ msgstr ""
 #: View/Pages/doc/using_the_system.ctp:236;285
 #: View/Templates/populate_event_from_template_attributes.ctp:10
 msgid "IDS"
-msgstr ""
+msgstr "СОВ"
 
 #: View/Elements/Servers/Module/type.ctp:11
 #: View/Elements/healthElements/diagnostics.ctp:276
 #: View/Pages/doc/administration.ctp:56;228
 msgid "Status"
-msgstr ""
+msgstr "Статус"
 
 #: View/Elements/Servers/View/row_attribute.ctp:93
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/healthElements/files.ctp:61
-#: View/Elements/healthElements/workers.ctp:61;62;63
-#: View/Events/automation.ctp:403;410;417;438;445
+#: View/Elements/healthElements/workers.ctp:66;67;68
+#: View/Events/automation.ctp:234;241;248;269;276
 #: View/Events/export.ctp:68;88
-#: View/Taxonomies/view.ctp:96;107;152
-#: View/Users/admin_view.ctp:83;92;122
-#: View/Users/view.ctp:62
+#: View/Events/legacy_automation.ctp:403;410;417;438;445
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: View/Elements/Servers/View/row_object.ctp:16
 #: View/Elements/templateElements/templateRowAttribute.ctp:12
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
 #: View/Galaxies/view.ctp:14
-#: View/ObjectTemplates/view.ctp:11
+#: View/ObjectTemplates/view.ctp:4
 #: View/Objects/revise_object.ctp:19
 #: View/Organisations/ajax/merge.ctp:57;64
 #: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/view.ctp:9
-#: View/SharingGroups/add.ctp:11;31;51
-#: View/SharingGroups/edit.ctp:11;31;59
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
 #: View/SharingGroups/view.ctp:42;67
 #: View/Templates/view.ctp:9
 #: View/Users/statistics_orgs.ctp:31
-#: View/Warninglists/view.ctp:9
+#: View/Warninglists/view.ctp:10
 msgid "Name"
-msgstr ""
+msgstr "Имя"
 
 #: View/Elements/Servers/View/row_object.ctp:21
 #: View/Elements/healthElements/files.ctp:8
-#: View/Elements/healthElements/settings_tab.ctp:16
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:10
 #: View/Elements/templateElements/populateTemplateDescription.ctp:12
 #: View/Elements/templateElements/populateTemplateFile.ctp:10
@@ -4311,26 +4391,26 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:27
 #: View/Galaxies/view.ctp:20
-#: View/ObjectTemplates/view.ctp:21
+#: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:16;94
-#: View/Organisations/view.ctp:32;89;90
+#: View/Organisations/view.ctp:15;58;59
 #: View/Pages/doc/administration.ctp:48;241
-#: View/Pages/doc/categories_and_types.ctp:50;67
+#: View/Pages/doc/categories_and_types.ctp:44;61
 #: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
 #: View/Servers/preview_event.ctp:65
-#: View/SharingGroups/add.ctp:15
-#: View/SharingGroups/edit.ctp:15
-#: View/SharingGroups/index.ctp:28
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
 #: View/Taxonomies/view.ctp:14
 #: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:14
+#: View/Warninglists/view.ctp:11
 msgid "Description"
-msgstr ""
+msgstr "Описание"
 
 #: View/Elements/Servers/View/row_object.ctp:22
 #: View/Templates/view.ctp:2
 msgid "Template"
-msgstr ""
+msgstr "Шаблон"
 
 #: View/Elements/Servers/View/row_object_reference.ctp:1
 #: View/Objects/orphaned_object_diagnostics.ctp:53
@@ -4342,24 +4422,30 @@ msgstr ""
 msgid "Referenced by"
 msgstr ""
 
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr "Вы уверены что хотите удалить \"%s\"?"
+
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:2
+#: View/Roles/view.ctp:24
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_view.ctp:19
-#: View/Users/view.ctp:19
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
-msgstr ""
+msgstr "Роль"
 
 #: View/Elements/Users/userIndexTable.ctp:16
 msgid "Last login"
-msgstr ""
+msgstr "Последний вход"
 
 #: View/Elements/Users/userIndexTable.ctp:17
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:54
+#: View/ShadowAttributes/index.ctp:64
 msgid "Created"
-msgstr ""
+msgstr "Время создания"
 
 #: View/Elements/Users/userIndexTable.ctp:88
 msgid "Initiate password refresh"
@@ -4369,6 +4455,11 @@ msgstr ""
 msgid "Create new credentials and inform user"
 msgstr ""
 
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Elements/dashboard/dashboard_events.ctp:2
 msgid "Changes since last visit"
 msgstr ""
@@ -4397,6 +4488,417 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr "Показать событие"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr "Изменить событие"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr "Удалить событие"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr "Добавить объект"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr "Добавить вложение"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr "Снять с публикации"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr "Сменить пароль"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr "Сбросить пароль"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr "Редактировать сервер"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr "Просмотреть пользователя"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr "Редактировать пользователя"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr "Удалить пользователя"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr "Изменить роль"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr "Удалить роль"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr "Добавить роль"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr "Изменить тэг"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr "Показать шаблон"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr "Изменить шаблон"
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr ""
+
 #: View/Elements/healthElements/diagnostics.ctp:5
 msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
 msgstr ""
@@ -4421,13 +4923,12 @@ msgstr ""
 msgid "Outdated version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:26;156;170;195
-#: View/Elements/healthElements/workers.ctp:18;71
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
+#: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
-#: View/Users/admin_view.ctp:81
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: View/Elements/healthElements/diagnostics.ctp:30
 msgid "Could not retrieve version from github"
@@ -4445,131 +4946,135 @@ msgstr ""
 msgid "Current branch…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Pull the latest MISP version from github"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Update MISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "Writeable Directories and files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:67
+#: View/Elements/healthElements/diagnostics.ctp:65
 msgid "The following directories and files have to be writeable for MISP to function properly. Make sure that the apache user has write privileges for the directories below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:68
+#: View/Elements/healthElements/diagnostics.ctp:66
 msgid "Directories"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:75
+#: View/Elements/healthElements/diagnostics.ctp:73
 msgid "Directory "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:83
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Writeable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:90;104
+#: View/Elements/healthElements/diagnostics.ctp:88;102
 msgid "File "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:97
+#: View/Elements/healthElements/diagnostics.ctp:95
 msgid "Readable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:112
+#: View/Elements/healthElements/diagnostics.ctp:110
 msgid "PHP Settings"
-msgstr ""
+msgstr "Настройки PHP"
 
-#: View/Elements/healthElements/diagnostics.ctp:115;127
+#: View/Elements/healthElements/diagnostics.ctp:113;125
 msgid "Up to date"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:121
-#: View/Elements/healthElements/workers.ctp:78;80
-#: View/Organisations/view.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:119
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
 msgid "Unknown"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:123
+#: View/Elements/healthElements/diagnostics.ctp:121
 msgid "Issues determining version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:130;139
+#: View/Elements/healthElements/diagnostics.ctp:128;137
 msgid "Update highly recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:133;142
+#: View/Elements/healthElements/diagnostics.ctp:131;140
 msgid "Version unsupported, update ASAP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:146
+#: View/Elements/healthElements/diagnostics.ctp:144
 msgid "PHP ini path"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:147
+#: View/Elements/healthElements/diagnostics.ctp:145
 msgid "PHP Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:147;148
+#: View/Elements/healthElements/diagnostics.ctp:145;146
 msgid "recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:148
+#: View/Elements/healthElements/diagnostics.ctp:146
 msgid "PHP CLI Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:149
+#: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
 msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:156
+#: View/Elements/healthElements/diagnostics.ctp:155
 #: View/Events/filter_event_index.ctp:32;190
 #: View/Pages/doc/using_the_system.ctp:66;171
 msgid "Low"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:160
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP Extensions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:170
+#: View/Elements/healthElements/diagnostics.ctp:169
 msgid "Not loaded"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:175
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:183
+#: View/Elements/healthElements/diagnostics.ctp:182
 msgid "Advanced attachment handler"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:184
+#: View/Elements/healthElements/diagnostics.ctp:183
 msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PyMISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:201
+#: View/Elements/healthElements/diagnostics.ctp:200
 msgid "STIX and Cybox libraries"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:202
+#: View/Elements/healthElements/diagnostics.ctp:201
 msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:203
+#: View/Elements/healthElements/diagnostics.ctp:202
 msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
 msgstr ""
 
@@ -4579,7 +5084,7 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:218
 msgid "STIX and CyBox"
-msgstr ""
+msgstr "STIX и CyBox"
 
 #: View/Elements/healthElements/diagnostics.ctp:218
 msgid "Could not read test script (stixtest.py)."
@@ -4591,7 +5096,7 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:249
 msgid "GnuPG"
-msgstr ""
+msgstr "GnuPG"
 
 #: View/Elements/healthElements/diagnostics.ctp:250
 msgid "This tool tests whether your GnuPG is set up correctly or not."
@@ -4603,7 +5108,7 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:261
 msgid "ZeroMQ"
-msgstr ""
+msgstr "ZeroMQ"
 
 #: View/Elements/healthElements/diagnostics.ctp:262
 msgid "This tool tests whether the ZeroMQ extension is installed and functional."
@@ -4639,7 +5144,7 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:278
 msgid "Proxy"
-msgstr ""
+msgstr "Прокси"
 
 #: View/Elements/healthElements/diagnostics.ctp:279
 msgid "This tool tests whether your HTTP proxy settings are correct."
@@ -4648,7 +5153,7 @@ msgstr ""
 #: View/Elements/healthElements/diagnostics.ctp:287
 #: View/Pages/doc/administration.ctp:35
 msgid "Proxy settings"
-msgstr ""
+msgstr "Настройки прокси"
 
 #: View/Elements/healthElements/diagnostics.ctp:290
 msgid "Module System"
@@ -4798,7 +5303,7 @@ msgstr ""
 
 #: View/Elements/healthElements/files.ctp:31
 msgid "Size"
-msgstr ""
+msgstr "Размер"
 
 #: View/Elements/healthElements/files.ctp:32
 #: View/Roles/admin_edit.ctp:15
@@ -4806,72 +5311,35 @@ msgid "Permissions"
 msgstr ""
 
 #: View/Elements/healthElements/files.ctp:73
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
 #: View/Roles/admin_index.ctp:67
-#: View/SharingGroups/index.ctp:68
+#: View/SharingGroups/index.ctp:87
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:5
 msgid "Good, but there are some optional settings that are incorrect / not set."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:6
 msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
-msgid "Overall health"
+msgid "Test"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:17
-msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:26
-msgid " settings incorrectly or not set"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:27
-msgid " incorrect settings."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:33
-msgid "Critical issues revealed by the diagnostics"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:34
-msgid " issues detected."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:35
-msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:9
-msgid "Toggle subgroup"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:13
-#: View/Pages/doc/administration.ctp:45
-msgid "Priority"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:14
-#: View/Pages/doc/administration.ctp:46
-msgid "Setting"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:15
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
 #: View/Events/filter_event_index.ctp:134
 #: View/Events/resolved_attributes.ctp:45
 #: View/Events/show_i_o_c_results.ctp:13
@@ -4886,45 +5354,75 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: View/Elements/healthElements/settings_tab.ctp:17
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr "Приоритет"
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:3;15;27;36
-#: View/Events/index.ctp:30;58
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
-#: View/Users/admin_index.ctp:28
-msgid "Modify filters"
-msgstr ""
-
-#: View/Elements/healthElements/tabs.ctp:3
+#: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:28
-#: View/Pages/doc/administration.ctp:38
-msgid "Diagnostics"
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:37
-#: View/Pages/doc/administration.ctp:39
-msgid "Workers"
+#: View/Elements/healthElements/tabs.ctp:34
+#: View/Pages/doc/administration.ctp:38
+msgid "Diagnostics"
 msgstr ""
 
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:48
+#: View/Elements/healthElements/tabs.ctp:50;65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:5
-msgid "Warning"
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:5
@@ -4932,82 +5430,90 @@ msgid "MISP cannot access your /proc directory to check the status of the worker
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:10
-msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgid "Note:"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "You have set the \"manage_workers\" variable to \"false\", therefore worker controls have been disabled."
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:15
+msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:20
 msgid "Worker started with the correct user, but the current status is unknown."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:24
+#: View/Elements/healthElements/workers.ctp:29
 msgid "There are issues with the worker(s), but at least one healthy worker is monitoring the queue."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:30
+#: View/Elements/healthElements/workers.ctp:35
 msgid "Worker type: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:32
+#: View/Elements/healthElements/workers.ctp:37
 msgid "Jobs in the queue: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:40
+#: View/Elements/healthElements/workers.ctp:45
 msgid "Queue status: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:51
+#: View/Elements/healthElements/workers.ctp:56
 msgid "Worker PID"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:52
+#: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
-#: View/Users/admin_view.ctp:7
-#: View/Users/view.ctp:2
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
 msgid "User"
-msgstr ""
+msgstr "Пользователь"
 
-#: View/Elements/healthElements/workers.ctp:53
+#: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:54
+#: View/Elements/healthElements/workers.ctp:59
 msgid "Information"
-msgstr ""
+msgstr "Информация"
 
-#: View/Elements/healthElements/workers.ctp:64
+#: View/Elements/healthElements/workers.ctp:69
 msgid "Worker not running!"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:72
+#: View/Elements/healthElements/workers.ctp:77
 msgid "The worker appears to be healthy."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:75
+#: View/Elements/healthElements/workers.ctp:80
 msgid "The worker was started with a user other than the apache user. MISP cannot check whether the worker is alive or not."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:81
+#: View/Elements/healthElements/workers.ctp:86
 msgid "Cannot check whether the worker is alive or dead."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:85
+#: View/Elements/healthElements/workers.ctp:90
 msgid "Dead"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:86
+#: View/Elements/healthElements/workers.ctp:91
 msgid "The Worker appears to be dead."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:100
+#: View/Elements/healthElements/workers.ctp:106
 msgid "Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:111
+#: View/Elements/healthElements/workers.ctp:119
 msgid "Start a worker"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:119
+#: View/Elements/healthElements/workers.ctp:130
 msgid "Restart all workers"
 msgstr ""
 
@@ -5138,18 +5644,18 @@ msgstr ""
 #: View/Objects/revise_object.ctp:45
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
-#: View/Pages/doc/categories_and_types.ctp:66
+#: View/Pages/doc/categories_and_types.ctp:60
 #: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
-#: View/ShadowAttributes/index.ctp:36;51
-#: View/SharingGroups/add.ctp:30
-#: View/SharingGroups/edit.ctp:30
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
 #: View/Sightings/ajax/list_sightings.ctp:7
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:35
-#: View/Warninglists/view.ctp:24
+#: View/Warninglists/view.ctp:13
 msgid "Type"
-msgstr ""
+msgstr "Тип"
 
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:38
 msgid "Describe the %s using one or several (separated by a line-break) of the following types: %s"
@@ -5186,7 +5692,7 @@ msgid "Template Name"
 msgstr ""
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:60
+#: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr ""
@@ -5199,14 +5705,14 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:4
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:4
 msgid "File"
-msgstr ""
+msgstr "Файл"
 
 #: View/Elements/templateElements/populateTemplateFile.ctp:13
 msgid "s"
 msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
-#: View/ObjectReferences/ajax/add.ctp:60
+#: View/ObjectReferences/ajax/add.ctp:86
 #: View/Objects/revise_object.ctp:43
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
@@ -5220,23 +5726,23 @@ msgstr ""
 #: View/Feeds/freetext_index.ctp:31
 #: View/Objects/add.ctp:95
 #: View/Objects/revise_object.ctp:44
-#: View/Pages/doc/categories_and_types.ctp:17;23;37;43;49
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
 #: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
-#: View/ShadowAttributes/index.ctp:48
+#: View/ShadowAttributes/index.ctp:58
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_add_file.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:28
 #: View/Templates/populate_event_from_template_attributes.ctp:6
 msgid "Category"
-msgstr ""
+msgstr "Категории"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
-#: View/Pages/doc/categories_and_types.ctp:63
+#: View/Pages/doc/categories_and_types.ctp:57
 #: View/Pages/doc/using_the_system.ctp:109
 #: View/Pages/doc/md/categories_and_types.ctp:33
 msgid "Types"
-msgstr ""
+msgstr "Типы"
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:59
 msgid "Mandatory"
@@ -5274,7 +5780,7 @@ msgstr ""
 #: View/Pages/doc/using_the_system.ctp:352
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:5
 msgid "Text"
-msgstr ""
+msgstr "Текст"
 
 #: View/Errors/error400.ctp:33
 msgid "You have tripped the cross-site request forgery protection of MISP"
@@ -5461,45 +5967,33 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
-#: View/Events/add.ctp:3
-msgid "The event created %s, but not synchronised to other MISP instances until it is published."
-msgstr ""
-
-#: View/Events/add.ctp:3
-msgid "will be restricted to your organisation"
-msgstr ""
-
-#: View/Events/add.ctp:3
-msgid "will be visible to the organisations having an account on this platform"
-msgstr ""
-
-#: View/Events/add.ctp:48
+#: View/Events/add.ctp:44
 #: View/Events/edit.ctp:35
 msgid "Threat Level "
 msgstr ""
 
-#: View/Events/add.ctp:52
+#: View/Events/add.ctp:48
 #: View/Events/edit.ctp:38
 msgid "Analysis "
 msgstr ""
 
-#: View/Events/add.ctp:56
+#: View/Events/add.ctp:52
 #: View/Events/edit.ctp:43
-#: View/ShadowAttributes/index.ctp:42
+#: View/ShadowAttributes/index.ctp:52
 msgid "Event Info"
 msgstr ""
 
-#: View/Events/add.ctp:60
+#: View/Events/add.ctp:56
 #: View/Events/edit.ctp:47
 msgid "Quick Event Description or Tracking Info"
 msgstr ""
 
-#: View/Events/add.ctp:63
+#: View/Events/add.ctp:59
 #: View/Events/edit.ctp:50
 msgid "Extends event"
 msgstr ""
 
-#: View/Events/add.ctp:66
+#: View/Events/add.ctp:62
 #: View/Events/edit.ctp:53
 msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr ""
@@ -5510,7 +6004,8 @@ msgstr ""
 
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
-#: View/Events/upload_stix.ctp:22
+#: View/Events/upload_analysis_file.ctp:22
+#: View/Events/upload_stix.ctp:29
 msgid "Upload"
 msgstr ""
 
@@ -5548,7 +6043,7 @@ msgid "Details"
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:89
+#: View/Jobs/index.ctp:124
 msgid "Failed"
 msgstr ""
 
@@ -5561,781 +6056,677 @@ msgid "Event with this UUID already exists."
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr ""
 
 #: View/Events/automation.ctp:3
-msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
-"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
-"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgid "Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.\n"
+"    To to make this functionality available for automated tools an authentication key is used."
 msgstr ""
 
 #: View/Events/automation.ctp:6
-msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgid "Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP."
 msgstr ""
 
-#: View/Events/automation.ctp:7
+#: View/Events/automation.ctp:9
+#: View/Events/legacy_automation.ctp:7
 msgid "Your current key is: <code>%s</code>.\n"
 "    You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:8
+#: View/Events/automation.ctp:10
+#: View/Events/legacy_automation.ctp:8
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:10
-msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
-msgstr ""
-
-#: View/Events/automation.ctp:11
-msgid "Please use the use the following header"
-msgstr ""
-
-#: View/Events/automation.ctp:12
-msgid "Authorization"
-msgstr ""
-
-#: View/Events/automation.ctp:13
-msgid "XML Export"
-msgstr ""
-
 #: View/Events/automation.ctp:14
-msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
-msgstr ""
+#: View/Logs/admin_index.ctp:20;21
+msgid "Search"
+msgstr "Поиск"
 
-#: View/Events/automation.ctp:15;47;76
-msgid "You can configure your tools to automatically download the following file"
+#: View/Events/automation.ctp:16
+#: View/Events/legacy_automation.ctp:264
+msgid "It is possible to search the database for attributes based on a list of criteria."
 msgstr ""
 
 #: View/Events/automation.ctp:17
-msgid "If you only want to fetch a specific event append the eventid number"
+#: View/Events/legacy_automation.ctp:265
+msgid "To return an event or a list of events in a desired format, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:19;144
-msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+#: View/Events/automation.ctp:18
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
 msgstr ""
 
-#: View/Events/automation.ctp:26
-msgid "The xml download also accepts two additional the following optional parameters in the URL"
+#: View/Events/automation.ctp:21
+msgid "Set the return format of the search (Currently supported: json, xml, openioc, suricata, snort - more formats are being moved to restSearch with the goal being that all searches happen through this API). Can be passed as the first parameter after restSearch or via the JSON payload."
 msgstr ""
 
-#: View/Events/automation.ctp:29;52;85
-msgid "Restrict the download to a single event"
+#: View/Events/automation.ctp:22
+msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
 msgstr ""
 
-#: View/Events/automation.ctp:30
-msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+#: View/Events/automation.ctp:23
+msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
 msgstr ""
 
-#: View/Events/automation.ctp:31;54;87;112;134
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:24
+#: View/Events/legacy_automation.ctp:268;297
+msgid "Search for the given value in the attributes' value field."
 msgstr ""
 
-#: View/Events/automation.ctp:37;64;91;117;140;203;254;279
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:38;65;92;118;141;204;255;280
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:39;119;142;205;256;281;306
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:41;70;97;122;259;290
-msgid "The keywords false or null should be used for optional empty parameters in the URL."
-msgstr ""
-
-#: View/Events/automation.ctp:43
-msgid "Also check out the %s to read about the REST API."
-msgstr ""
-
-#: View/Events/automation.ctp:45
-msgid "CSV Export"
-msgstr ""
-
-#: View/Events/automation.ctp:46
-msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
-msgstr ""
-
-#: View/Events/automation.ctp:49
-msgid "You can specify additional flags for CSV exports as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:53
-msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
-msgstr ""
-
-#: View/Events/automation.ctp:58
-msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:61;270;299
-msgid "The attribute category, any valid MISP attribute category is accepted."
-msgstr ""
-
-#: View/Events/automation.ctp:62;199;269;298
+#: View/Events/automation.ctp:25
+#: View/Events/legacy_automation.ctp:62;199;269;298
 msgid "The attribute type, any valid MISP attribute type is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:63
-msgid "Include the event data with each attribute."
+#: View/Events/automation.ctp:26
+#: View/Events/legacy_automation.ctp:61;270;299
+msgid "The attribute category, any valid MISP attribute category is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:66
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+#: View/Events/automation.ctp:27
+#: View/Events/legacy_automation.ctp:271;300
+msgid "Search by the creator organisation by supplying the organisation identifier."
 msgstr ""
 
-#: View/Events/automation.ctp:67
-msgid "The CSV created when this setting is set to true will not contain the header row.\n"
-"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:71
-msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:74
-msgid "NIDS rules export"
-msgstr ""
-
-#: View/Events/automation.ctp:75
-msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:81
-msgid "The full API syntax is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:84
-msgid "The export format, can be \"suricata\" or \"snort\""
-msgstr ""
-
-#: View/Events/automation.ctp:86
-msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
-msgstr ""
-
-#: View/Events/automation.ctp:93
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:94
-msgid "Restrict the export to only use the given types."
-msgstr ""
-
-#: View/Events/automation.ctp:95;120;174;206;257
-msgid "All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:96
-msgid "All tags will be included even if not exportable."
-msgstr ""
-
-#: View/Events/automation.ctp:98
-msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
-msgstr ""
-
-#: View/Events/automation.ctp:100
-msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
-msgstr ""
-
-#: View/Events/automation.ctp:102
-msgid "Hash database export"
-msgstr ""
-
-#: View/Events/automation.ctp:103
-msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:104;188
-msgid "You can configure your tools to automatically download the following files"
-msgstr ""
-
-#: View/Events/automation.ctp:109
-msgid "The API's full format is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:111
-msgid "The export format, can be \"md5\" or \"sha1\""
-msgstr ""
-
-#: View/Events/automation.ctp:123
-msgid "For example, to only show sha1 values from events tagged tag1, use"
-msgstr ""
-
-#: View/Events/automation.ctp:126
-msgid "STIX export"
-msgstr ""
-
-#: View/Events/automation.ctp:127
-msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
-msgstr ""
-
-#: View/Events/automation.ctp:129
-msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:132;171
-msgid "The event's ID"
-msgstr ""
-
-#: View/Events/automation.ctp:133
-msgid "Encode attachments where applicable"
-msgstr ""
-
-#: View/Events/automation.ctp:151
-msgid "Various ways to narrow down the search results of the STIX export"
-msgstr ""
-
-#: View/Events/automation.ctp:152
-msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
-msgstr ""
-
-#: View/Events/automation.ctp:154
-msgid "To export the same events using a POST request use"
-msgstr ""
-
-#: View/Events/automation.ctp:156
-msgid "Together with this JSON object in the POST message"
-msgstr ""
-
-#: View/Events/automation.ctp:158
-msgid "XML is automagically assumed when using the stix export"
-msgstr ""
-
-#: View/Events/automation.ctp:160
-msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
-msgstr ""
-
-#: View/Events/automation.ctp:163
-msgid "RPZ export"
-msgstr ""
-
-#: View/Events/automation.ctp:164
-msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
-msgstr ""
-
-#: View/Events/automation.ctp:165
-msgid "It is possible to further restrict the exported values using the following filters"
-msgstr ""
-
-#: View/Events/automation.ctp:167
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
-"        "
-msgstr ""
-
-#: View/Events/automation.ctp:170
-msgid "Use semicolons instead (the search will automatically search for colons instead)"
-msgstr ""
-
-#: View/Events/automation.ctp:172
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
-msgstr ""
-
-#: View/Events/automation.ctp:173
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
-msgstr ""
-
-#: View/Events/automation.ctp:176
-msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:180
-msgid "To override the above values, either use the url parameters as described below"
-msgstr ""
-
-#: View/Events/automation.ctp:182
-msgid "or POST an XML or JSON object with the above listed options"
-msgstr ""
-
-#: View/Events/automation.ctp:186
-msgid "Text export"
-msgstr ""
-
-#: View/Events/automation.ctp:187
-msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:194
-msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
-msgstr ""
-
-#: View/Events/automation.ctp:197
-msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
-msgstr ""
-
-#: View/Events/automation.ctp:200
+#: View/Events/automation.ctp:28
+#: View/Events/legacy_automation.ctp:200
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'."
 msgstr ""
 
-#: View/Events/automation.ctp:201
-msgid "Only export the attributes of the given event ID"
+#: View/Events/automation.ctp:29
+#: View/Events/legacy_automation.ctp:278
+msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
 msgstr ""
 
-#: View/Events/automation.ctp:202
-msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+#: View/Events/automation.ctp:30;151
+#: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:207
-msgid "Include not published Events."
+#: View/Events/automation.ctp:31;152
+#: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:208;275
-msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:32
+#: View/Events/legacy_automation.ctp:282;307
+msgid "The events that should be included / excluded from the search"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:33
+#: View/Events/legacy_automation.ctp:283;308
+msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
+msgstr ""
+
+#: View/Events/automation.ctp:34
+#: View/Events/legacy_automation.ctp:284
+msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
+msgstr ""
+
+#: View/Events/automation.ctp:35
+#: View/Events/legacy_automation.ctp:285;309
+msgid "Restrict the results by uuid."
+msgstr ""
+
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:37
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:38
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:39
+#: View/Events/legacy_automation.ctp:288;311
+msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
+msgstr ""
+
+#: View/Events/automation.ctp:40
+#: View/Events/legacy_automation.ctp:289;313
+msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
+msgstr ""
+
+#: View/Events/automation.ctp:41
+#: View/Events/legacy_automation.ctp:314
+msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
+msgstr ""
+
+#: View/Events/automation.ctp:42
+#: View/Events/legacy_automation.ctp:315
+msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
+msgstr ""
+
+#: View/Events/automation.ctp:43
+#: View/Events/legacy_automation.ctp:316
+msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:44
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:45
+msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
+msgstr ""
+
+#: View/Events/automation.ctp:46
+msgid "Filter on the event's info field."
+msgstr ""
+
+#: View/Events/automation.ctp:47
+msgid "Search for a full or a substring (delimited by % for substrings) in the event info, event tags, attribute tags, attribute values or attribute comment fields."
+msgstr ""
+
+#: View/Events/automation.ctp:48
+msgid "CSV only, select the fields that you wish to include in the CSV export. By setting event level fields additionally, includeContext is not required to get event metadata."
+msgstr ""
+
+#: View/Events/automation.ctp:49
+msgid "CSV only, add additional event level data to the export. The additional fields can be added via requested_attributes too with more granularity."
+msgstr ""
+
+#: View/Events/automation.ctp:79
+msgid "CSV specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:81
+msgid "Limit the list of fields to be returned in the CSV."
+msgstr ""
+
+#: View/Events/automation.ctp:82
+msgid "Include the event level meta-data with each attribute."
+msgstr ""
+
+#: View/Events/automation.ctp:83
+msgid "The CSV created when this setting is set to true will not contain the header row."
+msgstr ""
+
+#: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
+msgid "RPZ specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:95
+#: View/Events/legacy_automation.ctp:164
+msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
+msgstr ""
+
+#: View/Events/automation.ctp:98
+#: View/Events/legacy_automation.ctp:176
+msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
+msgstr ""
+
+#: View/Events/automation.ctp:102
+#: View/Events/legacy_automation.ctp:180
+msgid "To override the above values, either use the url parameters as described below"
+msgstr ""
+
+#: View/Events/automation.ctp:104
+#: View/Events/legacy_automation.ctp:182
+msgid "or POST an XML or JSON object with the above listed options"
+msgstr ""
+
+#: View/Events/automation.ctp:108
+#: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:109
+#: View/Events/legacy_automation.ctp:212
 msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
 msgstr ""
 
-#: View/Events/automation.ctp:213
+#: View/Events/automation.ctp:110
+#: View/Events/legacy_automation.ctp:213
 msgid "You can configure your tools to automatically download a file one of the Bro types."
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:116
+#: View/Events/legacy_automation.ctp:219
 msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
 msgstr ""
 
-#: View/Events/automation.ctp:222
+#: View/Events/automation.ctp:119
+#: View/Events/legacy_automation.ctp:222
 msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
 msgstr ""
 
-#: View/Events/automation.ctp:240
+#: View/Events/automation.ctp:137
+#: View/Events/legacy_automation.ctp:240
 msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
 msgstr ""
 
-#: View/Events/automation.ctp:242
+#: View/Events/automation.ctp:139
+#: View/Events/legacy_automation.ctp:242
 msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:249;301
+#: View/Events/automation.ctp:146
+#: View/Events/legacy_automation.ctp:249;301
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
 "    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
 "    Use semicolons instead (the search will automatically search for colons instead)."
 msgstr ""
 
-#: View/Events/automation.ctp:252
+#: View/Events/automation.ctp:149
+#: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:150
+#: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:154
+#: View/Events/legacy_automation.ctp:95;120;174;206;257
+msgid "All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/automation.ctp:156
+#: View/Events/legacy_automation.ctp:41;70;97;122;259;290
+msgid "The keywords false or null should be used for optional empty parameters in the URL."
+msgstr ""
+
+#: View/Events/automation.ctp:157
+#: View/Events/legacy_automation.ctp:260
 msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
 msgstr ""
 
-#: View/Events/automation.ctp:263
-msgid "Searches with JSON/XML/OpenIOC results"
-msgstr ""
-
-#: View/Events/automation.ctp:264
-msgid "It is possible to search the database for attributes based on a list of criteria."
-msgstr ""
-
-#: View/Events/automation.ctp:265
-msgid "To return an event or a list of events in a desired format, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:267
-msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
-msgstr ""
-
-#: View/Events/automation.ctp:268;297
-msgid "Search for the given value in the attributes' value field."
-msgstr ""
-
-#: View/Events/automation.ctp:271;300
-msgid "Search by the creator organisation by supplying the organisation identifier."
-msgstr ""
-
-#: View/Events/automation.ctp:272
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
-msgstr ""
-
-#: View/Events/automation.ctp:278
-msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
-msgstr ""
-
-#: View/Events/automation.ctp:282;307
-msgid "The events that should be included / excluded from the search"
-msgstr ""
-
-#: View/Events/automation.ctp:283;308
-msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
-msgstr ""
-
-#: View/Events/automation.ctp:284
-msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
-msgstr ""
-
-#: View/Events/automation.ctp:285;309
-msgid "Restrict the results by uuid."
-msgstr ""
-
-#: View/Events/automation.ctp:286;310
-msgid "Restrict the results by the last publish timestamp (newer than)."
-msgstr ""
-
-#: View/Events/automation.ctp:287
-msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
-msgstr ""
-
-#: View/Events/automation.ctp:288;311
-msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
-msgstr ""
-
-#: View/Events/automation.ctp:289;313
-msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
-msgstr ""
-
-#: View/Events/automation.ctp:291
-msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
-msgstr ""
-
-#: View/Events/automation.ctp:294;320;349
-msgid "POST message payload (json)"
-msgstr ""
-
-#: View/Events/automation.ctp:296
-msgid "To just return a list of attributes, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:304
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
-msgstr ""
-
-#: View/Events/automation.ctp:305
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
-msgstr ""
-
-#: View/Events/automation.ctp:312
-msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
-msgstr ""
-
-#: View/Events/automation.ctp:314
-msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
-msgstr ""
-
-#: View/Events/automation.ctp:315
-msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
-msgstr ""
-
-#: View/Events/automation.ctp:316
-msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
-msgstr ""
-
-#: View/Events/automation.ctp:317
-msgid "Only return attributes from events that have received a modification after the given timestamp."
-msgstr ""
-
-#: View/Events/automation.ctp:322
-msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
-msgstr ""
-
-#: View/Events/automation.ctp:324
-msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
-"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:327
-msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
-msgstr ""
-
-#: View/Events/automation.ctp:329
+#: View/Events/automation.ctp:160
+#: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:330
+#: View/Events/automation.ctp:161
+#: View/Events/legacy_automation.ctp:330
 msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:332
+#: View/Events/automation.ctp:163
+#: View/Events/legacy_automation.ctp:332
 msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
 "    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
 "    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:168
+#: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:169
+#: View/Events/legacy_automation.ctp:338
 msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:340
+#: View/Events/automation.ctp:171
+#: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:341
+#: View/Events/automation.ctp:172
+#: View/Events/legacy_automation.ctp:341
 msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
 msgstr ""
 
-#: View/Events/automation.ctp:342
+#: View/Events/automation.ctp:173
+#: View/Events/legacy_automation.ctp:342
 msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
 msgstr ""
 
-#: View/Events/automation.ctp:343
+#: View/Events/automation.ctp:174
+#: View/Events/legacy_automation.ctp:343
 msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
 msgstr ""
 
-#: View/Events/automation.ctp:345
+#: View/Events/automation.ctp:176
+#: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:353
+#: View/Events/automation.ctp:180
+#: View/Events/legacy_automation.ctp:294;320;349
+msgid "POST message payload (json)"
+msgstr ""
+
+#: View/Events/automation.ctp:184
+#: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:354
+#: View/Events/automation.ctp:185
+#: View/Events/legacy_automation.ctp:354
 msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
 msgstr ""
 
-#: View/Events/automation.ctp:355
+#: View/Events/automation.ctp:186
+#: View/Events/legacy_automation.ctp:355
 msgid "If set, it will return all samples from events that have a match for the hash provided above."
 msgstr ""
 
-#: View/Events/automation.ctp:356
+#: View/Events/automation.ctp:187
+#: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:357
+#: View/Events/automation.ctp:188
+#: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:359
+#: View/Events/automation.ctp:190
+#: View/Events/legacy_automation.ctp:359
 msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
 msgstr ""
 
-#: View/Events/automation.ctp:360
+#: View/Events/automation.ctp:191
+#: View/Events/legacy_automation.ctp:360
 msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
 msgstr ""
 
-#: View/Events/automation.ctp:361
+#: View/Events/automation.ctp:192
+#: View/Events/legacy_automation.ctp:361
 msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
 msgstr ""
 
-#: View/Events/automation.ctp:362
+#: View/Events/automation.ctp:193
+#: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:371
+#: View/Events/automation.ctp:202
+#: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:372
+#: View/Events/automation.ctp:203
+#: View/Events/legacy_automation.ctp:372
 msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
 msgstr ""
 
-#: View/Events/automation.ctp:373
+#: View/Events/automation.ctp:204
+#: View/Events/legacy_automation.ctp:373
 msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:374
+#: View/Events/automation.ctp:205
+#: View/Events/legacy_automation.ctp:374
 msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
 msgstr ""
 
-#: View/Events/automation.ctp:375
+#: View/Events/automation.ctp:206
+#: View/Events/legacy_automation.ctp:375
 msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 msgstr ""
 
-#: View/Events/automation.ctp:376
+#: View/Events/automation.ctp:207
+#: View/Events/legacy_automation.ctp:376
 msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
 msgstr ""
 
-#: View/Events/automation.ctp:377
+#: View/Events/automation.ctp:208
+#: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:378
+#: View/Events/automation.ctp:209
+#: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:379
+#: View/Events/automation.ctp:210
+#: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr ""
 
-#: View/Events/automation.ctp:380
+#: View/Events/automation.ctp:211
+#: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:381
+#: View/Events/automation.ctp:212
+#: View/Events/legacy_automation.ctp:381
 msgid "You can add or remove an existing tag from an event in the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:384
+#: View/Events/automation.ctp:215
+#: View/Events/legacy_automation.ctp:384
 msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
 msgstr ""
 
-#: View/Events/automation.ctp:386
+#: View/Events/automation.ctp:217
+#: View/Events/legacy_automation.ctp:386
 msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:388
+#: View/Events/automation.ctp:219
+#: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:389
+#: View/Events/automation.ctp:220
+#: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr ""
 
-#: View/Events/automation.ctp:393
+#: View/Events/automation.ctp:224
+#: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
-msgstr ""
+msgstr "HTTP"
 
-#: View/Events/automation.ctp:394
+#: View/Events/automation.ctp:225
+#: View/Events/legacy_automation.ctp:394
 #: View/Pages/doc/using_the_system.ctp:445
-#: View/SharingGroups/add.ctp:52
-#: View/SharingGroups/edit.ctp:60
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
-#: View/Events/automation.ctp:395
+#: View/Events/automation.ctp:226
+#: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:396
+#: View/Events/automation.ctp:227
+#: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:397
-#: View/Servers/rest.ctp:53
+#: View/Events/automation.ctp:228
+#: View/Events/legacy_automation.ctp:397
+#: View/Servers/rest.ctp:115
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:402
+#: View/Events/automation.ctp:233
+#: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:404;424;425;431;432
+#: View/Events/automation.ctp:235;255;256;262;263
+#: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:409
+#: View/Events/automation.ctp:240
+#: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:411;418
+#: View/Events/automation.ctp:242;249
+#: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:416
+#: View/Events/automation.ctp:247
+#: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:423
+#: View/Events/automation.ctp:254
+#: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:430
+#: View/Events/automation.ctp:261
+#: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:437
+#: View/Events/automation.ctp:268
+#: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:439;446
+#: View/Events/automation.ctp:270;277
+#: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
 #: View/Pages/doc/using_the_system.ctp:254
 msgid "Message"
 msgstr ""
 
-#: View/Events/automation.ctp:444
+#: View/Events/automation.ctp:275
+#: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:449
+#: View/Events/automation.ctp:280
+#: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:454
+#: View/Events/automation.ctp:285
+#: View/Events/legacy_automation.ctp:454
 msgid "None of the above fields are mandatory, but at least one of them has to be provided."
 msgstr ""
 
-#: View/Events/automation.ctp:456
+#: View/Events/automation.ctp:287
+#: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:457
+#: View/Events/automation.ctp:288
+#: View/Events/legacy_automation.ctp:457
 msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
 msgstr ""
 
-#: View/Events/automation.ctp:461
+#: View/Events/automation.ctp:292
+#: View/Events/legacy_automation.ctp:461
 msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
 "    An example for a valid lookup"
 msgstr ""
 
-#: View/Events/automation.ctp:472
+#: View/Events/automation.ctp:303
+#: View/Events/legacy_automation.ctp:472
 msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
 msgstr ""
 
-#: View/Events/automation.ctp:473
+#: View/Events/automation.ctp:304
+#: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:474
+#: View/Events/automation.ctp:305
+#: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:475
+#: View/Events/automation.ctp:306
+#: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:476
+#: View/Events/automation.ctp:307
+#: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:477
+#: View/Events/automation.ctp:308
+#: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:478
+#: View/Events/automation.ctp:309
+#: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:479
+#: View/Events/automation.ctp:310
+#: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:480
+#: View/Events/automation.ctp:311
+#: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:481
+#: View/Events/automation.ctp:312
+#: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:482
+#: View/Events/automation.ctp:313
+#: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:483
+#: View/Events/automation.ctp:314
+#: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:484
+#: View/Events/automation.ctp:315
+#: View/Events/legacy_automation.ctp:484
 msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:485
+#: View/Events/automation.ctp:316
+#: View/Events/legacy_automation.ctp:485
 msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
+#: View/Events/automation.ctp:319
+msgid "Freetext Import API"
+msgstr ""
+
+#: View/Events/automation.ctp:321
+msgid "The freetext import tool is also exposed to the API."
+msgstr ""
+
+#: View/Events/automation.ctp:322
+msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
+msgstr ""
+
+#: View/Events/automation.ctp:323
+msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:324
+msgid "The contents of the POST body should be the text to be parsed."
+msgstr ""
+
 #: View/Events/contact.ctp:8
 msgid "Contact organization reporting event "
 msgstr ""
@@ -6364,7 +6755,7 @@ msgstr ""
 #: View/Events/export.ctp:26
 #: View/Pages/doc/using_the_system.ctp:378
 msgid "Last Update"
-msgstr ""
+msgstr "Последнее обновление"
 
 #: View/Events/export.ctp:28
 #: View/Pages/doc/using_the_system.ctp:380
@@ -6373,13 +6764,13 @@ msgstr ""
 
 #: View/Events/export.ctp:29
 msgid "Filesize"
-msgstr ""
+msgstr "Размер файла"
 
 #: View/Events/export.ctp:30
 #: View/Pages/doc/administration.ctp:230
 #: View/Pages/doc/using_the_system.ctp:381
 msgid "Progress"
-msgstr ""
+msgstr "Прогресс"
 
 #: View/Events/export.ctp:43
 msgid "Attachments are enabled on this instance"
@@ -6391,11 +6782,11 @@ msgstr ""
 
 #: View/Events/export.ctp:81
 msgid "Loading…"
-msgstr ""
+msgstr "Загрузка…"
 
 #: View/Events/export.ctp:100;104
 msgid "Generate"
-msgstr ""
+msgstr "Генерировать"
 
 #: View/Events/export.ctp:158
 msgid "Warning, the background worker is not responding!"
@@ -6492,25 +6883,25 @@ msgstr ""
 
 #: View/Events/filter_event_index.ctp:17;211
 msgid "OR"
-msgstr ""
+msgstr "OR"
 
 #: View/Events/filter_event_index.ctp:17;211
 msgid "NOT"
-msgstr ""
+msgstr "NOT"
 
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
 msgid "Any"
-msgstr ""
+msgstr "Any"
 
 #: View/Events/filter_event_index.ctp:32;188
 #: View/Pages/doc/using_the_system.ctp:68;173
 msgid "High"
-msgstr ""
+msgstr "Высокий"
 
 #: View/Events/filter_event_index.ctp:32;189
 #: View/Pages/doc/using_the_system.ctp:67;172
 msgid "Medium"
-msgstr ""
+msgstr "Средний"
 
 #: View/Events/filter_event_index.ctp:32;191
 #: View/Pages/doc/using_the_system.ctp:174
@@ -6529,7 +6920,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:9;101
+#: View/Jobs/index.ctp:9;136
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr ""
@@ -6553,7 +6944,7 @@ msgid "All communities"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:53
+#: View/Feeds/index.ctp:103
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -6576,7 +6967,7 @@ msgstr ""
 #: View/Servers/filter_event_index.ctp:21
 #: View/Users/admin_filter_user_index.ctp:106
 msgid "Apply"
-msgstr ""
+msgstr "Применить"
 
 #: View/Events/filter_event_index.ctp:179
 msgid "\"No\""
@@ -6605,52 +6996,383 @@ msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/Organisations/view.ctp:97;98
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:33
 msgid "Events"
 msgstr ""
 
-#: View/Events/index.ctp:30
-msgid "Filter events"
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
 msgstr ""
 
-#: View/Events/index.ctp:31
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr ""
 
-#: View/Events/index.ctp:44
-msgid "Quickfilter"
-msgstr ""
-
-#: View/Events/index.ctp:44
-#: View/Organisations/index.ctp:59
-#: View/Servers/preview_index.ctp:45
-#: View/Tags/index.ctp:56
-#: View/Taxonomies/view.ctp:65
-msgid "Filter"
-msgstr ""
-
-#: View/Events/index.ctp:58
+#: View/Events/index.ctp:73
 msgid "My events only"
 msgstr ""
 
-#: View/Events/index.ctp:58
+#: View/Events/index.ctp:74
 msgid "My Events"
 msgstr ""
 
-#: View/Events/index.ctp:72
+#: View/Events/index.ctp:82
 msgid "My organisation's events only"
 msgstr ""
 
-#: View/Events/index.ctp:72
+#: View/Events/index.ctp:83
 msgid "Org Events"
 msgstr ""
 
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
+#: View/Tags/index.ctp:56
+#: View/Taxonomies/view.ctp:65
+msgid "Filter"
+msgstr "Фильтр"
+
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:3
+msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
+"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:6
+msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:10
+msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:11
+msgid "Please use the use the following header"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:12
+msgid "Authorization"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:13
+msgid "XML Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:14
+msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:15;47;76
+msgid "You can configure your tools to automatically download the following file"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:17
+msgid "If you only want to fetch a specific event append the eventid number"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:19;144
+msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:26
+msgid "The xml download also accepts two additional the following optional parameters in the URL"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:29;52;85
+msgid "Restrict the download to a single event"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:30
+msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:31;54;87;112;134
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:43
+msgid "Also check out the %s to read about the REST API."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:45
+msgid "CSV Export"
+msgstr "Экспорт в CSV"
+
+#: View/Events/legacy_automation.ctp:46
+msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:49
+msgid "You can specify additional flags for CSV exports as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:53
+msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:58
+msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:63
+msgid "Include the event data with each attribute."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:66
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:67
+msgid "The CSV created when this setting is set to true will not contain the header row.\n"
+"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:71
+msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:74
+msgid "NIDS rules export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:75
+msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:81
+msgid "The full API syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:84
+msgid "The export format, can be \"suricata\" or \"snort\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:86
+msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:93
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:94
+msgid "Restrict the export to only use the given types."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:96
+msgid "All tags will be included even if not exportable."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:98
+msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:100
+msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:102
+msgid "Hash database export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:103
+msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:104;188
+msgid "You can configure your tools to automatically download the following files"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:109
+msgid "The API's full format is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:111
+msgid "The export format, can be \"md5\" or \"sha1\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:123
+msgid "For example, to only show sha1 values from events tagged tag1, use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:126
+msgid "STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:127
+msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:129
+msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:132;171
+msgid "The event's ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:133
+msgid "Encode attachments where applicable"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:151
+msgid "Various ways to narrow down the search results of the STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:152
+msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:154
+msgid "To export the same events using a POST request use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:156
+msgid "Together with this JSON object in the POST message"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:158
+msgid "XML is automagically assumed when using the stix export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:160
+msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:163
+msgid "RPZ export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:165
+msgid "It is possible to further restrict the exported values using the following filters"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:167
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
+"        "
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:170
+msgid "Use semicolons instead (the search will automatically search for colons instead)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:172
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:173
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:186
+msgid "Text export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:187
+msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:194
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:197
+msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:201
+msgid "Only export the attributes of the given event ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:202
+msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:207
+msgid "Include not published Events."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:208;275
+msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:263
+msgid "Searches with JSON/XML/OpenIOC results"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:267
+msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:272
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:291
+msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:296
+msgid "To just return a list of attributes, use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:304
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:305
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:312
+msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:322
+msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:324
+msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
+"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:327
+msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
+msgstr ""
+
 #: View/Events/merge.ctp:4
 msgid "Merge events"
-msgstr ""
+msgstr "События слияний"
 
 #: View/Events/merge.ctp:9
 msgid "Event id to copy the attributes from"
@@ -6671,21 +7393,21 @@ msgid "Proposals"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:93
+#: View/Events/view.ctp:106
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
-msgstr ""
+msgstr "Участники"
 
 #: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:113
-#: View/Jobs/index.ctp:65
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
 #: View/Logs/admin_search.ctp:6
 #: View/Pages/doc/administration.ctp:87;104;116;181;195
 #: View/Pages/doc/using_the_system.ctp:166
-#: View/Users/admin_view.ctp:24
-#: View/Users/view.ctp:9
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
 msgid "Email"
-msgstr ""
+msgstr "Е-мейл"
 
 #: View/Events/report_validation_issues_events.ctp:2
 msgid "Listing invalid event validations"
@@ -6701,7 +7423,7 @@ msgstr ""
 
 #: View/Events/report_validation_issues_events.ctp:9
 msgid "Attribute details"
-msgstr ""
+msgstr "Детали атрибута"
 
 #: View/Events/resolved_attributes.ctp:4
 msgid "Below you can see the %s that are to be created. Make sure that the categories and the types are correct, often several options will be offered based on an inconclusive automatic resolution."
@@ -6717,7 +7439,7 @@ msgstr ""
 
 #: View/Events/resolved_attributes.ctp:46
 msgid "Similar Attributes"
-msgstr ""
+msgstr "Похожие атрибуты"
 
 #: View/Events/resolved_attributes.ctp:51
 #: View/ObjectReferences/ajax/add.ctp:30
@@ -6726,7 +7448,7 @@ msgstr ""
 #: View/Pages/doc/using_the_system.ctp:234;284
 #: View/Templates/populate_event_from_template_attributes.ctp:9
 msgid "Comment"
-msgstr ""
+msgstr "Комментарий"
 
 #: View/Events/resolved_attributes.ctp:191
 msgid "Remove resolved attribute"
@@ -6742,7 +7464,7 @@ msgstr ""
 
 #: View/Events/resolved_attributes.ctp:233;236
 msgid "Change all"
-msgstr ""
+msgstr "Изменить все"
 
 #: View/Events/resolved_attributes.ctp:235
 msgid "Update all comment fields"
@@ -6761,16 +7483,13 @@ msgid "Successfully added attributes"
 msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Events/view.ctp:56
 #: View/Feeds/preview_event.ctp:11
 #: View/Galaxies/view.ctp:18
-#: View/ObjectTemplates/view.ctp:15
-#: View/Organisations/view.ctp:54
 #: View/Organisations/ajax/merge.ctp:58
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
 msgid "Uuid"
-msgstr ""
+msgstr "Uuid"
 
 #: View/Events/show_i_o_c_results.ctp:29
 msgid "Failed indicators"
@@ -6786,8 +7505,16 @@ msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:45
 msgid "Visualisation"
+msgstr "Визуализация"
+
+#: View/Events/upload_analysis_file.ctp:6
+msgid "Import analysis file"
 msgstr ""
 
+#: View/Events/upload_analysis_file.ctp:61
+msgid "Create Objects"
+msgstr "Создать объекты"
+
 #: View/Events/upload_stix.ctp:6
 msgid "Import %s file"
 msgstr ""
@@ -6796,193 +7523,186 @@ msgstr ""
 msgid "%s file"
 msgstr ""
 
-#: View/Events/view.ctp:49
-msgid "Extended view"
+#: View/Events/upload_stix.ctp:24
+msgid "Include the original imported file as attachment"
 msgstr ""
 
-#: View/Events/view.ctp:51
+#: View/Events/view.ctp:53
 #: View/Servers/preview_event.ctp:12
 #: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Event ID"
-msgstr ""
+msgstr "ID события"
 
-#: View/Events/view.ctp:63
+#: View/Events/view.ctp:57
 msgid "Source Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:68
+#: View/Events/view.ctp:66
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:83
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
 msgid "Owner org"
 msgstr ""
 
-#: View/Events/view.ctp:131
+#: View/Events/view.ctp:135
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
 #: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
-msgstr ""
+msgstr "Уровень угрозы"
 
-#: View/Events/view.ctp:139
+#: View/Events/view.ctp:140
 #: View/Feeds/preview_event.ctp:37
 #: View/Pages/doc/using_the_system.ctp:70;177;210
 #: View/Servers/preview_event.ctp:48
 msgid "Analysis"
-msgstr ""
+msgstr "Анализ"
 
-#: View/Events/view.ctp:159
+#: View/Events/view.ctp:161
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
-msgstr ""
+msgstr "Инфо"
 
-#: View/Events/view.ctp:165;167
+#: View/Events/view.ctp:165
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
-msgstr ""
+msgstr "Опубликовано"
 
-#: View/Events/view.ctp:169
+#: View/Events/view.ctp:173
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:171
-msgid "Last change"
+#: View/Events/view.ctp:177
+msgid "First recorded change"
 msgstr ""
 
-#: View/Events/view.ctp:176
+#: View/Events/view.ctp:181
+msgid "Last change"
+msgstr "Последние изменения"
+
+#: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:210
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:194
-msgid "Currently in "
+#: View/Events/view.ctp:217
+msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:202
-msgid "- restricted to own organisation only."
+#: View/Events/view.ctp:217
+msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:203
-msgid "Advanced Sightings"
-msgstr ""
-
-#: View/Events/view.ctp:219
-msgid "you"
-msgstr ""
-
-#: View/Events/view.ctp:220
-msgid " has"
-msgstr ""
-
-#: View/Events/view.ctp:223
-msgid "You have"
-msgstr ""
-
-#: View/Events/view.ctp:226
+#: View/Events/view.ctp:265
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:227
-msgid "%s requested that %s take over this event."
-msgstr ""
-
-#: View/Events/view.ctp:227
+#: View/Events/view.ctp:277
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:232
-msgid "Correlation"
-msgstr ""
-
-#: View/Events/view.ctp:238;247
-#: View/Users/admin_view.ctp:125
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
 msgid "Disabled"
-msgstr ""
+msgstr "Отключено"
 
-#: View/Events/view.ctp:238
-msgid "enable"
-msgstr ""
-
-#: View/Events/view.ctp:242;249
-#: View/ObjectTemplates/index.ctp:32
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
 #: View/Taxonomies/view.ctp:24
-#: View/Warninglists/view.ctp:38
 msgid "Enabled"
-msgstr ""
+msgstr "Включено"
 
-#: View/Events/view.ctp:242
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr "включить"
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
 msgid "disable"
+msgstr "отключить"
+
+#: View/Events/view.ctp:307
+msgid "Extended view"
 msgstr ""
 
-#: View/Events/view.ctp:277
+#: View/Events/view.ctp:328
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:335
+#: View/Events/view.ctp:386;415
 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."
+#: View/Events/view.ctp:387;416
+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
+#: View/Events/view.ctp:424
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Discussion"
 msgstr ""
 
@@ -6992,11 +7712,11 @@ msgstr ""
 
 #: View/Events/view_graph.ctp:24
 msgid "Selected"
-msgstr ""
+msgstr "Выбранные"
 
 #: View/Events/view_graph.ctp:29
 msgid "Expand"
-msgstr ""
+msgstr "Развернуть"
 
 #: View/Events/ajax/enrich_event.ctp:4
 msgid "Select the enrichments you wish to run"
@@ -7018,29 +7738,33 @@ msgstr ""
 msgid " Event #"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:7
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:6
 msgid "Publish Event%s"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:8
+msgid "Unpublish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:20
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
-#: View/Feeds/index.ctp:54
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Feeds/index.ctp:104
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
-msgstr ""
+msgstr "Опубликовать"
 
 #: View/Events/ajax/exportChoice.ctp:2
 msgid "Choose the format that you wish to download the event in"
 msgstr ""
 
-#: View/Events/ajax/exportChoice.ctp:17;18;27;28
-msgid "Export as %s"
-msgstr ""
-
 #: View/Events/ajax/importChoice.ctp:2
 msgid "Choose the format that you would like to use for the import"
 msgstr ""
@@ -7120,7 +7844,7 @@ msgstr ""
 #: View/Feeds/add.ctp:67
 #: View/Feeds/edit.ctp:44
 msgid "Username"
-msgstr ""
+msgstr "Имя пользователя"
 
 #: View/Feeds/add.ctp:71
 #: View/Feeds/edit.ctp:48
@@ -7129,7 +7853,7 @@ msgstr ""
 #: View/Users/admin_edit.ctp:40
 #: View/Users/change_pw.ctp:9
 msgid "Password"
-msgstr ""
+msgstr "Пароль"
 
 #: View/Feeds/add.ctp:75
 #: View/Feeds/edit.ctp:52
@@ -7211,7 +7935,7 @@ msgstr ""
 
 #: View/Feeds/add.ctp:156
 #: View/Feeds/edit.ctp:153
-#: View/Feeds/index.ctp:55
+#: View/Feeds/index.ctp:105
 msgid "Delta Merge"
 msgstr ""
 
@@ -7223,7 +7947,7 @@ msgstr ""
 #: View/Feeds/add.ctp:185
 #: View/Feeds/edit.ctp:181
 msgid "Default Tag"
-msgstr ""
+msgstr "Тэг по умолчанию"
 
 #: View/Feeds/add.ctp:191
 #: View/Feeds/edit.ctp:186
@@ -7252,16 +7976,16 @@ msgstr ""
 
 #: View/Feeds/add.ctp:196
 #: View/Feeds/edit.ctp:191
-#: View/Servers/add.ctp:113
-#: View/Servers/edit.ctp:152;158
+#: View/Servers/add.ctp:102
+#: View/Servers/edit.ctp:147;153
 msgid "Modify"
 msgstr ""
 
-#: View/Feeds/compare_feeds.ctp:58
+#: View/Feeds/compare_feeds.ctp:66
 msgid "None or less than 1% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
-#: View/Feeds/compare_feeds.ctp:59
+#: View/Feeds/compare_feeds.ctp:67
 msgid "%s\\% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
@@ -7282,53 +8006,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr ""
 
 #: View/Feeds/edit.ctp:207
-#: View/Servers/add.ctp:143
-#: View/Servers/edit.ctp:186
+#: View/Servers/add.ctp:132
+#: View/Servers/edit.ctp:181
 msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
 msgstr ""
 
 #: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:185
+#: View/Servers/add.ctp:133
+#: View/Servers/edit.ctp:180
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
 #: View/Feeds/edit.ctp:209
-#: View/Servers/add.ctp:145
-#: View/Servers/edit.ctp:187
+#: View/Servers/add.ctp:134
+#: View/Servers/edit.ctp:182
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:146
-#: View/Servers/edit.ctp:188
+#: View/Servers/add.ctp:135
+#: View/Servers/edit.ctp:183
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
 #: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:189
+#: View/Servers/add.ctp:136
+#: View/Servers/edit.ctp:184
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:212
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:185
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:191
+#: View/Servers/edit.ctp:186
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:192
+#: View/Servers/edit.ctp:187
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority."
 msgstr ""
 
 #: View/Feeds/edit.ctp:215
-#: View/Servers/add.ctp:151
-#: View/Servers/edit.ctp:194
+#: View/Servers/add.ctp:140
+#: View/Servers/edit.ctp:189
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -7380,130 +8104,104 @@ msgstr ""
 msgid "Fetch and store all feed data"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
+#: View/Feeds/index.ctp:33
 msgid "Enable selected"
-msgstr ""
+msgstr "Включить выбранные"
 
-#: View/Feeds/index.ctp:27
-msgid "Enable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:28
+#: View/Feeds/index.ctp:39
 msgid "Disable selected"
-msgstr ""
+msgstr "Отключить выбранные"
 
-#: View/Feeds/index.ctp:28
-msgid "Disable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:29
+#: View/Feeds/index.ctp:45
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:29
-msgid "Enable Caching for Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:51
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:30
-msgid "Disable Caching for  Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
-msgid "Default feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:61
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:31
+#: View/Feeds/index.ctp:66
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:32
+#: View/Feeds/index.ctp:71
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:32
-msgid "All Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:33
+#: View/Feeds/index.ctp:76
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:33
-msgid "Enabled Feeds"
+#: View/Feeds/index.ctp:95
+msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:48
+#: View/Feeds/index.ctp:96
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:98
 msgid "Feed Format"
 msgstr ""
 
-#: View/Feeds/index.ctp:50
-#: View/Jobs/index.ctp:76
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
-msgstr ""
+msgstr "Ввод"
 
-#: View/Feeds/index.ctp:56
+#: View/Feeds/index.ctp:106
 msgid "Override IDS"
 msgstr ""
 
-#: View/Feeds/index.ctp:60
+#: View/Feeds/index.ctp:110
 msgid "Caching"
-msgstr ""
+msgstr "Кэширование"
 
-#: View/Feeds/index.ctp:108
-#: View/Servers/index.ctp:73;74
+#: View/Feeds/index.ctp:158
+#: View/Servers/index.ctp:74;75
 msgid "Rules"
-msgstr ""
+msgstr "Правила"
 
-#: View/Feeds/index.ctp:135
+#: View/Feeds/index.ctp:185
 msgid "Error: Invalid event!"
 msgstr ""
 
-#: View/Feeds/index.ctp:140
+#: View/Feeds/index.ctp:190
 msgid "Fixed event %s"
 msgstr ""
 
-#: View/Feeds/index.ctp:143
+#: View/Feeds/index.ctp:193
 msgid "New fixed event"
 msgstr ""
 
-#: View/Feeds/index.ctp:195
+#: View/Feeds/index.ctp:245
+#: View/Servers/index.ctp:94
 msgid "Age: "
-msgstr ""
+msgstr "Возраст: "
 
-#: View/Feeds/index.ctp:197
+#: View/Feeds/index.ctp:247
+#: View/Servers/index.ctp:102
 msgid "Not cached"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:210
+#: View/Feeds/index.ctp:260
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 msgid "Are you sure you want to permanently remove the feed (%s)?"
 msgstr ""
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:267
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -7525,46 +8223,30 @@ msgid "Namespace"
 msgstr ""
 
 #: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:17
+#: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:19
+#: View/Warninglists/view.ctp:12
 msgid "Version"
+msgstr "Версия"
+
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:2
-msgid "Select Cluster"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "Galaxy Cluster Deletion"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:11
-msgid "search clusters…"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies."
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:28
-msgid "Back to Galaxy Selection"
+#: View/GalaxyClusters/ajax/index.ctp:82
+msgid "Delete galaxy cluster"
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:2
-msgid "Select Cluster Source"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All clusters"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All Galaxies"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:2
-msgid "Select Galaxy Namespace Source"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All namespaces"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All Namespaces"
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
 msgstr ""
 
 #: View/Jobs/index.ctp:12
@@ -7579,37 +8261,37 @@ msgstr ""
 msgid "Completed."
 msgstr ""
 
-#: View/Jobs/index.ctp:63
+#: View/Jobs/index.ctp:68;98
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:74;99
 msgid "Show default queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
-#: View/Roles/admin_index.ctp:22
-#: View/Roles/index.ctp:22
-msgid "Default"
-msgstr ""
-
-#: View/Jobs/index.ctp:65
+#: View/Jobs/index.ctp:80;100
 msgid "Show email queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:86;101
 msgid "Show cache queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:66
-msgid "Cache"
-msgstr ""
+#: View/Jobs/index.ctp:99
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr "По умолчанию"
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:101
+msgid "Cache"
+msgstr "Кэш"
+
+#: View/Jobs/index.ctp:127
 msgid "No worker active"
 msgstr ""
 
-#: View/Jobs/index.ctp:124
+#: View/Jobs/index.ctp:159
 msgid "View stacktrace"
 msgstr ""
 
@@ -7629,14 +8311,10 @@ msgstr ""
 msgid "No error data found. Generally job error data is purged from Redis after 24 hours, however, you can still view the errors in the log files in \"/app/tmp/logs\"."
 msgstr ""
 
-#: View/Jobs/ajax/error.ctp:34
-msgid "Close"
-msgstr ""
-
 #: View/Logs/admin_index.ctp:2
 #: View/Logs/event_index.ctp:6
 msgid "Logs"
-msgstr ""
+msgstr "Журналы"
 
 #: View/Logs/admin_index.ctp:5
 msgid "Results for all log entries"
@@ -7674,36 +8352,34 @@ msgstr ""
 msgid "from IP"
 msgstr ""
 
-#: View/Logs/admin_index.ctp:20;21
-msgid "Search"
-msgstr ""
-
-#: View/Logs/admin_index.ctp:59
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
-msgstr ""
+msgstr "ID модели"
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:50
-#: View/ObjectTemplates/view.ctp:13
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/Templates/view.ctp:33
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
-msgstr ""
+msgstr "Организация"
 
 #: View/Logs/admin_search.ctp:19
 #: View/Pages/doc/administration.ctp:185;198
 #: View/Pages/doc/using_the_system.ctp:271
 #: View/Threads/index.ctp:22
 msgid "Title"
-msgstr ""
+msgstr "Название"
 
 #: View/Logs/admin_search.ctp:21
 #: View/Pages/doc/administration.ctp:186;199
 msgid "Change"
-msgstr ""
+msgstr "Изменение"
 
 #: View/Logs/test_for_stolen_attributes.ctp:2
 msgid "Stolen attribute validation"
@@ -7748,12 +8424,12 @@ msgstr ""
 
 #: View/Noticelists/index.ctp:35
 msgid "version"
-msgstr ""
+msgstr "версия"
 
 #: View/Noticelists/index.ctp:36
 #: View/Pages/doc/using_the_system.ctp:371
 msgid "enabled"
-msgstr ""
+msgstr "включено"
 
 #: View/Noticelists/ajax/delete_confirmation.ctp:9
 msgid "Noticelist Deletion"
@@ -7775,12 +8451,12 @@ msgstr ""
 msgid "Target UUID"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:53
+#: View/ObjectReferences/ajax/add.ctp:54
 #: View/Objects/orphaned_object_diagnostics.ctp:38
 msgid "Object"
-msgstr ""
+msgstr "Объект"
 
-#: View/ObjectReferences/ajax/add.ctp:68
+#: View/ObjectReferences/ajax/add.ctp:120
 msgid "Target Details"
 msgstr ""
 
@@ -7801,10 +8477,10 @@ msgid " The Attribute will be permanently deleted and unrecoverable. Also, this
 msgstr ""
 
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:24
-#: View/Pages/doc/categories_and_types.ctp:46
+#: View/Pages/doc/categories_and_types.ctp:40
 #: View/Pages/doc/md/categories_and_types.ctp:23
 msgid "Categories"
-msgstr ""
+msgstr "Категории"
 
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:25
 msgid "Sane defaults"
@@ -7822,46 +8498,38 @@ msgstr ""
 msgid "Object Template index"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:54
-#: View/ObjectTemplates/view.ctp:23
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:107
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:108
+#: View/ObjectTemplates/index.ctp:119
 msgid "Are you sure you want to delete template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:7
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr "ID"
+
+#: View/ObjectTemplates/view.ctp:33
 msgid " Object Template"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:9
-msgid "Object Template ID"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:2
-msgid "Select Object Category"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All meta-categories"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All Objects"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:50
-msgid "Back to categories"
-msgstr ""
-
 #: View/Objects/add.ctp:6
 msgid " Object"
-msgstr ""
+msgstr " Объект"
 
 #: View/Objects/add.ctp:9
 msgid "Object Template"
@@ -7877,7 +8545,7 @@ msgstr ""
 
 #: View/Objects/add.ctp:92
 msgid "Save"
-msgstr ""
+msgstr "Сохранить"
 
 #: View/Objects/add.ctp:93
 msgid "Name :: type"
@@ -7935,15 +8603,6 @@ msgstr ""
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:49
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/ajax/merge.ctp:65
-#: View/SharingGroups/add.ctp:32
-#: View/SharingGroups/edit.ctp:32
-msgid "UUID"
-msgstr ""
-
 #: View/Objects/ajax/delete.ctp:6
 msgid "Object Deletion"
 msgstr ""
@@ -7965,6 +8624,7 @@ msgid "Simply paste a list of all the organisation UUIDs that you wish to block
 msgstr ""
 
 #: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr ""
 
@@ -8055,7 +8715,7 @@ msgstr ""
 #: View/Organisations/admin_add.ctp:38
 #: View/Organisations/admin_edit.ctp:49
 msgid "Logo (48x48 png)"
-msgstr ""
+msgstr "Логотип (48x48 png)"
 
 #: View/Organisations/admin_add.ctp:44
 #: View/Organisations/admin_edit.ctp:55
@@ -8087,11 +8747,11 @@ msgstr ""
 
 #: View/Organisations/admin_edit.ctp:32
 msgid "Click here"
-msgstr ""
+msgstr "Нажмите здесь"
 
-#: View/Organisations/index.ctp:5
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:51
+#: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr ""
@@ -8100,7 +8760,7 @@ msgstr ""
 msgid ", both local and remote"
 msgstr ""
 
-#: View/Organisations/index.ctp:9
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr ""
@@ -8109,7 +8769,7 @@ msgstr ""
 msgid " on other instances"
 msgstr ""
 
-#: View/Organisations/index.ctp:13
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr ""
@@ -8126,58 +8786,55 @@ msgstr ""
 msgid "View all"
 msgstr ""
 
-#: View/Organisations/index.ctp:65
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:30
 msgid "Logo"
-msgstr ""
+msgstr "Логотип"
 
-#: View/Organisations/index.ctp:76
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr ""
 
-#: View/Organisations/index.ctp:117
+#: View/Organisations/index.ctp:138
 #: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 ""
 
-#: View/Organisations/view.ctp:3
-msgid "Organisation "
-msgstr ""
-
-#: View/Organisations/view.ctp:7
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:4
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/Users/admin_view.ctp:9
-#: View/Users/view.ctp:4
-#: View/Warninglists/view.ctp:4
-msgid "Id"
-msgstr ""
-
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:12
 #: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr ""
 
-#: View/Organisations/view.ctp:26
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:40
-msgid "E-mail domain restrictions"
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
 msgstr ""
 
-#: View/Organisations/view.ctp:93;94
-msgid "Members"
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
 msgstr ""
 
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr "Организация "
+
+#: View/Organisations/view.ctp:62;63
+msgid "Members"
+msgstr "Участники"
+
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:2
 msgid "Select organisations to add"
 msgstr ""
@@ -8187,7 +8844,6 @@ msgid "Available Organisations"
 msgstr ""
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
 msgid "Added Organisations"
 msgstr ""
 
@@ -8209,7 +8865,7 @@ msgstr ""
 
 #: View/Organisations/ajax/merge.ctp:19
 msgid "Organisation type"
-msgstr ""
+msgstr "Тип организации"
 
 #: View/Organisations/ajax/merge.ctp:33
 msgid "Target Local Organisation"
@@ -8226,7 +8882,7 @@ msgstr ""
 #: View/Organisations/ajax/merge.ctp:56;63
 #: View/Pages/doc/using_the_system.ctp:163;203
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #: View/Organisations/ajax/merge.ctp:62
 msgid "Organisation to be merged into"
@@ -8252,6 +8908,14 @@ msgstr ""
 msgid "Events need to have no validation issues"
 msgstr ""
 
+#: View/Pages/administration.ctp:15
+msgid "Recorrelate attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:16
+msgid "Recorrelate proposals"
+msgstr ""
+
 #: View/Pages/administration.ctp:18
 msgid "Verify Certificates"
 msgstr ""
@@ -8268,6 +8932,10 @@ msgstr ""
 msgid "Hotfix 2.3.57: Increase the max length of the organization field when adding a new server connection."
 msgstr ""
 
+#: View/Pages/administration.ctp:20
+msgid "Convert log fields to text"
+msgstr ""
+
 #: View/Pages/administration.ctp:20
 msgid "Hotfix 2.3.78: Some of the log fields that were varchar(255) ended up truncating the data. This function will change them to \"text\""
 msgstr ""
@@ -8280,18 +8948,34 @@ msgstr ""
 msgid "Hotfix 2.3.107: it was previously possible to get duplicate attribute UUIDs in the database, this script will remove all duplicates and ensure that duplicates will not be entered into the database in the future."
 msgstr ""
 
+#: View/Pages/administration.ctp:22
+msgid "Remove duplicate events (with the same UUID)"
+msgstr ""
+
 #: View/Pages/administration.ctp:22
 msgid "Hotfix 2.3.115: In some rare situations it could occur that a duplicate of an event was created on an instance, with the exact same uuid. This action will remove any such duplicates and make sure that this cannot happen again."
 msgstr ""
 
+#: View/Pages/administration.ctp:23
+msgid "Prune orphaned attributes"
+msgstr ""
+
 #: View/Pages/administration.ctp:23
 msgid "In some rare occasions it can happen that you end up with some attributes in your database that do not belong to an event - for example during a race condition between an event insert and a delete. This tool will collect and delete any such orphaned attributes. If you ever run into an issue where you cannot add an attribute with a specific valid value, this is probably the reason."
 msgstr ""
 
+#: View/Pages/administration.ctp:24
+msgid "Clean regex table of potentially malicious entries"
+msgstr ""
+
 #: View/Pages/administration.ctp:24
 msgid "Hotfix 2.3.160: Prior to this version it was possible for a user/admin with Regex permission to create a malicious regular expression that could be used to execute arbitrary code. Since this version it is no longer possible to input such expressions, but already existing malicious entries still have to be cleaned using this tool."
 msgstr ""
 
+#: View/Pages/administration.ctp:25
+msgid "Remove URL type attribute sanitisation"
+msgstr ""
+
 #: View/Pages/administration.ctp:25
 msgid "Hotfix 2.3.173: Sanitised URLs can cause issues with the NIDS exports and as of this version attributes will be modified on entry to correct this. To correct existing entries, run this script."
 msgstr ""
@@ -8330,7 +9014,7 @@ msgstr ""
 
 #: View/Pages/administration.ctp:33
 msgid "Upgrade to 2.4"
-msgstr ""
+msgstr "Обновить до 2.4"
 
 #: View/Pages/administration.ctp:34
 msgid "If it completes successful, run the %s to remove the fields that are specific to 2.3. Make sure that the migration of the data to the 2.4 format was successful (you can check the result in the audit logs). If you have run the 2.4 upgrade script previously but are running into SQL errors on the column 'org', run this script."
@@ -8345,17 +9029,15 @@ msgid "If the migration of your data from 2.4 is not complete this will lead to
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:3
-#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:3
 #: View/Pages/doc/general.ctp:3
 #: View/Pages/doc/quickstart.ctp:3;14
 #: View/Pages/doc/user_management.ctp:3
 #: View/Pages/doc/using_the_system.ctp:3
 msgid "Quick Start"
-msgstr ""
+msgstr "Быстрый старт"
 
 #: View/Pages/doc/administration.ctp:4
-#: View/Pages/doc/categories_and_types.ctp:4
 #: View/Pages/doc/concepts.ctp:4
 #: View/Pages/doc/general.ctp:4;14
 #: View/Pages/doc/quickstart.ctp:4
@@ -8365,7 +9047,6 @@ msgid "General Layout"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:5
-#: View/Pages/doc/categories_and_types.ctp:5
 #: View/Pages/doc/concepts.ctp:5;14
 #: View/Pages/doc/general.ctp:5
 #: View/Pages/doc/quickstart.ctp:5
@@ -8375,7 +9056,6 @@ msgid "General Concepts"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:6
-#: View/Pages/doc/categories_and_types.ctp:6
 #: View/Pages/doc/concepts.ctp:6
 #: View/Pages/doc/general.ctp:6
 #: View/Pages/doc/quickstart.ctp:6
@@ -8385,7 +9065,6 @@ msgid "User Management and Global actions"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:7
-#: View/Pages/doc/categories_and_types.ctp:7
 #: View/Pages/doc/concepts.ctp:7
 #: View/Pages/doc/general.ctp:7
 #: View/Pages/doc/quickstart.ctp:7
@@ -8400,24 +9079,24 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:11;171
 msgid "Blacklist"
-msgstr ""
+msgstr "Чёрный список"
 
 #: View/Pages/doc/administration.ctp:14
 msgid "User Management"
-msgstr ""
+msgstr "Управление пользователями"
 
 #: View/Pages/doc/administration.ctp:15
 msgid "Role Management"
-msgstr ""
+msgstr "Управление ролями"
 
 #: View/Pages/doc/administration.ctp:16
 msgid "Logging"
-msgstr ""
+msgstr "Логирование"
 
 #: View/Pages/doc/administration.ctp:17;202
 #: View/Pages/doc/general.ctp:78
 msgid "Administrative Tools"
-msgstr ""
+msgstr "Администрирование"
 
 #: View/Pages/doc/administration.ctp:18;205
 msgid "Background Processing"
@@ -8425,17 +9104,17 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:19
 msgid "FAQ"
-msgstr ""
+msgstr "ЧаВо (FAQ)"
 
 #: View/Pages/doc/administration.ctp:22
-#: View/Pages/doc/categories_and_types.ctp:9
+#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:9
 #: View/Pages/doc/general.ctp:9
 #: View/Pages/doc/quickstart.ctp:9
 #: View/Pages/doc/user_management.ctp:15
 #: View/Pages/doc/using_the_system.ctp:22
 msgid "Categories and Types"
-msgstr ""
+msgstr "Категории и типы"
 
 #: View/Pages/doc/administration.ctp:27
 msgid "Server settings and diagnostics"
@@ -8459,7 +9138,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:33
 msgid "MISP settings"
-msgstr ""
+msgstr "Настройки MISP"
 
 #: View/Pages/doc/administration.ctp:33
 msgid "Basic MISP settings. This includes the way MISP handles the default settings for distribution settings, whether background jobs are enabled, etc"
@@ -8467,7 +9146,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:34
 msgid "GnuPG settings"
-msgstr ""
+msgstr "Настройки GnuPG"
 
 #: View/Pages/doc/administration.ctp:34
 msgid "GnuPG related settings."
@@ -8479,15 +9158,16 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:36
 msgid "Security settings"
-msgstr ""
+msgstr "Настройки безопасности"
 
 #: View/Pages/doc/administration.ctp:36
 msgid "Settings controlling the brute-force protection and the application's salt key."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
+#: View/Servers/edit.ctp:82
 msgid "Misc settings"
-msgstr ""
+msgstr "Прочие настройки"
 
 #: View/Pages/doc/administration.ctp:37
 msgid "You change the debug options here, but make sure that debug is always disabled on a production system."
@@ -8636,7 +9316,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:83
 msgid "Adding a new user"
-msgstr ""
+msgstr "Добавление нового пользователя"
 
 #: View/Pages/doc/administration.ctp:84;114
 msgid "To add a new user, click on the New User button in the administration menu to the left and fill out the following fields in the view that is loaded"
@@ -8644,7 +9324,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:85
 msgid "Add user"
-msgstr ""
+msgstr "Добавить пользователя"
 
 #: View/Pages/doc/administration.ctp:85
 msgid "Fill this form out to add a new user. Keep in mind that the drop-down menu titled Role controls the privileges the user will have."
@@ -8660,7 +9340,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:89;118
 msgid "Confirm Password"
-msgstr ""
+msgstr "Подтверждение пароля"
 
 #: View/Pages/doc/administration.ctp:89;118
 msgid "This should be an exact copy of the Password field."
@@ -8674,7 +9354,7 @@ msgstr ""
 #: View/Roles/admin_index.ctp:2
 #: View/Roles/index.ctp:2
 msgid "Roles"
-msgstr ""
+msgstr "Роли"
 
 #: View/Pages/doc/administration.ctp:91;120
 msgid "A drop-down list allows you to choose a role-group that the user should belong to. Roles define the privileges of the user. To learn more about roles, <a href=#roles>click here</a>."
@@ -8704,10 +9384,10 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_view.ctp:40
-#: View/Users/view.ctp:34
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
 msgid "Authkey"
-msgstr ""
+msgstr "Ключ аутентификации"
 
 #: View/Pages/doc/administration.ctp:94
 msgid "This is assigned automatically and is the unique authentication key of the user (he/she will be able to reset this and receive a new key). It is used for exports and for connecting one server to another, but it requires the user to be assigned to a role that has auth permission enabled."
@@ -8715,7 +9395,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:95;124
 msgid "NIDS Sid"
-msgstr ""
+msgstr "NIDS Sid"
 
 #: View/Pages/doc/administration.ctp:95;124
 msgid "Nids ID, not yet implemented."
@@ -8723,7 +9403,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:96;127
 msgid "GnuPGkey"
-msgstr ""
+msgstr "Ключ GnuPG"
 
 #: View/Pages/doc/administration.ctp:96;127
 msgid "The key used for encrypting e-mails sent through the system."
@@ -8731,7 +9411,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:98
 msgid "Listing all users"
-msgstr ""
+msgstr "Листинг всех пользователей"
 
 #: View/Pages/doc/administration.ctp:99
 msgid "To list all current users of the system, just click on List Users under the administration menu to the left. A view will be loaded with a list of all users and the following columns of information"
@@ -8739,7 +9419,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:100
 msgid "List users"
-msgstr ""
+msgstr "Список пользователей"
 
 #: View/Pages/doc/administration.ctp:100
 msgid "View, Edit or Delete a user using the action buttons to the right."
@@ -8758,8 +9438,8 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_view.ctp:29
-#: View/Users/view.ctp:24
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr ""
 
@@ -8780,8 +9460,6 @@ msgid "Shows the currently assigned NIDS ID."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:109;125
-#: View/Users/admin_view.ctp:100
-#: View/Users/view.ctp:55
 msgid "Termsaccepted"
 msgstr ""
 
@@ -8790,7 +9468,7 @@ msgid "This flag indicates whether the user has accepted the terms of use or not
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:110
-#: View/Users/admin_view.ctp:120
+#: View/Users/admin_view.ctp:84
 msgid "Newsread"
 msgstr ""
 
@@ -8808,7 +9486,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:113
 msgid "Editing a user"
-msgstr ""
+msgstr "Редактировать пользователя"
 
 #: View/Pages/doc/administration.ctp:117
 msgid "It is possible to assign a new password manually for a user. For example, in case that he/she forgot the old one a new temporary one can be assigned. Make sure to check the \"Change password\" field if you do give out a temporary password, so that the user will be forced to change it after login."
@@ -8852,9 +9530,9 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:133;184;197
 #: View/Pages/doc/using_the_system.ctp:269
-#: View/Taxonomies/view.ctp:78
+#: View/Taxonomies/view.ctp:89
 msgid "Action"
-msgstr ""
+msgstr "Действие"
 
 #: View/Pages/doc/administration.ctp:133
 msgid "This defines the type of the e-mail, which can be a custom message or a password reset. Password resets automatically include a new temporary password at the bottom of the message and will automatically change the user's password accordingly."
@@ -8900,7 +9578,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:144
 msgid "Read Only"
-msgstr ""
+msgstr "Только чтение"
 
 #: View/Pages/doc/administration.ctp:144
 msgid "This allows the user to browse events that his organisation has access to, but doesn't allow any changes to be made to the database."
@@ -8908,7 +9586,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:145
 msgid "Manage My Own Events"
-msgstr ""
+msgstr "Управление своими событиями"
 
 #: View/Pages/doc/administration.ctp:145
 msgid "The second option, gives its users rights to create, modify or delete their own events, but they cannot publish them."
@@ -8996,7 +9674,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:158
 msgid "Listing roles"
-msgstr ""
+msgstr "Листинг ролей"
 
 #: View/Pages/doc/administration.ctp:159
 msgid "By clicking on the List Roles button, you can view a list of all the currently registered roles and a list of the permission flags turned on for each. In addition, you can find buttons that allow you to edit and delete the roles. Keep in mind that you will need to first remove every member from a role before you can delete it."
@@ -9004,7 +9682,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:160
 msgid "List roles"
-msgstr ""
+msgstr "Список ролей"
 
 #: View/Pages/doc/administration.ctp:160
 msgid "You can View, Edit or Delete roles using the action buttons to the right in each row. Keep in mind that a role has to be devoid of members before it can be deleted."
@@ -9012,7 +9690,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:162
 msgid "Using the logs of MISP"
-msgstr ""
+msgstr "Использование журналов MISP"
 
 #: View/Pages/doc/administration.ctp:163
 msgid "Users with audit permissions are able to browse or search the logs that MISP automatically appends each time certain actions are taken (actions that modify data or if a user logs in and out)."
@@ -9044,7 +9722,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:172
 msgid "Whitelist"
-msgstr ""
+msgstr "Белый список"
 
 #: View/Pages/doc/administration.ctp:173
 msgid "Regexp"
@@ -9060,7 +9738,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:178
 msgid "List logs"
-msgstr ""
+msgstr "Список логов"
 
 #: View/Pages/doc/administration.ctp:178
 msgid "Here you can view a list of all logged actions."
@@ -9100,7 +9778,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:191
 msgid "Search log"
-msgstr ""
+msgstr "Журнал поиска"
 
 #: View/Pages/doc/administration.ctp:191
 msgid "You can search the logs using this form, narrow down your search by filling out several fields."
@@ -9108,7 +9786,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:192
 msgid "Searching the Logs"
-msgstr ""
+msgstr "Поиск в журналах"
 
 #: View/Pages/doc/administration.ctp:193
 msgid "Another way to browse the logs is to search it by filtering the results according to the following fields (the search is a sub-string search, the sub-string has to be an exact match for the entry in the field that is being searched for)"
@@ -9170,7 +9848,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:214
 msgid "clear"
-msgstr ""
+msgstr "очистить"
 
 #: View/Pages/doc/administration.ctp:214
 msgid "Clear the queue of a worker immediately."
@@ -9178,7 +9856,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:215
 msgid "stats"
-msgstr ""
+msgstr "статистика"
 
 #: View/Pages/doc/administration.ctp:215
 msgid "shows some statistics about your workers including the count of successful and failed jobs."
@@ -9202,7 +9880,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:222
 msgid "Process"
-msgstr ""
+msgstr "Обработка"
 
 #: View/Pages/doc/administration.ctp:222
 msgid "The process's ID."
@@ -9287,7 +9965,7 @@ msgstr ""
 #: View/Pages/doc/administration.ctp:240
 #: View/Tasks/index.ctp:38
 msgid "Next Run"
-msgstr ""
+msgstr "След. запуск"
 
 #: View/Pages/doc/administration.ctp:240
 msgid "The date on which the task should be executed."
@@ -9323,22 +10001,22 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:249
 msgid "my_new_password"
-msgstr ""
+msgstr "my_new_password"
 
 #: View/Pages/doc/administration.ctp:250
 msgid "This will create a new password hash using the currently set salt."
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:13
+#: View/Pages/doc/categories_and_types.ctp:7
 msgid "Attribute Categories and Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:14
+#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/md/categories_and_types.ctp:1
 msgid "Attribute Categories vs. Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:80
+#: View/Pages/doc/categories_and_types.ctp:74
 msgid "Click here to get the .md version for gitbook generation."
 msgstr ""
 
@@ -9347,12 +10025,12 @@ msgid "Admins and Site Admins"
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:16
-msgid "There are two types of admins in MISP: Admins (also refered to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
+msgid "There are two types of admins in MISP: Admins (also referred to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:17
 msgid "Background Jobs"
-msgstr ""
+msgstr "Фоновые задания"
 
 #: View/Pages/doc/concepts.ctp:18
 msgid "A lot of the heavier tasks are a burden to users, in that their actions can cause long delays (and in some cases timeouts) while the application logic is executing. To alleviate this, long processes have been (if enabled) moved to background jobs, meaning that their execution happens asynchronously in the background, allowing the user to freely interact with the platform whilst the request is being processed."
@@ -9360,7 +10038,7 @@ msgstr ""
 
 #: View/Pages/doc/concepts.ctp:19
 msgid "MISP Instance"
-msgstr ""
+msgstr "MISP инстансы"
 
 #: View/Pages/doc/concepts.ctp:20
 msgid "A MISP instance is an installation of the MISP software and the connected database. All the data visible to the users is stored locally in the database and data that is shareable (based on the distribution settings) can be synchronised with other instances via the Sync actions. The instance that you are reading this manual on will be refered to as \"this instance\" or \"your instance\". The instances that your instance synchronises with will be refered to as \"remote instances\"."
@@ -9414,7 +10092,7 @@ msgstr ""
 #: View/Pages/doc/concepts.ctp:34
 #: View/Pages/doc/using_the_system.ctp:400
 msgid "Push"
-msgstr ""
+msgstr "Push"
 
 #: View/Pages/doc/concepts.ctp:35
 msgid "Pushing is the process of using a configured instance link to send an event or all accessible events (limited by the distribution rights) through the REST interface to a remote instance."
@@ -9472,16 +10150,12 @@ msgstr ""
 
 #: View/Pages/doc/general.ctp:19
 msgid "Home button"
-msgstr ""
+msgstr "Кнопка Домой"
 
 #: View/Pages/doc/general.ctp:19
 msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:20
-msgid "Event Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:20
 msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
 msgstr ""
@@ -9490,18 +10164,10 @@ msgstr ""
 msgid "Input filters alter what and how data can be entered into this instance. Apart from the basic validation of attribute entry by type, it is possible for the site administrators to define regular expression replacements and blacklists for certain values in addition to blocking certain values from being exportable. Users can view these replacement and blacklist rules here whilst administrator can alter them."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:22;54
-msgid "Global Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:22
 msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:23;66
-msgid "Sync Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:23
 msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
 msgstr ""
@@ -9541,7 +10207,7 @@ msgstr ""
 
 #: View/Pages/doc/general.ctp:32
 msgid "Event actions"
-msgstr ""
+msgstr "Действия событий"
 
 #: View/Pages/doc/general.ctp:34
 msgid "Lists all the events in the system that are not private or belong to your organisation. You can add, modify, delete, publish or view individual events from this view."
@@ -9573,7 +10239,7 @@ msgstr ""
 
 #: View/Pages/doc/general.ctp:41
 msgid "Create a new tag."
-msgstr ""
+msgstr "Создать новый тэг."
 
 #: View/Pages/doc/general.ctp:42
 msgid "List all of the templates created by users with template creation rights on this instance."
@@ -9581,7 +10247,7 @@ msgstr ""
 
 #: View/Pages/doc/general.ctp:43
 msgid "Create a new template."
-msgstr ""
+msgstr "Создать новый шаблон."
 
 #: View/Pages/doc/general.ctp:44
 msgid "Export the data accessible to you in various formats."
@@ -9627,6 +10293,11 @@ msgstr ""
 msgid "A link to this user guide."
 msgstr ""
 
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr ""
+
 #: View/Pages/doc/general.ctp:61
 msgid "View the terms &amp; conditions again."
 msgstr ""
@@ -9645,7 +10316,7 @@ msgstr ""
 
 #: View/Pages/doc/general.ctp:73
 msgid "New User"
-msgstr ""
+msgstr "Новый пользователь"
 
 #: View/Pages/doc/general.ctp:73
 msgid "Create an account for a new user for your organisation. Site administrators can create users for any organisation."
@@ -9657,7 +10328,7 @@ msgstr ""
 
 #: View/Pages/doc/general.ctp:75
 msgid "New Role"
-msgstr ""
+msgstr "Новая роль"
 
 #: View/Pages/doc/general.ctp:75
 msgid "Create a new role group for the users of this instance, controlling their privileges to create, modify, delete and to publish events and to access certain features such as the logs or automation."
@@ -9677,7 +10348,7 @@ msgstr ""
 
 #: View/Pages/doc/general.ctp:79
 msgid "Server Settings"
-msgstr ""
+msgstr "Настройки сервера"
 
 #: View/Pages/doc/general.ctp:79
 msgid "Set up and diagnose your MISP installation."
@@ -9724,7 +10395,7 @@ msgstr ""
 
 #: View/Pages/doc/quickstart.ctp:19
 msgid "Create an Event"
-msgstr ""
+msgstr "Создать событие"
 
 #: View/Pages/doc/quickstart.ctp:21
 msgid "Browsing past Events"
@@ -9740,7 +10411,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:9;34
 msgid "Managing your account"
-msgstr ""
+msgstr "Управление профилем"
 
 #: View/Pages/doc/user_management.ctp:10;48
 msgid "Staying up to date"
@@ -9764,7 +10435,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:25;26;41
 msgid "Changing the password"
-msgstr ""
+msgstr "Изменение пароля"
 
 #: View/Pages/doc/user_management.ctp:25
 msgid "After accepting the ToU, you'll be prompted to change your password, but keep in mind that it has to be at least 6 characters long, it has to include at least one upper-case and one lower-case character in addition to a digit or a special character. Enter the same password into the confirm password field, before clicking submit to finalise the change."
@@ -9884,7 +10555,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:58
 msgid "General Statistics"
-msgstr ""
+msgstr "Общая статистика"
 
 #: View/Pages/doc/user_management.ctp:58
 msgid "View a set of statistics such as the number of Events and Attributes currently in existance on the platform. The number in the bracket shows the number of new items added during this week."
@@ -9892,7 +10563,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:47
+#: View/Users/statistics_data.ctp:53
 msgid "Activity Heatmap"
 msgstr ""
 
@@ -9934,7 +10605,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:16;365
 msgid "Exporting data"
-msgstr ""
+msgstr "Экспорт данных"
 
 #: View/Pages/doc/using_the_system.ctp:17
 msgid "Connecting to other servers"
@@ -9942,7 +10613,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:18;422
 msgid "Rest API"
-msgstr ""
+msgstr "Rest API"
 
 #: View/Pages/doc/using_the_system.ctp:28
 msgid "The process of entering an event can be split into 3 phases, the creation of the event itself, populating it with attributes\n"
@@ -10027,7 +10698,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:67
 msgid "Advanced Persistent Threats (APT)"
-msgstr ""
+msgstr "Сложная постоянная угроза (APT)"
 
 #: View/Pages/doc/using_the_system.ctp:68
 msgid "Sophisticated APTs and 0day attacks."
@@ -10043,15 +10714,15 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:73;181
 msgid "The analysis is in progress"
-msgstr ""
+msgstr "Проводится анализ"
 
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "The analysis is complete"
-msgstr ""
+msgstr "Анализ завершен"
 
 #: View/Pages/doc/using_the_system.ctp:76;319
 msgid "Event Description"
-msgstr ""
+msgstr "Описание события"
 
 #: View/Pages/doc/using_the_system.ctp:76
 msgid "The info field, where the malware/incident can get a brief description starting with the internal reference. This field should be as brief and concise as possible, the more detailed description happens through attributes in the next stage of the event's creation. Keep in mind that the system will automatically replace detected text strings that match a regular expression entry set up by your server's administrator(s)."
@@ -10121,7 +10792,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:96
 msgid "administration"
-msgstr ""
+msgstr "администрирование"
 
 #: View/Pages/doc/using_the_system.ctp:97
 msgid "Batch import"
@@ -10175,7 +10846,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:110
 msgid "Text field"
-msgstr ""
+msgstr "Текстовое поле"
 
 #: View/Pages/doc/using_the_system.ctp:110
 msgid "This field can either be a single line textfield or a multi-line text area. For the former, enter a single value of the above indicated type, whilst for the latter you cna paste a list of values separated by line-breaks."
@@ -10281,7 +10952,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:141
 msgid "OpenIOC1"
-msgstr ""
+msgstr "OpenIOC1"
 
 #: View/Pages/doc/using_the_system.ctp:141
 msgid "The import tool will list the successful and failed entries after the process is done."
@@ -10289,7 +10960,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:142
 msgid "OpenIOC2"
-msgstr ""
+msgstr "OpenIOC2"
 
 #: View/Pages/doc/using_the_system.ctp:142
 msgid "You'll also be able to see a graph of the imported .ioc file and how successful the import was."
@@ -10311,7 +10982,7 @@ msgstr ""
 #: View/Sightings/ajax/list_sightings.ctp:8
 #: View/Users/statistics_sightings.ctp:9
 msgid "Source"
-msgstr ""
+msgstr "Источник"
 
 #: View/Pages/doc/using_the_system.ctp:145
 msgid "The result will be a list of attributes that get added to the currently selected event, each of which will be marked with a comment that indicates that its origin being from a ThreatConnect import."
@@ -10347,7 +11018,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:158
 msgid "List events"
-msgstr ""
+msgstr "Список событий"
 
 #: View/Pages/doc/using_the_system.ctp:158
 msgid "This is the list of events in the system. Use the buttons to the right to alter or view any of the events."
@@ -10640,7 +11311,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:253
 msgid "Organisation logo"
-msgstr ""
+msgstr "Логотип организации"
 
 #: View/Pages/doc/using_the_system.ctp:253
 msgid "If such an image exists for the organisation that has posted the message, then the logo is shown."
@@ -10692,7 +11363,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:265
 msgid "Event History"
-msgstr ""
+msgstr "История событий"
 
 #: View/Pages/doc/using_the_system.ctp:266
 msgid "View the logs of the event that show how the event has changed over time, including the contribution from other organisations in the form of proposals. There are two ways to get to this view, either by clicking on View Event History on the side menu of an event view, or by clicking on a contributing organisation's logo on the event view. The latter will show a restricted form of the logs, showing only Proposals created by the selected organisation. The fields shown in this view are as described as follows"
@@ -10708,7 +11379,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:270
 msgid "Model"
-msgstr ""
+msgstr "Модель"
 
 #: View/Pages/doc/using_the_system.ctp:270
 msgid "As described above, a log entry is generated on certain actions. This field shows which type of data was affected that caused the log entry to be created (such as a change to the event, the creation of an attribute, the discarding of a proposal, etc)."
@@ -10776,7 +11447,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:290
 msgid "Search attribute"
-msgstr ""
+msgstr "Поисковый атрибут"
 
 #: View/Pages/doc/using_the_system.ctp:291
 msgid "This will bring up a form that lets you enter one or several search strings (separate search strings with line breaks) that will be compared to the values of all attributes, along with options to narrow down the search based on category and type. The entered search string has to be an exact match with (the sub-string of) a value. A second text field makes it possible to enter event IDs for events that should be excluded from the search (again, each line represents an event ID to be excluded). The third text field allows the user to restrict the results to attributes from certain organisations or to attributes not created by certain other organisations, using the above described syntax."
@@ -10814,12 +11485,6 @@ msgstr ""
 msgid "As described earlier, users with tagging rights can arbitrarily tag events using tags chosen from a pool of available options. If you have tagging privileges and would like to create a new tag, navigate to Event Actions - Add Tag. You'll be presented with the following form"
 msgstr ""
 
-#: View/Pages/doc/using_the_system.ctp:303
-#: View/Templates/add.ctp:17
-#: View/Templates/edit.ctp:17
-msgid "Add tag"
-msgstr ""
-
 #: View/Pages/doc/using_the_system.ctp:303
 msgid "Enter a name for the tag and click on the color field to be able to pick a colour for it."
 msgstr ""
@@ -10855,7 +11520,7 @@ msgstr ""
 #: View/Pages/doc/using_the_system.ctp:314
 #: View/Templates/add.ctp:6
 msgid "Create Template"
-msgstr ""
+msgstr "Создать шаблон"
 
 #: View/Pages/doc/using_the_system.ctp:314
 msgid "Fill in the generic information about the template."
@@ -10893,7 +11558,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:323
 msgid "Attribute Element"
-msgstr ""
+msgstr "Атрибут элемента"
 
 #: View/Pages/doc/using_the_system.ctp:324
 msgid "Template Attribute Element"
@@ -10942,7 +11607,7 @@ msgstr ""
 #: View/TemplateElements/ajax/template_element_add_file.ctp:48
 #: View/TemplateElements/ajax/template_element_edit_file.ctp:48
 msgid "Mandatory element"
-msgstr ""
+msgstr "Обязательный элемент"
 
 #: View/Pages/doc/using_the_system.ctp:333
 msgid "If the elemnt is marked as mandatory, then the template form can only be submitted by users if this field is filled out."
@@ -10990,11 +11655,11 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:347
 msgid "Text Element"
-msgstr ""
+msgstr "Текстовый элемент"
 
 #: View/Pages/doc/using_the_system.ctp:348
 msgid "Template Text Element"
-msgstr ""
+msgstr "Шаблон текстового элементов"
 
 #: View/Pages/doc/using_the_system.ctp:348
 msgid "This element will start a section in the template, which continues until the next text element or the end of the template."
@@ -11046,11 +11711,11 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:367
 msgid "On"
-msgstr ""
+msgstr "Вкл"
 
 #: View/Pages/doc/using_the_system.ctp:367
 msgid "Off"
-msgstr ""
+msgstr "Выкл"
 
 #: View/Pages/doc/using_the_system.ctp:368;371
 msgid "Export page with background jobs"
@@ -11142,15 +11807,15 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:395
 msgid "Add server"
-msgstr ""
+msgstr "Добавить сервер"
 
 #: View/Pages/doc/using_the_system.ctp:395
 msgid "Make sure that you enter the authentication key that you have been given by the hosting organisation of the remote instance, instead of the one you have gotten from this one."
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:397
-#: View/Servers/add.ctp:7
-#: View/Servers/edit.ctp:7
+#: View/Servers/add.ctp:8
+#: View/Servers/edit.ctp:8
 msgid "Base URL"
 msgstr ""
 
@@ -11160,7 +11825,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:398
 msgid "Organization"
-msgstr ""
+msgstr "Организация"
 
 #: View/Pages/doc/using_the_system.ctp:398
 msgid "The organisation that runs the remote server. It is very impoportant that this setting is filled out exactly as the organisation name set up in the bootstrap file of the remote instance."
@@ -11204,7 +11869,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:405
 msgid "Certificate File"
-msgstr ""
+msgstr "Файл сертификата"
 
 #: View/Pages/doc/using_the_system.ctp:405
 msgid "If the instance that you want to connect to has their entire own certificate chain, you can use this to import a .pem file with it and override CakePHP's standard root CA file."
@@ -11251,7 +11916,7 @@ msgid "Clicking the delete button will delete the link to the instance."
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:418
-#: View/Servers/index.ctp:92
+#: View/Servers/index.ctp:128
 msgid "Push all"
 msgstr ""
 
@@ -11260,7 +11925,7 @@ msgid " By clicking this button, all events that are eligible to be pushed on th
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:419
-#: View/Servers/index.ctp:89
+#: View/Servers/index.ctp:125
 msgid "Pull all"
 msgstr ""
 
@@ -11274,7 +11939,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:424
 msgid "Requests"
-msgstr ""
+msgstr "Запросы"
 
 #: View/Pages/doc/using_the_system.ctp:425
 msgid "Use any HTTP compliant library to perform requests."
@@ -11298,7 +11963,7 @@ msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:444
 msgid "HTTP format"
-msgstr ""
+msgstr "HTTP формат"
 
 #: View/Pages/doc/using_the_system.ctp:446
 msgid "Controller action invoked"
@@ -11404,154 +12069,173 @@ msgstr ""
 #: View/Roles/admin_add.ctp:20
 #: View/Roles/admin_edit.ctp:19
 msgid "Maximum execution time"
-msgstr ""
+msgstr "Максимальное время выполнения"
 
 #: View/Roles/index.ctp:36
 msgid "ok"
-msgstr ""
+msgstr "ок"
 
 #: View/Roles/index.ctp:36
 msgid "remove"
-msgstr ""
+msgstr "удалить"
 
-#: View/Roles/view.ctp:14
+#: View/Roles/view.ctp:5
 msgid "Permission level"
-msgstr ""
+msgstr "Уровень доступа"
 
 #: View/Servers/add.ctp:4
 msgid "Add Server"
-msgstr ""
+msgstr "Добавить сервер"
 
-#: View/Servers/add.ctp:10
-#: View/Servers/edit.ctp:10
+#: View/Servers/add.ctp:6
+#: View/Servers/edit.ctp:6
+msgid "Instance identification"
+msgstr "Идентификация инстанса"
+
+#: View/Servers/add.ctp:11
+#: View/Servers/edit.ctp:11
 msgid "Instance name"
-msgstr ""
+msgstr "Имя инстанса"
 
-#: View/Servers/add.ctp:16
+#: View/Servers/add.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change."
 msgstr ""
 
-#: View/Servers/add.ctp:19
-#: View/Servers/edit.ctp:19
+#: View/Servers/add.ctp:20
+#: View/Servers/edit.ctp:20
 msgid "Internal instance"
 msgstr ""
 
-#: View/Servers/add.ctp:29
+#: View/Servers/add.ctp:30
+#: View/Servers/edit.ctp:31
+msgid "Instance ownership and credentials"
+msgstr ""
+
+#: View/Servers/add.ctp:31
+#: View/Servers/edit.ctp:32
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr ""
 
-#: View/Servers/add.ctp:35
+#: View/Servers/add.ctp:37
 msgid "Remote Sync Organisation Type"
 msgstr ""
 
-#: View/Servers/add.ctp:40
-#: View/Servers/edit.ctp:37
+#: View/Servers/add.ctp:42
+#: View/Servers/edit.ctp:43
 msgid "External Organisation"
+msgstr "Внешняя организация"
+
+#: View/Servers/add.ctp:48
+msgid "Owner of remote instance"
 msgstr ""
 
-#: View/Servers/add.ctp:46
-#: View/Servers/edit.ctp:48
-msgid "Local Organisation"
-msgstr ""
-
-#: View/Servers/add.ctp:52
-#: View/Servers/edit.ctp:59
+#: View/Servers/add.ctp:54
+#: View/Servers/edit.ctp:65
 msgid "Remote Organisation's Name"
 msgstr ""
 
-#: View/Servers/add.ctp:56
-#: View/Servers/edit.ctp:63
+#: View/Servers/add.ctp:58
+#: View/Servers/edit.ctp:69
 msgid "Remote Organisation's Uuid"
 msgstr ""
 
-#: View/Servers/add.ctp:97
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:78
+msgid "Enabled synchronisation methods"
+msgstr ""
+
+#: View/Servers/add.ctp:86
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:103
+#: View/Servers/add.ctp:92
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:108
-#: View/Servers/edit.ctp:147
+#: View/Servers/add.ctp:97
+#: View/Servers/edit.ctp:142
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:109;115
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:98;104
+#: View/Servers/edit.ctp:143;149
 msgid "Events with the following tags allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:110;116
-#: View/Servers/edit.ctp:149;155
+#: View/Servers/add.ctp:99;105
+#: View/Servers/edit.ctp:144;150
 msgid "Events with the following tags blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:111;117
-#: View/Servers/edit.ctp:150;156
+#: View/Servers/add.ctp:100;106
+#: View/Servers/edit.ctp:145;151
 msgid "Events with the following organisations allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:112;118
-#: View/Servers/edit.ctp:151;157
+#: View/Servers/add.ctp:101;107
+#: View/Servers/edit.ctp:146;152
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:114
-#: View/Servers/edit.ctp:153
+#: View/Servers/add.ctp:103
+#: View/Servers/edit.ctp:148
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:142
-#: View/Servers/edit.ctp:184
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:179
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:148
+#: View/Servers/add.ctp:137
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:149
+#: View/Servers/add.ctp:138
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:150
+#: View/Servers/add.ctp:139
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr ""
 
-#: View/Servers/edit.ctp:16
+#: View/Servers/edit.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change. This also requires that the current instance's host organisation and the remote sync organisation are the same."
 msgstr ""
 
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:37
 msgid "Organisation Type"
+msgstr "Тип организации"
+
+#: View/Servers/edit.ctp:54
+msgid "Local Organisation"
 msgstr ""
 
-#: View/Servers/edit.ctp:69
+#: View/Servers/edit.ctp:75
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:104
+#: View/Servers/edit.ctp:99
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:112;134
+#: View/Servers/edit.ctp:107;129
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:113;135
+#: View/Servers/edit.ctp:108;130
 msgid "Remove certificate file"
-msgstr ""
+msgstr "Удалить файл сертификата"
 
-#: View/Servers/edit.ctp:126
+#: View/Servers/edit.ctp:121
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:193
+#: View/Servers/edit.ctp:188
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:250;254
+#: View/Servers/edit.ctp:245;249
 msgid "Not set."
 msgstr ""
 
@@ -11561,48 +12245,52 @@ msgstr ""
 
 #: View/Servers/filter_event_index.ctp:8
 msgid "Example:"
-msgstr ""
+msgstr "Образец:"
 
 #: View/Servers/filter_event_index.ctp:21
-msgid "Apply filters to the remote instance"
+msgid "Apply filters to the remote instance's index"
 msgstr ""
 
 #: View/Servers/index.ctp:2
 msgid "Servers"
-msgstr ""
+msgstr "Серверы"
 
 #: View/Servers/index.ctp:23
 msgid "Connection test"
-msgstr ""
+msgstr "Проверка подключения"
 
-#: View/Servers/index.ctp:30
+#: View/Servers/index.ctp:31
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Internal instance that ignores distribution level degradation *WARNING: Only use this setting if you have several internal instances and the sync link is to an internal extension of the current MISP community*"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:86
+#: View/Servers/index.ctp:122
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:88
+#: View/Servers/index.ctp:124
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
+#: View/Servers/index.ctp:131
+msgid "Cache instance"
+msgstr ""
+
 #: View/Servers/preview_event.ctp:7
 msgid "You are currently viewing an event on the remote instance %s "
 msgstr ""
@@ -11619,15 +12307,15 @@ msgstr ""
 msgid "You are currently viewing the event index of the remote instance %s"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "published"
-msgstr ""
+msgstr "опубликовано"
 
-#: View/Servers/preview_index.ctp:147
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr ""
 
@@ -11671,21 +12359,25 @@ msgstr ""
 msgid "No succeeded pushes"
 msgstr ""
 
-#: View/Servers/rest.ctp:7;17
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:54
+#: View/Servers/rest.ctp:116
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:55
+#: View/Servers/rest.ctp:117
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:56
+#: View/Servers/rest.ctp:118
 msgid "Headers"
-msgstr ""
+msgstr "Заголовки"
 
 #: View/Servers/server_settings.ctp:3
 msgid "Warning: app/Config/config.php is not writeable. This means that any setting changes made here will NOT be saved."
@@ -11697,12 +12389,16 @@ msgstr ""
 
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:2
 msgid "Select instances to add"
-msgstr ""
+msgstr "Выберите инстансы для добавления"
 
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:7
 msgid "Available Instances"
 msgstr ""
 
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
+msgid "Added Instances"
+msgstr "Инстансы добавлены"
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 msgid "Add servers to sharing group"
 msgstr ""
@@ -11750,41 +12446,33 @@ msgstr ""
 msgid "IDS Signature?"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:21
-msgid "Only list proposals of my organisation"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:21
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:26
-msgid "List all proposals"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:26
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
-msgstr ""
+msgstr "Все события"
 
-#: View/ShadowAttributes/index.ctp:33
+#: View/ShadowAttributes/index.ctp:43
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:39
+#: View/ShadowAttributes/index.ctp:49
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:45
+#: View/ShadowAttributes/index.ctp:55
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:71
+#: View/ShadowAttributes/index.ctp:81
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:73
+#: View/ShadowAttributes/index.ctp:83
 msgid "New Attribute"
-msgstr ""
+msgstr "Добавить новый атрибут"
 
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:7
 msgid "Are you sure you want to propose to delete Attribute #%s?"
@@ -11808,192 +12496,184 @@ msgstr ""
 
 #: View/SharingGroups/add.ctp:3
 msgid "New Sharing Group"
-msgstr ""
+msgstr "Новая группа распространения"
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
+msgid "General"
+msgstr "Главная"
+
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
 msgid "General tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
-msgid "General"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
 msgid "Organisations tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
+msgid "MISP Instances"
+msgstr "Экземпляры MISP"
+
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
 msgid "MISP instances tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
-msgid "MISP Instances"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
-msgid "Sharing group summary"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
-msgstr ""
+msgstr "Сводка и сохранение"
 
-#: View/SharingGroups/add.ctp:12
-#: View/SharingGroups/edit.ctp:12
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr "Сводка"
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
 msgid "Example: Multinational sharing group"
-msgstr ""
+msgstr "Пример: Международная Группа Распространения"
 
-#: View/SharingGroups/add.ctp:13
-#: View/SharingGroups/edit.ctp:13
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
 msgid "Releasable to"
-msgstr ""
+msgstr "Адресаты"
 
-#: View/SharingGroups/add.ctp:14
-#: View/SharingGroups/edit.ctp:14
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
 msgid "Example: Community1, Organisation1, Organisation2"
-msgstr ""
+msgstr "Пример: Сообщество1, Организация1, Организация2"
 
-#: View/SharingGroups/add.ctp:16
-#: View/SharingGroups/edit.ctp:16
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
 msgid "A description of the sharing group."
-msgstr ""
+msgstr "Описание группы распространения"
 
-#: View/SharingGroups/add.ctp:18
-#: View/SharingGroups/edit.ctp:18
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
 msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:19
-#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
 msgid "Make the sharing group selectable (active)"
-msgstr ""
+msgstr "Сделать группы распространения активной"
 
-#: View/SharingGroups/add.ctp:21;38;59
-#: View/SharingGroups/edit.ctp:21;38;67
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
 msgid "Next page"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
-msgid "Add local organisation(s) to the sharing group"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
-msgid "Add local organisation"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
-msgid "Add remote organisations to the sharing group"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
-msgid "Add remote organisation"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:33
-#: View/SharingGroups/edit.ctp:33
-#: View/SharingGroups/view.ctp:44
-msgid "Extend"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:37;58;74
-#: View/SharingGroups/edit.ctp:37;66;82
-msgid "Previous page"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:42
-#: View/SharingGroups/edit.ctp:50
-msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
-msgstr ""
-
-#: View/SharingGroups/add.ctp:43
-#: View/SharingGroups/edit.ctp:51
-msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
-msgstr ""
-
-#: View/SharingGroups/add.ctp:47
-#: View/SharingGroups/edit.ctp:55
-msgid "Add instance"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:53
-#: View/SharingGroups/edit.ctp:61
-#: View/SharingGroups/view.ctp:69
-msgid "All orgs"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:63
-msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
-msgstr ""
-
-#: View/SharingGroups/add.ctp:64
-msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
-msgstr ""
+msgstr "Следующая страница"
 
 #: View/SharingGroups/add.ctp:65
-msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
-msgstr ""
+#: View/SharingGroups/edit.ctp:65
+msgid "Add local organisation(s) to the sharing group"
+msgstr "Добавить локальную организацию в группу распространения"
+
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
+msgid "Add local organisation"
+msgstr "Добавить локальную организацию"
 
 #: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
+msgid "Add remote organisations to the sharing group"
+msgstr "Добавить стороннюю организацию в группу распространения"
+
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
+msgid "Add remote organisation"
+msgstr "Добавить стороннюю организацию"
+
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
+#: View/SharingGroups/view.ctp:44
+msgid "Extend"
+msgstr "Расширяемая"
+
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
+msgid "Previous page"
+msgstr "Предыдущая страница"
+
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
+msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
+msgstr "Включить режим передачи для группы распространения. Режим передачи позволяет передавать события всем экземплярам MISP при условии наличия организации в списке организаций группы распространения."
+
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
+msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
+msgstr "<b>Включить режим передачи</b> для группы распространения (передача событий всем соединенным экземплярам MISP при условии наличия организации в списке организаций группы распространения)"
+
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
+msgid "Add instance"
+msgstr "Добавить экземпляр"
+
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
+#: View/SharingGroups/view.ctp:69
+msgid "All orgs"
+msgstr "Все организации"
+
+#: View/SharingGroups/add.ctp:103
+msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
+msgstr "<span class=\"bold\">Главное: </span>Вы собираетесь создать <span id=\"summarytitle\" class=\"red bold\"></span> группу распространения для следующих адресатов <span id=\"summaryreleasable\" class=\"red bold\"></span>."
+
+#: View/SharingGroups/add.ctp:104
+msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
+msgstr "Локальные организации: </span>Будет доступна для <span id=\"summarylocal\" class=\"red bold\"></span>, из которых <span id=\"summarylocalextend\" class=\"red bold\"></span> имеют право расширять группу распространения."
+
+#: View/SharingGroups/add.ctp:105
+msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
+msgstr "Сторонние организации: </span>Также будет доступна для <span id=\"summaryexternal\" class=\"red bold\"></span>, из которых <span id=\"summaryexternalextend\" class=\"red bold\"></span> имеют право расширять группу распространения."
+
+#: View/SharingGroups/add.ctp:106
 msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
-msgstr ""
+msgstr "<span class=\"bold\">Синхронизация: </span>События автоматически передаются в: <span id=\"summaryservers\" class=\"red bold\"></span>"
 
-#: View/SharingGroups/add.ctp:67
-#: View/SharingGroups/edit.ctp:75
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
 msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
-msgstr ""
+msgstr "Чтобы создать группу распространения нажмите кнопку Подтвердить. Чтобы изменить данную информацию перейдите на предыдущие страницы."
 
-#: View/SharingGroups/add.ctp:75
-#: View/SharingGroups/edit.ctp:83
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
 msgid "Submit and create sharing group"
-msgstr ""
+msgstr "Подтвердить и создать группу распространения"
 
-#: View/SharingGroups/add.ctp:95
+#: View/SharingGroups/add.ctp:135
 msgid "Local instance"
-msgstr ""
+msgstr "Локальный экземпляр"
 
-#: View/SharingGroups/edit.ctp:71
+#: View/SharingGroups/edit.ctp:111
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
 "                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
 "                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:74
+#: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
 #: View/SharingGroups/index.ctp:2
 msgid "Sharing Groups"
-msgstr ""
+msgstr "Группы распространения"
 
-#: View/SharingGroups/index.ctp:20
-msgid "View only active sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:20
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
-msgstr ""
+msgstr "Активные группы распространения"
 
-#: View/SharingGroups/index.ctp:21
-msgid "View only passive sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:21
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
-msgstr ""
+msgstr "Пассивные группы распространения"
 
-#: View/SharingGroups/index.ctp:61
+#: View/SharingGroups/index.ctp:80
 msgid "Distribution List"
 msgstr ""
 
@@ -12007,7 +12687,7 @@ msgstr ""
 
 #: View/SharingGroups/view.ctp:68
 msgid "Url"
-msgstr ""
+msgstr "Url"
 
 #: View/Sightings/ajax/add_sighting.ctp:11
 msgid "honeypot, IDS sensor id, SIEM,…"
@@ -12031,12 +12711,24 @@ msgstr ""
 
 #: View/Sightings/ajax/list_sightings.ctp:10
 msgid "Attribute ID"
-msgstr ""
+msgstr "ID атрибута"
 
 #: View/Sightings/ajax/list_sightings.ctp:35
 msgid "Delete sighting"
 msgstr ""
 
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
+msgid "Add Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
+msgstr ""
+
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
 msgid "Remove Sighting"
 msgstr ""
@@ -12049,6 +12741,26 @@ msgstr ""
 msgid "Remove sighting"
 msgstr ""
 
+#: View/TagCollections/add.ctp:8
+msgid "Edit Tag Collection"
+msgstr ""
+
+#: View/TagCollections/add.ctp:16
+msgid "Visible to all orgs"
+msgstr ""
+
+#: View/TagCollections/import.ctp:4
+msgid "Paste tag collection data"
+msgstr ""
+
+#: View/TagCollections/import.ctp:5
+msgid "Paste a MISP tag collection JSON below to add tag collections."
+msgstr ""
+
+#: View/TagCollections/import.ctp:10
+msgid "Tag collection JSON"
+msgstr ""
+
 #: View/Tags/add.ctp:12
 #: View/Tags/edit.ctp:12
 msgid "Restrict tagging to org"
@@ -12059,6 +12771,10 @@ msgstr ""
 msgid "Restrict tagging to user"
 msgstr ""
 
+#: View/Tags/edit.ctp:31
+msgid "Unselectable Tag"
+msgstr ""
+
 #: View/Tags/index.ctp:10
 msgid "Your Favourite Tags"
 msgstr ""
@@ -12077,7 +12793,7 @@ msgstr ""
 
 #: View/Tags/index.ctp:70
 msgid "Taxonomy"
-msgstr ""
+msgstr "Таксономия"
 
 #: View/Tags/index.ctp:71
 msgid "Tagged events"
@@ -12091,57 +12807,6 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:2
-msgid "Select Tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:16
-#: View/Tags/ajax/taxonomy_choice.ctp:4
-msgid "search tags…"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:25
-msgid "Attach tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Return to taxonomy selection"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Select Taxonomy"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Back to Taxonomy Selection"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:2
-msgid "Select Tag Source"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:10
-msgid "Favourite Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:14
-msgid "Custom Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:17
-msgid "All Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:21
-#: View/Taxonomies/view.ctp:2
-msgid "Taxonomy Library"
-msgstr ""
-
 #: View/Tasks/index.ctp:4
 msgid "Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks."
 msgstr ""
@@ -12156,7 +12821,7 @@ msgstr ""
 
 #: View/Tasks/index.ctp:96
 msgid "Update all"
-msgstr ""
+msgstr "Обновить всё"
 
 #: View/Taxonomies/index.ctp:2
 msgid "Taxonomies"
@@ -12168,7 +12833,7 @@ msgstr ""
 
 #: View/Taxonomies/index.ctp:36
 msgid "enable all"
-msgstr ""
+msgstr "включить все"
 
 #: View/Taxonomies/index.ctp:36
 msgid "Enable all tags"
@@ -12179,9 +12844,10 @@ msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:41
-#: View/Taxonomies/view.ctp:29;143
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
 msgid "Disable"
-msgstr ""
+msgstr "Отключить"
 
 #: View/Taxonomies/index.ctp:41
 #: View/Taxonomies/view.ctp:29
@@ -12189,9 +12855,10 @@ msgid "Are you sure you want to disable this taxonomy library?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:31;147
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
 msgid "Enable"
-msgstr ""
+msgstr "Включить"
 
 #: View/Taxonomies/index.ctp:43
 #: View/Taxonomies/view.ctp:31
@@ -12206,19 +12873,27 @@ msgstr ""
 msgid "Create and/or update selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:116
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
 msgid "Hidden"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:125
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:142
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
-msgstr ""
+msgstr "Обновить"
 
-#: View/Taxonomies/view.ctp:147
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr ""
 
@@ -12232,7 +12907,7 @@ msgstr ""
 
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:13
 msgid "Create Tags"
-msgstr ""
+msgstr "Создать теги"
 
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:15
 msgid "Are you sure you want to create / update all selected tags?"
@@ -12246,13 +12921,37 @@ msgstr ""
 msgid "Create / update all taxonomy entries as tags"
 msgstr ""
 
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
 #: View/TemplateElements/ajax/ajaxIndex.ctp:2
 msgid "Template Elements"
-msgstr ""
+msgstr "Шаблон элементов"
 
 #: View/TemplateElements/ajax/ajaxIndex.ctp:11
 msgid "Add a new template element"
-msgstr ""
+msgstr "Добавить новый шаблон элемента"
 
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:5
 msgid "Template Element Deletion"
@@ -12270,11 +12969,11 @@ msgstr ""
 #: View/TemplateElements/ajax/template_element_add_file.ctp:29
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:29
 msgid "Select Category"
-msgstr ""
+msgstr "Выберите категорию"
 
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:37
 msgid "Select Type"
-msgstr ""
+msgstr "Выберите тип"
 
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:43
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:42
@@ -12382,11 +13081,11 @@ msgstr ""
 
 #: View/Templates/add.ctp:49
 msgid "Create"
-msgstr ""
+msgstr "Создать"
 
 #: View/Templates/index.ctp:2
 msgid "Templates"
-msgstr ""
+msgstr "Шаблоны"
 
 #: View/Templates/index.ctp:45
 msgid "Are you sure you want to delete Template #"
@@ -12410,11 +13109,11 @@ msgstr ""
 
 #: View/Templates/upload_file.ctp:8
 msgid "Replace File"
-msgstr ""
+msgstr "Заменить файл"
 
 #: View/Templates/upload_file.ctp:10
 msgid "Upload File"
-msgstr ""
+msgstr "Загрузить файл"
 
 #: View/Templates/view.ctp:38
 msgid "Shareable"
@@ -12439,15 +13138,15 @@ msgstr ""
 #: View/Users/admin_add.ctp:32
 #: View/Users/admin_edit.ctp:32
 msgid "Set password"
-msgstr ""
+msgstr "Установить пароль"
 
 #: View/Users/admin_add.ctp:37
 msgid "Length"
-msgstr ""
+msgstr "Длина"
 
 #: View/Users/admin_add.ctp:38
 msgid "Complexity"
-msgstr ""
+msgstr "Сложность"
 
 #: View/Users/admin_add.ctp:52
 msgid "Choose organisation"
@@ -12498,6 +13197,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
 msgid "Terms accepted"
 msgstr ""
 
@@ -12509,11 +13210,11 @@ msgstr ""
 #: View/Users/change_pw.ctp:18
 #: View/Users/edit.ctp:36
 msgid "Confirm with your current password"
-msgstr ""
+msgstr "Введите актуальный пароль"
 
 #: View/Users/admin_email.ctp:2
 msgid "Contact User(s)"
-msgstr ""
+msgstr "Связаться с пользователем"
 
 #: View/Users/admin_email.ctp:6
 msgid "Messaging - here's a quick guide on how this feature works"
@@ -12554,7 +13255,7 @@ msgstr ""
 
 #: View/Users/admin_email.ctp:18
 msgid "Reset password"
-msgstr ""
+msgstr "Сбросить пароль"
 
 #: View/Users/admin_email.ctp:19
 msgid "A single user"
@@ -12562,19 +13263,23 @@ msgstr ""
 
 #: View/Users/admin_email.ctp:19
 msgid "All users"
+msgstr "Все пользователи"
+
+#: View/Users/admin_email.ctp:19
+msgid "All users of the same organisation"
 msgstr ""
 
-#: View/Users/admin_email.ctp:36
+#: View/Users/admin_email.ctp:39
 msgid "Enter a custom message"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "New user registration"
-msgstr ""
+msgstr "Регистрация нового пользователя"
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "Password reset"
-msgstr ""
+msgstr "Сброс пароля"
 
 #: View/Users/admin_filter_user_index.ctp:4
 msgid "Filter User Index"
@@ -12582,11 +13287,11 @@ msgstr ""
 
 #: View/Users/admin_filter_user_index.ctp:81
 msgid "Remove filter"
-msgstr ""
+msgstr "Удалить фильтр"
 
 #: View/Users/admin_filter_user_index.ctp:106
 msgid "Apply filters"
-msgstr ""
+msgstr "Применить фильтры"
 
 #: View/Users/admin_index.ctp:2
 #: View/Users/statistics.ctp:25
@@ -12594,11 +13299,7 @@ msgstr ""
 #: View/Users/statistics_orgs.ctp:32
 #: View/Users/ajax/admin_index.ctp:3
 msgid "Users"
-msgstr ""
-
-#: View/Users/admin_index.ctp:40
-msgid "Filter user index"
-msgstr ""
+msgstr "Пользователи"
 
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
@@ -12606,51 +13307,57 @@ msgstr ""
 
 #: View/Users/admin_quick_email.ctp:4
 msgid "WARNING: This user does not have an encryption key set. The security posture of this instance allows for the sending of clear-text e-mails, so this is what will happen if you proceed."
-msgstr ""
+msgstr "ВНИМАНИЕ: У данного пользователя отсутствует ключ шифрования. "
 
 #: View/Users/admin_quick_email.ctp:7
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
-msgstr ""
+msgstr "Обнаружен %s ключ, письма будут зашифрованы на данном ключе."
 
-#: View/Users/admin_view.ctp:35
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
 msgid "Contactalert"
 msgstr ""
 
-#: View/Users/admin_view.ctp:46
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr "Запрос API доступа"
+
+#: View/Users/admin_view.ctp:44
 msgid "Invited By"
 msgstr ""
 
-#: View/Users/admin_view.ctp:51
-msgid "Org admin"
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:74
-#: View/Users/view.ctp:67
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr "Смена пароля"
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:80
-#: View/Users/view.ctp:73
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
 msgid "GnuPG status"
-msgstr ""
+msgstr "Статус GnuPG"
 
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:83
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
 msgid "SMIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:95
-msgid "Nids Sid"
-msgstr ""
-
-#: View/Users/admin_view.ctp:110
-msgid "Password change"
-msgstr ""
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
-msgstr ""
+msgstr "Неудачный GnuPGs?"
 
 #: View/Users/check_and_correct_pgps.ctp:4
 msgid "No failed composites"
@@ -12662,7 +13369,7 @@ msgstr ""
 
 #: View/Users/login.ctp:37;44
 msgid "Login"
-msgstr ""
+msgstr "Вход"
 
 #: View/Users/statistics.ctp:8
 #: View/Users/statistics_data.ctp:11
@@ -12680,37 +13387,37 @@ msgid "Proposals active"
 msgstr ""
 
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:34
+#: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
 msgstr ""
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:39
+#: View/Users/statistics_data.ctp:45
 msgid "Discussion posts"
 msgstr ""
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:48
+#: View/Users/statistics_data.ctp:54
 msgid "A heatmap showing user activity for each day during this month and the 4 months that preceded it. Use the buttons below to only show the heatmap of a specific organisation."
 msgstr ""
 
 #: View/Users/statistics.ctp:60
-#: View/Users/statistics_data.ctp:65
+#: View/Users/statistics_data.ctp:71
 msgid "Go left"
 msgstr ""
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:71
+#: View/Users/statistics_data.ctp:77
 msgid "Go right"
 msgstr ""
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:118
+#: View/Users/statistics_data.ctp:124
 msgid "The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings."
 msgstr ""
 
 #: View/Users/statistics.ctp:117
-#: View/Users/statistics_data.ctp:122
+#: View/Users/statistics_data.ctp:128
 msgid "The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer."
 msgstr ""
 
@@ -12718,6 +13425,18 @@ msgstr ""
 msgid "A heatmap showing the usage of ATT&CK Tactic."
 msgstr ""
 
+#: View/Users/statistics_data.ctp:32
+msgid "Users with PGP keys"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:36
+msgid "Local Organisations"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:38
+msgid "Average Users / Org"
+msgstr ""
+
 #: View/Users/statistics_orgs.ctp:17
 msgid "Organisation list"
 msgstr ""
@@ -12732,7 +13451,7 @@ msgstr ""
 
 #: View/Users/statistics_orgs.ctp:36
 msgid "Sector"
-msgstr ""
+msgstr "Сектор"
 
 #: View/Users/statistics_sightings.ctp:6
 msgid "A toplist of the top sources for the sightings of your organisation."
@@ -12776,22 +13495,22 @@ msgstr ""
 
 #: View/Users/terms.ctp:27
 msgid "Accept Terms"
-msgstr ""
+msgstr "Принять условия"
 
 #: View/Users/verify_certificate.ctp:2
 msgid "Certificates validation"
-msgstr ""
+msgstr "Проверка сертификатов"
 
 #: View/Users/verify_g_p_g.ctp:2
 msgid "GnuPG key validation"
-msgstr ""
+msgstr "Проверка ключа GnuPG"
 
-#: View/Users/view.ctp:45
-msgid "Request API access"
-msgstr ""
+#: View/Users/ajax/emailConfirmTemplate.ctp:2
+msgid "Confirm sending"
+msgstr "Подтвердите отправку"
 
-#: View/Users/view.ctp:50
-msgid "NIDS Start SID"
+#: View/Users/ajax/emailConfirmTemplate.ctp:4
+msgid "You are about to send a mail to %s recipient(s)?"
 msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:2
@@ -12800,11 +13519,11 @@ msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:6
 msgid "Key ID"
-msgstr ""
+msgstr "Идентификатор ключа"
 
 #: View/Users/ajax/fetchpgpkey.ctp:7
 msgid "Creation date"
-msgstr ""
+msgstr "Дата создания"
 
 #: View/Users/ajax/fetchpgpkey.ctp:8
 msgid "Associated E-mail addresses"
@@ -12812,7 +13531,7 @@ msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:12
 msgid "Select GnuPG key"
-msgstr ""
+msgstr "Выберите ключ GnuPG"
 
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:3
 msgid "WARNING: This user does not have an encryption key set. The security posture of this instance allows for the sending of clear text e-mails, so this is what will happen if you proceed."
@@ -12854,7 +13573,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:29
+#: View/Warninglists/view.ctp:14;16
 msgid "Accepted attribute types"
 msgstr ""
 
@@ -12930,6 +13649,7 @@ msgstr ""
 #: Model/Attribute.php:validation for field uuid
 #: Model/Event.php:validation for field uuid;validation for field extends_uuid
 #: Model/EventBlacklist.php:validation for field event_uuid
+#: Model/MispObject.php:validation for field uuid
 #: Model/OrgBlacklist.php:validation for field org_uuid
 #: Model/Organisation.php:validation for field uuid
 #: Model/ShadowAttribute.php:validation for field uuid
@@ -12938,6 +13658,7 @@ msgid "Please provide a valid UUID"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/MispObject.php:validation for field uuid
 msgid "The UUID provided is not unique"
 msgstr ""
 
@@ -12957,6 +13678,7 @@ msgstr ""
 #: Model/ServerTag.php:validation for field server_id;validation for field tag_id
 #: Model/SharingGroup.php:validation for field name
 #: Model/Tag.php:validation for field name;validation for field colour
+#: Model/TagCollection.php:validation for field name
 #: Model/TemplateElementAttribute.php:validation for field name;validation for field description
 #: Model/ThreatLevel.php:validation for field name;validation for field description;validation for field form_description
 #: Model/User.php:validation for field org_id;validation for field authkey
@@ -13005,7 +13727,7 @@ msgstr ""
 #: Model/WarninglistEntry.php:validation for field value
 #: Model/WarninglistType.php:validation for field type
 msgid "rule"
-msgstr ""
+msgstr "правило"
 
 #: Model/Feed.php:validation for field event_id
 msgid "Please enter a numeric event ID or leave this field blank."
@@ -13017,7 +13739,7 @@ msgstr ""
 
 #: Model/ObjectRelationship.php:validation for field name
 msgid "A relationship with this name already exists."
-msgstr ""
+msgstr "Связь с таким именем уже существует."
 
 #: Model/OrgBlacklist.php:validation for field org_uuid
 msgid "Organisation already blacklisted."
@@ -13037,7 +13759,7 @@ msgstr ""
 
 #: Model/Role.php:validation for field name
 msgid "A role with this name already exists."
-msgstr ""
+msgstr "Роль с таким именем уже существует."
 
 #: Model/Server.php:validation for field url
 msgid "Please enter a valid base-url."
@@ -13053,9 +13775,10 @@ msgstr ""
 
 #: Model/Tag.php:validation for field name
 msgid "This field is required."
-msgstr ""
+msgstr "Это поле обязательное."
 
 #: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
 #: Model/Whitelist.php:validation for field name
 msgid "A similar name already exists."
 msgstr ""
@@ -13067,20 +13790,20 @@ msgstr ""
 #: Model/TemplateElementAttribute.php:validation for field category
 #: Model/TemplateElementFile.php:validation for field category
 msgid "Please choose a category."
-msgstr ""
+msgstr "Пожалуйста, выберите категорию."
 
 #: Model/TemplateElementAttribute.php:validation for field type
 msgid "Please choose a type."
-msgstr ""
+msgstr "Пожалуйста, выберите тип."
 
 #: Model/TemplateElementFile.php:validation for field name
 #: Model/TemplateElementText.php:validation for field name
 msgid "Please enter a Name"
-msgstr ""
+msgstr "Пожалуйста, введите имя"
 
 #: Model/TemplateElementFile.php:validation for field description
 msgid "Please enter a Description"
-msgstr ""
+msgstr "Пожалуйста, введите описание"
 
 #: Model/TemplateElementText.php:validation for field text
 msgid "Please fill out the text field"
@@ -13092,11 +13815,11 @@ msgstr ""
 
 #: Model/User.php:validation for field password
 msgid "Password complexity requirement not met."
-msgstr ""
+msgstr "Требование сложности пароля не выполнено."
 
 #: Model/User.php:validation for field password
 msgid "Please re-enter your password twice so that the values match."
-msgstr ""
+msgstr "Пожалуйста, введите ваш пароль дважды, чтобы значения совпадали."
 
 #: Model/User.php:validation for field org_id
 msgid "The organisation ID has to be a numeric value."
@@ -13104,11 +13827,11 @@ msgstr ""
 
 #: Model/User.php:validation for field email
 msgid "Please enter a valid email address."
-msgstr ""
+msgstr "Введите действительный адрес электронной почты."
 
 #: Model/User.php:validation for field email
 msgid "An account with this email address already exists."
-msgstr ""
+msgstr "Учетная запись с таким адресом электронной почты уже существует."
 
 #: Model/User.php:validation for field authkey
 msgid "A authkey of a minimum length of 40 is required."
@@ -13116,7 +13839,7 @@ msgstr ""
 
 #: Model/User.php:validation for field gpgkey
 msgid "GnuPG key not valid, please enter a valid key."
-msgstr ""
+msgstr "GnuPG ключ недействителен, пожалуйста, введите действительный ключ."
 
 #: Model/User.php:validation for field certif_public
 msgid "Certificate not valid, please enter a valid certificate (x509)."
diff --git a/app/Locale/spa/LC_MESSAGES/default.po b/app/Locale/spa/LC_MESSAGES/default.po
index f6bfde74f..7167ae373 100644
--- a/app/Locale/spa/LC_MESSAGES/default.po
+++ b/app/Locale/spa/LC_MESSAGES/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-01-22 21:27\n"
+"PO-Revision-Date: 2019-03-06 02:08\n"
 "Last-Translator: SteveClement <steve@localhost.lu>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -15,272 +15,285 @@ msgstr ""
 "Language: es_ES\n"
 
 #: Console/Command/EventShell.php:13
-#: Controller/AttributesController.php:149;153;157
+#: Controller/AttributesController.php:125;129;133
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1001;1348;1352;1356;1385;1800;1876;1880;1884;2102;2166;2248;2903;5264;5429;5433;5442
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
 #: Controller/PostsController.php:56
+#: Model/Galaxy.php:292
 msgid "Invalid event"
 msgstr "Evento invalido"
 
-#: Controller/AppController.php:607
+#: Console/Command/ServerShell.php:49
+#: Controller/ServersController.php:632
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+msgstr ""
+
+#: Console/Command/ServerShell.php:51
+msgid "ERROR: %s"
+msgstr ""
+
+#: Controller/AppController.php:383
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr ""
+
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
+msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+msgstr "Esta clave de autenticación no está autorizada para ser utilizada para realizar exportaciones. Póngase en contacto con su administrador."
+
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
+msgid "You have to be logged in to do that."
+msgstr "Tienes que iniciar sesión para realizar esta acción."
+
+#: Controller/AppController.php:627
+msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
+msgstr ""
+
+#: Controller/AppController.php:752
 msgid "All done. attribute_count generated from scratch for "
 msgstr "Todo listo. attribute_count generó desde cero para "
 
-#: Controller/AppController.php:726
-#: Controller/AttributesController.php:2668
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
 #: Controller/ShadowAttributesController.php:1276
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "Trabajo en la cola. Puedes ver el progreso si navega a la vista de trabajos activos (administración -> empleos)."
 
-#: Controller/AttributesController.php:140;1392
+#: Controller/AttributesController.php:116;1403
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "ID de evento no establecido."
 
-#: Controller/AttributesController.php:143
+#: Controller/AttributesController.php:119
 msgid "You don't have permissions to create attributes"
 msgstr "No tienes permisos para crear atributos"
 
-#: Controller/AttributesController.php:163;489;666
+#: Controller/AttributesController.php:139;488;668
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1684;1705;1739
-#: Controller/ObjectsController.php:442
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
 msgid "You do not have permission to do that."
 msgstr "No dispones de permisos para realizar esta acción."
 
-#: Controller/AttributesController.php:414;864;869;873;1072;1152;2684;2698;2731;2753;2762;3309;3313;3409;3413
-#: Controller/ShadowAttributesController.php:824;1067;1091;1124;1134
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
 #: Controller/TagsController.php:491
 msgid "Invalid attribute"
 msgstr "Atributo inválido"
 
-#: Controller/AttributesController.php:424
-#: Controller/ShadowAttributesController.php:500
+#: Controller/AttributesController.php:421
+#: Controller/ShadowAttributesController.php:499
 msgid "You do not have the permission to view this event."
 msgstr "No dispones de permisos para visualizar este evento."
 
-#: Controller/AttributesController.php:472
+#: Controller/AttributesController.php:468
 msgid "Attribute not an attachment or malware-sample"
 msgstr "Atributo no un accesorio o muestra de malware"
 
-#: Controller/AttributesController.php:504;677
-#: Controller/ShadowAttributesController.php:548
-msgid "PHP says file was not uploaded. Are you attacking me?"
-msgstr "PHP dice que el archivo no fue subido. ¿Estás tratando de atacarme?"
-
-#: Controller/AttributesController.php:680
-#: Controller/ShadowAttributesController.php:551;561
-msgid "There was a problem to upload the file."
-msgstr "Hubo un problema al cargar el archivo."
-
-#: Controller/AttributesController.php:824
-msgid "The ThreatConnect data has been imported."
-msgstr "Se ha importado los datos de ThreatConnect."
-
-#: Controller/AttributesController.php:827
-msgid "%s entries imported."
-msgstr "%s entradas importadas."
-
-#: Controller/AttributesController.php:831
-msgid "%s entries could not be imported."
-msgstr "no se pudieran importar %s entradas."
-
-#: Controller/AttributesController.php:881;924;926
-#: Controller/ShadowAttributesController.php:831
-msgid "Invalid attribute."
-msgstr "Atributo inválido."
-
-#: Controller/AttributesController.php:920
-msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
-msgstr "El atributo no se pudo guardar: El atributo de la solicitud no es mas nuevo que la copia local."
-
-#: Controller/AttributesController.php:936;1401
-#: Controller/EventsController.php:4635;4648;5213;5227
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
 msgid "Invalid Event."
 msgstr "Evento inválido."
 
-#: Controller/AttributesController.php:953
+#: Controller/AttributesController.php:503;679
+#: Controller/ShadowAttributesController.php:546
+msgid "PHP says file was not uploaded. Are you attacking me?"
+msgstr "PHP dice que el archivo no fue subido. ¿Estás tratando de atacarme?"
+
+#: Controller/AttributesController.php:682
+#: Controller/ShadowAttributesController.php:549;559
+msgid "There was a problem to upload the file."
+msgstr "Hubo un problema al cargar el archivo."
+
+#: Controller/AttributesController.php:826
+msgid "The ThreatConnect data has been imported."
+msgstr "Se ha importado los datos de ThreatConnect."
+
+#: Controller/AttributesController.php:829
+msgid "%s entries imported."
+msgstr "%s entradas importadas."
+
+#: Controller/AttributesController.php:833
+msgid "%s entries could not be imported."
+msgstr "no se pudieran importar %s entradas."
+
+#: Controller/AttributesController.php:883;931;933
+#: Controller/ShadowAttributesController.php:829
+msgid "Invalid attribute."
+msgstr "Atributo inválido."
+
+#: Controller/AttributesController.php:927
+msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
+msgstr "El atributo no se pudo guardar: El atributo de la solicitud no es mas nuevo que la copia local."
+
+#: Controller/AttributesController.php:960
 msgid "The attribute has been saved"
 msgstr "El atributo ha sido guardado"
 
-#: Controller/AttributesController.php:985
+#: Controller/AttributesController.php:995
 msgid "The attribute could not be saved. Please, try again."
 msgstr "El atributo no pudo ser guardado. Por favor, inténtelo de nuevo."
 
-#: Controller/AttributesController.php:1076
+#: Controller/AttributesController.php:1087
 msgid "Invalid event id."
 msgstr "El id del evento no es válido."
 
-#: Controller/AttributesController.php:1106
-#: Controller/EventsController.php:2023
-#: Controller/ShadowAttributesController.php:731
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
+#: Controller/ShadowAttributesController.php:729
 msgid "Invalid input."
 msgstr "Entrada no válida."
 
-#: Controller/AttributesController.php:1111
+#: Controller/AttributesController.php:1122
 msgid "Invalid field."
 msgstr "Campo inválido."
 
-#: Controller/AttributesController.php:1156
+#: Controller/AttributesController.php:1167
 msgid "Invalid attribute id."
 msgstr "El id del atributo no es válido."
 
-#: Controller/AttributesController.php:1231;1241
+#: Controller/AttributesController.php:1242;1252
 msgid "Attribute deleted"
 msgstr "Atributo eliminado"
 
-#: Controller/AttributesController.php:1236;1238
+#: Controller/AttributesController.php:1247;1249
 msgid "Attribute was not deleted"
 msgstr "El atributo no fue eliminado"
 
-#: Controller/AttributesController.php:1263;3155
-#: Controller/ShadowAttributesController.php:864
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
 msgid "Invalid Attribute"
 msgstr "Atributo Inválido"
 
-#: Controller/AttributesController.php:1290
+#: Controller/AttributesController.php:1301
 msgid "Could not restore the attribute"
 msgstr "No se pudo restaurar el atributo"
 
-#: Controller/AttributesController.php:1311;1318;1322
+#: Controller/AttributesController.php:1322;1329;1333
 msgid "Attribute not found or not authorised."
 msgstr "Atributo no encontrado o no autorizado."
 
-#: Controller/AttributesController.php:1372
+#: Controller/AttributesController.php:1383
 msgid "This function is only accessible via POST requests."
 msgstr "Esta función solo se puede acceder a través de solicitudes POST."
 
-#: Controller/AttributesController.php:1427
+#: Controller/AttributesController.php:1438
 msgid "No matching attributes found."
 msgstr "No se encontraron atributos que coincidan."
 
-#: Controller/AttributesController.php:1461
+#: Controller/AttributesController.php:1472
 msgid "This method can only be accessed via AJAX."
 msgstr "Solo se puede acceder a este método a través de AJAX."
 
-#: Controller/AttributesController.php:1472
+#: Controller/AttributesController.php:1482
 msgid "You are not authorized to edit this event."
 msgstr "No estás autorizado para editar este evento."
 
-#: Controller/AttributesController.php:1537
+#: Controller/AttributesController.php:1580
 msgid "No event ID provided."
 msgstr "No se proporcionó el ID del evento."
 
-#: Controller/AttributesController.php:1640
-msgid "Invalid tag"
-msgstr "Etiqueta no válida"
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
+msgid "Synonyms: "
+msgstr ""
 
-#: Controller/AttributesController.php:2107;2282;2391;2441;2524;2610
-#: Controller/EventsController.php:2484;2600;2662;2720;3079;3301;3993;4011
-msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
-msgstr "Esta clave de autenticación no está autorizada para ser utilizada para realizar exportaciones. Póngase en contacto con su administrador."
-
-#: Controller/AttributesController.php:2112;2277;2384
-#: Controller/EventsController.php:3084
+#: Controller/AttributesController.php:1997;2104
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr "Usted no está autorizado. Envíe la cabecera de \"Authorization\" con su clave de autenticación junto con un encabezado \"Accept\" para \"application / xml\"."
 
-#: Controller/AttributesController.php:2123
-msgid "Content type and parameter mismatch. Expecting JSON."
-msgstr "Tipo de contenido y parámetros incompatible. Se espera JSON."
-
-#: Controller/AttributesController.php:2128
-msgid "Content type and parameter mismatch. Expecting XML."
-msgstr "Tipo de contenido y parámetros incompatible. Se espera XML."
-
-#: Controller/AttributesController.php:2132;2290
+#: Controller/AttributesController.php:2010
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
 msgstr "Especifique los términos de búsqueda en la url o envíe un POST \"json array / xml\" (con el elemento raíz como \"solicitud\" y especifique los encabezados de aceptación y tipo de contenido correctos)."
 
-#: Controller/AttributesController.php:2310
+#: Controller/AttributesController.php:2030
 msgid "You don't have access to that event."
 msgstr "No tienes acceso a ese evento."
 
-#: Controller/AttributesController.php:2373
+#: Controller/AttributesController.php:2093
 msgid "No matches."
 msgstr "Ninguna coincidencia."
 
-#: Controller/AttributesController.php:2395;2404
+#: Controller/AttributesController.php:2115;2124
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "Atributo inválido o sin autorización para visualizarlo."
 
-#: Controller/AttributesController.php:2445;2528;2614
-#: Controller/EventsController.php:2488;2605;2667;2724;3305;3997;4015
-msgid "You have to be logged in to do that."
-msgstr "Tienes que iniciar sesión para realizar esta acción."
-
-#: Controller/AttributesController.php:2472
+#: Controller/AttributesController.php:2192
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
 msgstr "Especifique los términos de búsqueda en la url o envíe un POST \"json array / xml\" (con el elemento raíz como \"solicitud\" y especifique los encabezados correctos según el tipo de contenido."
 
-#: Controller/AttributesController.php:2536
+#: Controller/AttributesController.php:2256
 msgid "Invalid event ID format."
 msgstr "Formato de ID de evento inválido."
 
-#: Controller/AttributesController.php:2645
+#: Controller/AttributesController.php:2365
 #: Controller/ShadowAttributesController.php:1254
 msgid "All done. "
 msgstr "Todo listo. "
 
-#: Controller/AttributesController.php:2677;2724
+#: Controller/AttributesController.php:2397;2444
 #: Controller/ShadowAttributesController.php:1062
 msgid "Invalid field requested."
 msgstr "Campo inválido solicitado."
 
-#: Controller/AttributesController.php:2680;2727
+#: Controller/AttributesController.php:2400;2447
 msgid "This function can only be accessed via AJAX."
 msgstr "Esta función solo se puede acceder a través de AJAX."
 
-#: Controller/AttributesController.php:2792;2800
-#: Controller/EventsController.php:3689;3967
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "Evento no encontrado o no tienes permisos para crear atributos"
 
-#: Controller/AttributesController.php:2821
+#: Controller/AttributesController.php:2541
 msgid "This action can only be accessed via AJAX."
 msgstr "Solo se puede acceder a esta acción a través de AJAX."
 
-#: Controller/AttributesController.php:2830;3081;3095;3106
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
 msgid "You are not authorised to do that."
 msgstr "Usted no está autorizado a realizar esta acción."
 
-#: Controller/AttributesController.php:2935
-#: Controller/EventsController.php:4431
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
 msgid "This functionality requires API key access."
 msgstr "Esta funcionalidad requiere una clave API válida."
 
-#: Controller/AttributesController.php:2943
+#: Controller/AttributesController.php:2663
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr "Esta acción solo se puede usar mediante una clave API válida. Consulte la página de automatización para obtener información sobre cómo usar dicha funcionalidad."
 
-#: Controller/AttributesController.php:2955
+#: Controller/AttributesController.php:2675
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "No se recibió ningún hash o ID de evento. Necesitas configurar al menos uno de los dos."
 
-#: Controller/AttributesController.php:3116
+#: Controller/AttributesController.php:2836
 msgid "Invalid script."
 msgstr "Script no válido."
 
-#: Controller/AttributesController.php:3181
+#: Controller/AttributesController.php:2901
 msgid "No valid enrichment options found for this attribute."
 msgstr "No se encontraron opciones de enriquecimiento válidas para este atributo."
 
-#: Controller/AttributesController.php:3245
+#: Controller/AttributesController.php:2964
 msgid "Invalid type requested."
 msgstr "Tipo inválido solicitado."
 
-#: Controller/AttributesController.php:3476
-#: Controller/EventsController.php:5209
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "Deshabilitadando la correlación, no está permitida en esta instancia."
 
-#: Controller/AttributesController.php:3480;3495
-#: Controller/ShadowAttributesController.php:679
+#: Controller/AttributesController.php:3243;3258
+#: Controller/ShadowAttributesController.php:677
 msgid "Invalid Attribute."
 msgstr "Atributo Inválido."
 
-#: Controller/AttributesController.php:3483;3498
-#: Controller/EventsController.php:5216;5230
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
 msgid "You don't have permission to do that."
 msgstr "No tienes permiso para realizar esta acción."
 
@@ -288,254 +301,286 @@ msgstr "No tienes permiso para realizar esta acción."
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "El evento Blacklisting no está activado en esta instancia."
 
-#: Controller/EventsController.php:804
+#: Controller/EventsController.php:848
 msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
 msgstr "No hay un certificado x509 o una clave GnuPG agregado a su perfil. Si desea recibir mensajes de correo electrónico, presentar su certificado público o una clave GnuPG en su perfil."
 
-#: Controller/EventsController.php:806
+#: Controller/EventsController.php:850
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "No hay una clave GnuPG en tu perfil. Para recibir mensajes de correo electrónico, agregar su clave pública a su perfil."
 
-#: Controller/EventsController.php:812
+#: Controller/EventsController.php:856
 msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
 msgstr "No se ha establecido ningún certificado x509 o clave GnuPG en su perfil. Para recibir atributos en correos electrónicos, envíe su certificado público o clave GnuPG en su perfil."
 
-#: Controller/EventsController.php:814
+#: Controller/EventsController.php:858
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr "No se ha establecido ninguna clave GnuPG en su perfil. Para recibir atributos en correos electrónicos, envíe su clave pública en su perfil."
 
-#: Controller/EventsController.php:1527
+#: Controller/EventsController.php:1559
+msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
+msgstr ""
+
+#: Controller/EventsController.php:1769
 msgid "You don't have permissions to create events"
 msgstr "No tienes permisos para crear eventos"
 
-#: Controller/EventsController.php:1533
+#: Controller/EventsController.php:1775
 msgid "No valid event data received."
 msgstr "No se recibieron datos de eventos válidos."
 
-#: Controller/EventsController.php:1569
+#: Controller/EventsController.php:1811
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "Grupo de compartición no válido o no autorizado (El usuario de sincronización no está incluido en el grupo compartir)."
 
-#: Controller/EventsController.php:1573;1577
+#: Controller/EventsController.php:1815;1819
 msgid "Invalid Sharing Group or not authorised."
 msgstr "Grupo de uso no válido o no autorizado."
 
-#: Controller/EventsController.php:1601
+#: Controller/EventsController.php:1843
 msgid "Event blocked by local blacklist."
 msgstr "Evento bloqueado por la lista negra local."
 
-#: Controller/EventsController.php:1614;1693;1955
+#: Controller/EventsController.php:1856;1933;2197
 msgid "The event has been saved"
 msgstr "El evento se ha guardado"
 
-#: Controller/EventsController.php:1622
+#: Controller/EventsController.php:1864
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "El evento ya existe, si desea editarlo, use la url en el \"location header\"."
 
-#: Controller/EventsController.php:1633
+#: Controller/EventsController.php:1870
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "Una entrada en la lista negra le impide crear cualquier evento. Por favor, póngase en contacto con el equipo de administración de esta instancia"
 
-#: Controller/EventsController.php:1635;1958
+#: Controller/EventsController.php:1872;2200
 msgid "The event could not be saved. Please, try again."
 msgstr "El evento no pudo ser guardado. Por favor, inténtelo de nuevo."
 
-#: Controller/EventsController.php:1719
+#: Controller/EventsController.php:1912
+msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
+msgstr ""
+
+#: Controller/EventsController.php:1959
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "Sólo puede subir archivos MISP XML o JSON MISP."
 
-#: Controller/EventsController.php:1720
+#: Controller/EventsController.php:1960
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "Error en la carga del archivo o el archivo no tiene la extensión esperada (.xml / .json)."
 
-#: Controller/EventsController.php:1768
+#: Controller/EventsController.php:2009
 msgid "STIX document imported, event's created: "
 msgstr "Documento STIX importado, evento creado: "
 
-#: Controller/EventsController.php:1771
+#: Controller/EventsController.php:2012
 msgid "STIX document imported."
 msgstr "Documento STIX importado."
 
-#: Controller/EventsController.php:1774
+#: Controller/EventsController.php:2015
 msgid "Could not import STIX document: "
 msgstr "No se pudo importar el documento STIX: "
 
-#: Controller/EventsController.php:1781
+#: Controller/EventsController.php:2022
 msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
 msgstr "Carga de archivo fallida Asegúrese de seleccionar un archivo stix para cargar y que el archivo no exceda el tamaño máximo de archivo "
 
-#: Controller/EventsController.php:1805;1890
+#: Controller/EventsController.php:2046;2131
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "No está autorizado para hacerlo. Considere utilizar la función 'proponer atributo'."
 
-#: Controller/EventsController.php:1813
+#: Controller/EventsController.php:2054
 msgid "Invalid event ID entered."
 msgstr "El ID del evento es invalido."
 
-#: Controller/EventsController.php:1818
+#: Controller/EventsController.php:2059
 msgid "You are not authorised to read the selected event."
 msgstr "No está autorizado para leer el evento seleccionado."
 
-#: Controller/EventsController.php:2109;2172
+#: Controller/EventsController.php:2349;2387;2450
 msgid "You don't have the permission to do that."
 msgstr "No tienes el permiso para realizar esta acción."
 
-#: Controller/EventsController.php:2259
+#: Controller/EventsController.php:2358
+msgid "Event unpublished."
+msgstr ""
+
+#: Controller/EventsController.php:2537
 msgid "Email sent to the reporter."
 msgstr "Correo electrónico enviado al informante."
 
-#: Controller/EventsController.php:2261
+#: Controller/EventsController.php:2539
 msgid "Sending of email failed"
 msgstr "El envío de e-mail ha fallado"
 
-#: Controller/EventsController.php:2397
+#: Controller/EventsController.php:2678
 msgid "This feature is currently disabled"
 msgstr "Esta característica está actualmente deshabilitada"
 
-#: Controller/EventsController.php:2439;4025
+#: Controller/EventsController.php:2720;3986
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
 msgstr "Especifique los términos de búsqueda en la url o envía un POST en xml (con el elemento raíz como \"solicitud\")."
 
-#: Controller/EventsController.php:2475
+#: Controller/EventsController.php:2756
 msgid "Invalid Event ID."
 msgstr "ID de evento inválido."
 
-#: Controller/EventsController.php:2522
+#: Controller/EventsController.php:2803
 msgid "No events found that match the passed parameters."
 msgstr "No se encontraron eventos que coincidan con los parámetros enviados."
 
-#: Controller/EventsController.php:2547
+#: Controller/EventsController.php:2828
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
 msgstr "Especifique los términos de búsqueda en la url o envía un POST con json o xml con los parámetros de filtro. Filtros válidos: id (ID de evento), etiquetas (listado de etiquetas), desde (a partir de la fecha en formato YYYY-MM-DD), hasta (hasta la fecha en formato YYYY-MM-DD), último (eventos publicados con timestamp más nuevo que - las opciones válidas están en formato de tiempo + unidades como 6d o 2w, etc.)"
 
-#: Controller/EventsController.php:2622;2684
+#: Controller/EventsController.php:2903
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
 msgstr ""
 
-#: Controller/EventsController.php:2641
-#: Model/Attribute.php:1927
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
 msgid "Invalid hash type."
 msgstr "Hash invalido."
 
-#: Controller/EventsController.php:2871
+#: Controller/EventsController.php:3025
 msgid "Filename not allowed."
 msgstr "Nombre de fichero no permitido."
 
-#: Controller/EventsController.php:2892
+#: Controller/EventsController.php:3045
 msgid "Problem with writing the ioc file. Please report to administrator."
 msgstr "Hubo un problem al escribir el archivo iov. Por favor informe al administrador."
 
-#: Controller/EventsController.php:2986
+#: Controller/EventsController.php:3139
 msgid "This is not a valid MISP XML file."
 msgstr "Este no es un archivo MISP XML válido."
 
-#: Controller/EventsController.php:3101
-msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type)."
-msgstr ""
-
-#: Controller/EventsController.php:3294
+#: Controller/EventsController.php:3291
 msgid "Not yet implemented"
 msgstr "Aún no implementado"
 
-#: Controller/EventsController.php:3312;3316
+#: Controller/EventsController.php:3309;3313
 msgid "Invalid event or not authorised."
 msgstr "El evento es no válido o no autorizado."
 
-#: Controller/EventsController.php:3336;3406
+#: Controller/EventsController.php:3333;3403
 msgid "You don't have the privileges to access this."
 msgstr "No tiene suficientes privilegios para acceder."
 
-#: Controller/EventsController.php:3920
-msgid "Could not add tags."
-msgstr "No es posible agregar etiquetas."
+#: Controller/EventsController.php:3610
+#: Controller/TagCollectionsController.php:307
+msgid "Invalid Tag."
+msgstr ""
 
-#: Controller/EventsController.php:3971;5055
-#: Controller/ObjectsController.php:46;140;144;438
+#: Controller/EventsController.php:3626
+#: Controller/TagCollectionsController.php:323
+msgid "Tag is already attached to this event."
+msgstr ""
+
+#: Controller/EventsController.php:3637;3643
+#: Controller/TagCollectionsController.php:330
+msgid "Tag(s) added."
+msgstr ""
+
+#: Controller/EventsController.php:3639
+msgid "Tag could not be added."
+msgstr ""
+
+#: Controller/EventsController.php:3645
+#: Controller/TagCollectionsController.php:338
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
 msgid "Invalid event."
 msgstr "Evento invalido."
 
-#: Controller/EventsController.php:4085;4115;4131
+#: Controller/EventsController.php:3918
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
+msgstr ""
+
+#: Controller/EventsController.php:4049;4079;4095
 msgid "You do not have the permission to do that."
 msgstr "No tienes permisos para realizar esta acción."
 
-#: Controller/EventsController.php:4196;4334
+#: Controller/EventsController.php:4160;4300
 msgid "Invalid ID"
 msgstr "ID inválido"
 
-#: Controller/EventsController.php:4200;4338
+#: Controller/EventsController.php:4164;4304
 msgid "Event not found or you are not authorised to view it."
 msgstr "Evento no encontrado o no estás autorizado para visualizarlo."
 
-#: Controller/EventsController.php:4434;4441
+#: Controller/EventsController.php:4405;4412
 msgid "Please POST the samples as described on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4470
+#: Controller/EventsController.php:4441
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr ""
 
-#: Controller/EventsController.php:4478
+#: Controller/EventsController.php:4449
 msgid "Event not found"
 msgstr "No se ha encontrado el evento"
 
-#: Controller/EventsController.php:4501
+#: Controller/EventsController.php:4472
 msgid "Event not found."
 msgstr "No se ha encontrado el evento."
 
-#: Controller/EventsController.php:4511
+#: Controller/EventsController.php:4482
 msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
 msgstr ""
 
-#: Controller/EventsController.php:4536
+#: Controller/EventsController.php:4507
 msgid "The creation of a new event with the supplied information has failed."
 msgstr ""
 
-#: Controller/EventsController.php:4671;4693;4722;4747;4772;4802;4823
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
 msgid "Invalid type."
 msgstr "Tipo inválido."
 
-#: Controller/EventsController.php:4866
+#: Controller/EventsController.php:4906
 msgid "Invalid method."
 msgstr "Método inválido."
 
-#: Controller/EventsController.php:4946
+#: Controller/EventsController.php:4989
 msgid "%s services are not enabled."
 msgstr ""
 
-#: Controller/EventsController.php:4950
+#: Controller/EventsController.php:4993
 msgid "Attribute not found or you are not authorised to see it."
 msgstr ""
 
-#: Controller/EventsController.php:4956
+#: Controller/EventsController.php:4999
 msgid "No valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4973
+#: Controller/EventsController.php:5016
 msgid "no valid %s options found for this attribute."
 msgstr ""
 
-#: Controller/EventsController.php:4995
+#: Controller/EventsController.php:5038
 msgid "%s service not reachable."
 msgstr ""
 
-#: Controller/EventsController.php:5007
+#: Controller/EventsController.php:5050
 msgid ": Enriched via the %s"
 msgstr ""
 
-#: Controller/EventsController.php:5136
+#: Controller/EventsController.php:5184
 msgid "Import service not reachable."
 msgstr "Servicio de importación no alcanzable."
 
-#: Controller/EventsController.php:5303
+#: Controller/EventsController.php:5351
 msgid "Invalid ID."
 msgstr ""
 
-#: Controller/EventsController.php:5351
-#: Controller/ShadowAttributesController.php:312;317;534
+#: Controller/EventsController.php:5399
+#: Controller/ShadowAttributesController.php:311;316;532
 msgid "Invalid Event"
 msgstr "Evento inválido"
 
-#: Controller/EventsController.php:5369
+#: Controller/EventsController.php:5420
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr ""
 
@@ -543,122 +588,138 @@ msgstr ""
 msgid "You don't have the required privileges to do that."
 msgstr ""
 
-#: Controller/FeedsController.php:193;291
+#: Controller/FeedsController.php:205;303
 msgid "Feed added."
 msgstr "Feed añadido."
 
-#: Controller/FeedsController.php:201
+#: Controller/FeedsController.php:213
 msgid "Feed could not be added. Invalid field: %s"
 msgstr "No se pudo agregar el feed. Campo no válido: %s"
 
-#: Controller/FeedsController.php:226;326;348;470;502;682
+#: Controller/FeedsController.php:238;338;360;482;517;721
 msgid "Invalid feed."
 msgstr ""
 
-#: Controller/FeedsController.php:299
+#: Controller/FeedsController.php:311
 msgid "Feed could not be updated. Invalid fields: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:322
+#: Controller/FeedsController.php:334
 msgid "This action requires a post request."
 msgstr ""
 
-#: Controller/FeedsController.php:355;474
+#: Controller/FeedsController.php:367;486
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr ""
 
-#: Controller/FeedsController.php:368;434
+#: Controller/FeedsController.php:380;446
 msgid "Starting fetch from Feed."
 msgstr ""
 
-#: Controller/FeedsController.php:379
+#: Controller/FeedsController.php:391
 msgid "Pull queued for background execution."
 msgstr ""
 
-#: Controller/FeedsController.php:384;386
+#: Controller/FeedsController.php:396;398
 msgid "Fetching the feed has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:390
+#: Controller/FeedsController.php:402
 msgid "Fetching the feed has successfuly completed."
 msgstr ""
 
-#: Controller/FeedsController.php:451
+#: Controller/FeedsController.php:463
 msgid "Fetching the feed has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:481
+#: Controller/FeedsController.php:493
 msgid "Event added."
 msgstr "Evento agregado."
 
-#: Controller/FeedsController.php:484
+#: Controller/FeedsController.php:496
 msgid "Event already up to date."
 msgstr "Evento ya acualizado."
 
-#: Controller/FeedsController.php:486
+#: Controller/FeedsController.php:498
 msgid "Event updated."
 msgstr "Evento Actualizado."
 
-#: Controller/FeedsController.php:490
+#: Controller/FeedsController.php:502
 msgid "Could not %s event."
 msgstr ""
 
-#: Controller/FeedsController.php:493
+#: Controller/FeedsController.php:505
 msgid "Download failed."
 msgstr "Descarga fallida."
 
-#: Controller/FeedsController.php:561
+#: Controller/FeedsController.php:597
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr ""
 
-#: Controller/FeedsController.php:600;651
+#: Controller/FeedsController.php:636;687
 msgid "Invalid feed type."
 msgstr ""
 
-#: Controller/FeedsController.php:714
+#: Controller/FeedsController.php:753
 msgid "This event is blocked by the Feed filters."
 msgstr ""
 
-#: Controller/FeedsController.php:716
+#: Controller/FeedsController.php:755
 msgid "Could not download the selected Event"
 msgstr ""
 
-#: Controller/FeedsController.php:752;756
+#: Controller/FeedsController.php:791;795
 msgid "Invalid Feed."
 msgstr "Feed inválido."
 
-#: Controller/FeedsController.php:777
+#: Controller/FeedsController.php:816
 msgid "Only POST requests are allowed."
 msgstr ""
 
-#: Controller/FeedsController.php:781
+#: Controller/FeedsController.php:820
 msgid "Feed not found."
 msgstr "Feed no encontrado."
 
-#: Controller/FeedsController.php:790
+#: Controller/FeedsController.php:829
 msgid "Data pulled."
 msgstr ""
 
-#: Controller/FeedsController.php:792
+#: Controller/FeedsController.php:831
 msgid "Could not pull the selected data. Reason: %s"
 msgstr ""
 
-#: Controller/FeedsController.php:809
+#: Controller/FeedsController.php:848
 msgid "Starting feed caching."
 msgstr ""
 
-#: Controller/FeedsController.php:824
+#: Controller/FeedsController.php:863
 msgid "Caching the feeds has failed."
 msgstr ""
 
-#: Controller/FeedsController.php:827
+#: Controller/FeedsController.php:866
 msgid "Caching the feeds has successfully completed."
 msgstr ""
 
-#: Controller/FeedsController.php:858
+#: Controller/FeedsController.php:900
 msgid "Invalid feed list received."
 msgstr ""
 
+#: Controller/GalaxiesController.php:92
+msgid "All clusters"
+msgstr ""
+
+#: Controller/GalaxiesController.php:135
+msgid "All namespaces"
+msgstr ""
+
+#: Controller/GalaxiesController.php:250
+msgid "Failed to parse request."
+msgstr ""
+
+#: Controller/GalaxiesController.php:253
+msgid "No clusters picked."
+msgstr ""
+
 #: Controller/JobsController.php:156
 msgid "All completed jobs have been purged"
 msgstr "Todos los trabajos terminados han sido limpiados"
@@ -671,11 +732,23 @@ msgstr "Todos los trabajos han sido limpiados"
 msgid "Invalid object"
 msgstr "Objeto no válido"
 
-#: Controller/ObjectReferencesController.php:187
+#: Controller/ObjectReferencesController.php:188
 msgid "Invalid object reference"
 msgstr "La referencia del objeto es no valida"
 
-#: Controller/ObjectTemplatesController.php:88
+#: Controller/ObjectTemplatesController.php:31
+msgid "All Objects"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:99
+msgid "Invalid object template"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:103
+msgid "Invalid object template id."
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
 msgstr "ObjectTemplate eliminado"
 
@@ -696,23 +769,23 @@ msgstr ""
 msgid "Invalid template."
 msgstr ""
 
-#: Controller/ObjectsController.php:303
+#: Controller/ObjectsController.php:311
 msgid "You don't have permissions to edit objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:317;328;427
+#: Controller/ObjectsController.php:325;336;439
 msgid "Invalid object."
 msgstr "Objeto no válido."
 
-#: Controller/ObjectsController.php:421
+#: Controller/ObjectsController.php:433
 msgid "You don't have permissions to delete objects."
 msgstr ""
 
-#: Controller/ObjectsController.php:531;538;542
+#: Controller/ObjectsController.php:543;550;554
 msgid "Object not found or not authorised."
 msgstr ""
 
-#: Controller/ObjectsController.php:799
+#: Controller/ObjectsController.php:811
 msgid "%s objects successfully reconstructed."
 msgstr "%s objetos reconstruidos con éxito."
 
@@ -776,123 +849,147 @@ msgstr ""
 msgid "Role deleted"
 msgstr "Rol eliminado"
 
-#: Controller/ServersController.php:204;394
+#: Controller/ServersController.php:226;417
 msgid "The pull filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:214;404
+#: Controller/ServersController.php:236;427
 msgid "The push filter rules must be in valid JSON format."
 msgstr ""
 
-#: Controller/ServersController.php:268;434
+#: Controller/ServersController.php:291;457
 msgid "That organisation could not be created as the uuid is in use already."
 msgstr ""
 
-#: Controller/ServersController.php:280
+#: Controller/ServersController.php:303
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format? Also, make sure the organisation's name doesn't clash with an existing one."
 msgstr ""
 
-#: Controller/ServersController.php:309;490
+#: Controller/ServersController.php:332;513
 msgid "The server has been saved"
 msgstr "El servidor ha sido guardado"
 
-#: Controller/ServersController.php:316;497
+#: Controller/ServersController.php:339;520
 msgid "The server could not be saved. Please, try again."
 msgstr "El servidor no pudo ser guardado. Por favor, inténtelo de nuevo."
 
-#: Controller/ServersController.php:369;565;590;598;659;1412
+#: Controller/ServersController.php:392;589;614;623;683;1360
 msgid "Invalid server"
 msgstr "Servidor invalido"
 
-#: Controller/ServersController.php:451
+#: Controller/ServersController.php:474
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr "No se pudo guardar la nueva organización, ¿está seguro de que el uuid esta en el formato correcto?."
 
-#: Controller/ServersController.php:572
+#: Controller/ServersController.php:596
 msgid "Server deleted"
 msgstr "Servidor eliminado"
 
-#: Controller/ServersController.php:575
+#: Controller/ServersController.php:599
 msgid "Server was not deleted"
 msgstr "Servidor no fue eliminado"
 
-#: Controller/ServersController.php:602
+#: Controller/ServersController.php:626
 msgid "Pull setting not enabled for this server."
 msgstr ""
 
-#: Controller/ServersController.php:611
-msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+#: Controller/ServersController.php:659
+msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:1309
+#: Controller/ServersController.php:696
+msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
+msgstr ""
+
+#: Controller/ServersController.php:709
+msgid "Push complete. %s events pushed, %s events could not be pushed."
+msgstr ""
+
+#: Controller/ServersController.php:734
+msgid "Push queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:1257
 msgid "File not found."
 msgstr "Archivo no encontrado."
 
-#: Controller/ServersController.php:1315
+#: Controller/ServersController.php:1263
 msgid "File could not be deleted."
 msgstr "El archivo no pudo ser eliminado."
 
-#: Controller/ServersController.php:1338;1354
+#: Controller/ServersController.php:1286;1302
 msgid "Upload failed."
 msgstr "Hubo un fallo en la carga."
 
-#: Controller/ServersController.php:1346
+#: Controller/ServersController.php:1294
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:212
+#: Controller/ServersController.php:1748
+msgid "Starting server caching."
+msgstr ""
+
+#: Controller/ServersController.php:1763
+msgid "Caching the servers has failed."
+msgstr ""
+
+#: Controller/ServersController.php:1766
+msgid "Caching the servers has successfully completed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:211
 msgid "Moving of the file that this attachment references failed."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:280
+#: Controller/ShadowAttributesController.php:279
 msgid "Could not discard proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:341
+#: Controller/ShadowAttributesController.php:340
 msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:389;392;401
+#: Controller/ShadowAttributesController.php:388;391;400
 msgid "The lines"
 msgstr "Las líneas"
 
-#: Controller/ShadowAttributesController.php:441
+#: Controller/ShadowAttributesController.php:440
 msgid "The proposal has been saved"
 msgstr "La propuesta ha sido guardada"
 
-#: Controller/ShadowAttributesController.php:453;763
+#: Controller/ShadowAttributesController.php:452;761
 msgid "Could not save the proposal. Errors: %s"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:455
+#: Controller/ShadowAttributesController.php:454
 msgid "The proposal could not be saved. Please, try again."
 msgstr "La propuesta no pudo ser guardad. Por favor, inténtalo de nuevo."
 
-#: Controller/ShadowAttributesController.php:492
+#: Controller/ShadowAttributesController.php:491
 msgid "Invalid Proposal"
 msgstr "Propuesta invalida"
 
-#: Controller/ShadowAttributesController.php:523
+#: Controller/ShadowAttributesController.php:521
 msgid "Proposal not an attachment or malware-sample"
 msgstr "Proposal sin un adjunto o malware-ejemplo"
 
-#: Controller/ShadowAttributesController.php:619
+#: Controller/ShadowAttributesController.php:617
 msgid "The attachment has been uploaded"
 msgstr "El adjunto se ha subido"
 
-#: Controller/ShadowAttributesController.php:621
+#: Controller/ShadowAttributesController.php:619
 msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:624
+#: Controller/ShadowAttributesController.php:622
 msgid "The attachment could not be saved, please contact your administrator."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:754
+#: Controller/ShadowAttributesController.php:752
 msgid "The proposed Attribute has been saved"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:765
+#: Controller/ShadowAttributesController.php:763
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
@@ -924,6 +1021,86 @@ msgstr "Grupo compartido eliminado"
 msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
 msgstr ""
 
+#: Controller/SightingsController.php:86
+msgid "Could not add the Sighting. Reason: "
+msgstr ""
+
+#: Controller/SightingsController.php:96;99
+msgid "Sighting added"
+msgstr ""
+
+#: Controller/SightingsController.php:152
+msgid "You are not authorised to remove sightings data as you don't have permission to modify your organisation's data."
+msgstr ""
+
+#: Controller/SightingsController.php:158
+msgid "Attribute not found"
+msgstr ""
+
+#: Controller/SightingsController.php:176
+msgid "Invalid request."
+msgstr ""
+
+#: Controller/SightingsController.php:185
+msgid "Sighting added."
+msgstr ""
+
+#: Controller/SightingsController.php:187
+msgid "Sighting could not be added"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:56;177
+msgid "The tag collection has been saved"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:64;185
+msgid "The tag collection could not be added. Reason: "
+msgstr ""
+
+#: Controller/TagCollectionsController.php:85
+msgid "%s new tag collections added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:154
+msgid "Invalid Tag Collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:161
+msgid "You don't have editing rights on this Tag Collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:201;380
+msgid "Invalid tag collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:207
+msgid "Tag collection deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:215
+msgid "Tag collection could not be deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:224
+msgid "You are not allowed to delete that."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:332
+msgid "Tag(s) could not be added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:384
+msgid "Insufficient privileges to remove the tag from the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:395
+msgid "Invalid tag or tag not associated with the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:399
+msgid "Failed to remove tag from the collection."
+msgstr ""
+
 #: Controller/TagsController.php:367
 msgid "Tag deleted"
 msgstr "Etiqueta eliminada"
@@ -932,6 +1109,27 @@ msgstr "Etiqueta eliminada"
 msgid "Tag was not deleted"
 msgstr "La etiqueta no fue eliminada"
 
+#: Controller/TagsController.php:580
+msgid "Favourite Tags"
+msgstr ""
+
+#: Controller/TagsController.php:586
+msgid "Tag Collections"
+msgstr ""
+
+#: Controller/TagsController.php:591
+msgid "All Tags"
+msgstr ""
+
+#: Controller/TagsController.php:601
+#: View/Taxonomies/view.ctp:2
+msgid "Taxonomy Library"
+msgstr ""
+
+#: Controller/TagsController.php:756
+msgid "Includes: "
+msgstr ""
+
 #: Controller/TemplatesController.php:408
 msgid "Event populated, "
 msgstr "El evento fue populado "
@@ -940,15 +1138,15 @@ msgstr "El evento fue populado "
 msgid "Event populated, but "
 msgstr "El evento fue populado, pero "
 
-#: Controller/UsersController.php:42;221
+#: Controller/UsersController.php:42;247
 msgid "Invalid user or not authorised."
 msgstr "Usuario no válido o no autorizado."
 
-#: Controller/UsersController.php:54;430;657;907
+#: Controller/UsersController.php:54;456;683;929
 msgid "Invalid user"
 msgstr "Usuario inválido"
 
-#: Controller/UsersController.php:119;564;728
+#: Controller/UsersController.php:119;590;754
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
@@ -960,59 +1158,75 @@ msgstr ""
 msgid "The profile could not be updated. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:198
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
 msgid "Password Changed."
 msgstr "Contraseña cambiada."
 
-#: Controller/UsersController.php:203
+#: Controller/UsersController.php:222
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr ""
 
-#: Controller/UsersController.php:575
+#: Controller/UsersController.php:601
 msgid "The user could not be saved. Invalid organisation."
 msgstr ""
 
-#: Controller/UsersController.php:597
+#: Controller/UsersController.php:623
 msgid "The user has been saved."
 msgstr "Se ha guardado el usuario."
 
-#: Controller/UsersController.php:606;843
+#: Controller/UsersController.php:632;865
 msgid "The user could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:835
+#: Controller/UsersController.php:857
 msgid "The user has been saved"
 msgstr ""
 
-#: Controller/UsersController.php:915
+#: Controller/UsersController.php:937
 msgid "User deleted"
 msgstr "Usuario borrado"
 
-#: Controller/UsersController.php:919
+#: Controller/UsersController.php:941
 msgid "User was not deleted"
 msgstr "El usuario no fue borrado"
 
-#: Controller/UsersController.php:997
+#: Controller/UsersController.php:1019
 msgid "Invalid username or password, try again"
 msgstr ""
 
-#: Controller/UsersController.php:1080
+#: Controller/UsersController.php:1106
 msgid "Good-Bye"
 msgstr ""
 
-#: Controller/UsersController.php:1121
+#: Controller/UsersController.php:1147
 msgid "New authkey generated."
 msgstr ""
 
-#: Controller/UsersController.php:1230
+#: Controller/UsersController.php:1256
 msgid "You accepted the Terms and Conditions."
 msgstr ""
 
-#: Controller/UsersController.php:1419
+#: Controller/UsersController.php:1438
+msgid "Recipient email not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1443
+msgid "Recipient organisation not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1480
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr ""
 
-#: Controller/UsersController.php:1421
+#: Controller/UsersController.php:1482
 msgid "E-mails sent."
 msgstr "Correo electrónico enviado."
 
@@ -1040,972 +1254,1040 @@ msgstr ""
 msgid "%s was not deleted"
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:72
+#: Controller/Component/BlackListComponent.php:75
 msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:123
+#: Controller/Component/BlackListComponent.php:126
 msgid "Blacklist item added."
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:152
+#: Controller/Component/BlackListComponent.php:155
 msgid "Invalid blacklist entry"
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:156
+#: Controller/Component/BlackListComponent.php:159
 msgid "Blacklist entry removed"
 msgstr ""
 
-#: Controller/Component/BlackListComponent.php:158
+#: Controller/Component/BlackListComponent.php:161
 msgid "Could not remove the blacklist entry"
 msgstr ""
 
-#: Model/Attribute.php:567
+#: Model/Attribute.php:591
 msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/Attribute.php:677
+#: Model/Attribute.php:703
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Attribute.php:802
+#: Model/Attribute.php:828
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Attribute.php:921
+#: Model/Attribute.php:953
 msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:928
+#: Model/Attribute.php:960
 msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:935
+#: Model/Attribute.php:967
 msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:946
+#: Model/Attribute.php:978
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:957
+#: Model/Attribute.php:989
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:972
+#: Model/Attribute.php:996
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:1011
 msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:990
+#: Model/Attribute.php:1029
 msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:995
+#: Model/Attribute.php:1034
 msgid "Invalid composite type. The format has to be %s."
 msgstr ""
 
-#: Model/Attribute.php:1006
+#: Model/Attribute.php:1045
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr ""
 
-#: Model/Attribute.php:1014
+#: Model/Attribute.php:1053
 msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1025
+#: Model/Attribute.php:1064
 msgid "Invalid CIDR notation value found."
 msgstr ""
 
-#: Model/Attribute.php:1032;1083
+#: Model/Attribute.php:1071;1122
 msgid "IP address has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1037
+#: Model/Attribute.php:1076
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr ""
 
-#: Model/Attribute.php:1066
+#: Model/Attribute.php:1105
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1086
+#: Model/Attribute.php:1125
 msgid "Domain name has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1099
+#: Model/Attribute.php:1138
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1107
+#: Model/Attribute.php:1146
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr ""
 
-#: Model/Attribute.php:1118
+#: Model/Attribute.php:1157
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr ""
 
-#: Model/Attribute.php:1230
+#: Model/Attribute.php:1272
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr ""
 
-#: Model/Attribute.php:1236
+#: Model/Attribute.php:1278
 msgid "The value has to be a number greater or equal 0."
 msgstr ""
 
-#: Model/Attribute.php:1243
+#: Model/Attribute.php:1285
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:1923;1991
+#: Model/Attribute.php:1968;2036
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2527
+#: Model/Attribute.php:2616
 msgid "This field is mandatory."
 msgstr ""
 
-#: Model/Attribute.php:2885
+#: Model/Attribute.php:3069
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
-#: Model/Event.php:4532
+#: Model/Event.php:5392
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:4534
+#: Model/Event.php:5394
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:4536
+#: Model/Event.php:5396
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:4539
+#: Model/Event.php:5399
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:4541
+#: Model/Event.php:5401
 msgid "Please "
 msgstr ""
 
-#: Model/Event.php:4543
+#: Model/Event.php:5403
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:4575
+#: Model/Event.php:5435
 msgid "#"
 msgstr ""
 
-#: Model/Event.php:4584
+#: Model/Event.php:5444
 msgid "%s not set"
 msgstr ""
 
-#: Model/Server.php:114
+#: Model/Event.php:5667
+msgid "Could not add tags."
+msgstr "No es posible agregar etiquetas."
+
+#: Model/Galaxy.php:219;276;286;300
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
 msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
 msgstr ""
 
-#: Model/Server.php:115
+#: Model/Server.php:122
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:125
+#: Model/Server.php:132
 msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
 msgstr ""
 
-#: Model/Server.php:126
+#: Model/Server.php:133
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:135
+#: Model/Server.php:142
 msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
 msgstr ""
 
-#: Model/Server.php:137
+#: Model/Server.php:144
 msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
 msgstr ""
 
-#: Model/Server.php:143
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:151
+#: Model/Server.php:166
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:161
+#: Model/Server.php:176
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr ""
 
-#: Model/Server.php:170
+#: Model/Server.php:185
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:195
 msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
 msgstr ""
 
-#: Model/Server.php:179
+#: Model/Server.php:204
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:187
+#: Model/Server.php:212
 msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
 msgstr ""
 
-#: Model/Server.php:196
+#: Model/Server.php:221
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:198
+#: Model/Server.php:223
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:204;212;230;254;262;270;278;335;383;391;457
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
 msgid "This setting is deprecated and can be safely removed."
 msgstr ""
 
-#: Model/Server.php:220
+#: Model/Server.php:245
 msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
 msgstr ""
 
-#: Model/Server.php:238
+#: Model/Server.php:263
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:246
+#: Model/Server.php:271
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:286
+#: Model/Server.php:311
 msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:294
+#: Model/Server.php:319
 msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:302
+#: Model/Server.php:327
 msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:310
+#: Model/Server.php:335
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:318
+#: Model/Server.php:343
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:327
+#: Model/Server.php:352
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:329
+#: Model/Server.php:354
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:343
+#: Model/Server.php:368
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:351
+#: Model/Server.php:376
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:359
+#: Model/Server.php:384
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:367
+#: Model/Server.php:392
 msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
 msgstr ""
 
-#: Model/Server.php:375
+#: Model/Server.php:400
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:399
+#: Model/Server.php:424
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:407
+#: Model/Server.php:432
 msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
 msgstr ""
 
-#: Model/Server.php:416
+#: Model/Server.php:441
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:424
+#: Model/Server.php:449
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:432
+#: Model/Server.php:457
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:440
+#: Model/Server.php:465
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr ""
 
-#: Model/Server.php:449
+#: Model/Server.php:474
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:465
+#: Model/Server.php:490
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:473
+#: Model/Server.php:498
 msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
 msgstr ""
 
-#: Model/Server.php:481
+#: Model/Server.php:506
 msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
 msgstr ""
 
-#: Model/Server.php:489
+#: Model/Server.php:514
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:498
+#: Model/Server.php:523
 msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
 msgstr ""
 
-#: Model/Server.php:507
+#: Model/Server.php:532
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:516
+#: Model/Server.php:541
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:550
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:524
+#: Model/Server.php:558
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:533
+#: Model/Server.php:567
 msgid "Used on the login page, before the MISP logo"
 msgstr ""
 
-#: Model/Server.php:541
+#: Model/Server.php:575
 msgid "Used on the login page, after the MISP logo"
 msgstr ""
 
-#: Model/Server.php:549
+#: Model/Server.php:583
 msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:557
+#: Model/Server.php:591
 msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:565
+#: Model/Server.php:599
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:573
+#: Model/Server.php:607
 msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
 msgstr ""
 
-#: Model/Server.php:581
+#: Model/Server.php:615
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:589
+#: Model/Server.php:623
 msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
 msgstr ""
 
-#: Model/Server.php:597
+#: Model/Server.php:631
 msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
 msgstr ""
 
-#: Model/Server.php:605
+#: Model/Server.php:639
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:614
+#: Model/Server.php:648
 msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:623
+#: Model/Server.php:657
 msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:631
+#: Model/Server.php:665
 msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
 msgstr ""
 
-#: Model/Server.php:638
+#: Model/Server.php:672
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:645
+#: Model/Server.php:679
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:654
+#: Model/Server.php:688
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:662
+#: Model/Server.php:696
 msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
 msgstr ""
 
-#: Model/Server.php:671
+#: Model/Server.php:705
 msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
 msgstr ""
 
-#: Model/Server.php:680
+#: Model/Server.php:714
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:689
+#: Model/Server.php:723
 msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:698
+#: Model/Server.php:732
 msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:707
+#: Model/Server.php:741
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:717
+#: Model/Server.php:751
 msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
 msgstr ""
 
-#: Model/Server.php:726
+#: Model/Server.php:760
 msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
 msgstr ""
 
-#: Model/Server.php:735
+#: Model/Server.php:769
 msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
 msgstr ""
 
-#: Model/Server.php:744
+#: Model/Server.php:778
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:753
+#: Model/Server.php:787
 msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
 msgstr ""
 
-#: Model/Server.php:762
-msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/webroot/css directory and enter the name here."
+#: Model/Server.php:796
+msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
 msgstr ""
 
-#: Model/Server.php:771
+#: Model/Server.php:805
 msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
 msgstr ""
 
-#: Model/Server.php:780
+#: Model/Server.php:814
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr ""
 
-#: Model/Server.php:789
+#: Model/Server.php:823
 msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
 msgstr ""
 
-#: Model/Server.php:799
+#: Model/Server.php:833
 msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
 msgstr ""
 
-#: Model/Server.php:808
+#: Model/Server.php:842
 msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:816
+#: Model/Server.php:850
 msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:824
+#: Model/Server.php:858
 msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
 msgstr ""
 
-#: Model/Server.php:832
+#: Model/Server.php:866
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:841
+#: Model/Server.php:875
 msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
 msgstr ""
 
-#: Model/Server.php:849
+#: Model/Server.php:883
+msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
+msgstr ""
+
+#: Model/Server.php:891
 msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
 msgstr ""
 
-#: Model/Server.php:861
+#: Model/Server.php:903
 msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
 msgstr ""
 
-#: Model/Server.php:869
+#: Model/Server.php:911
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:877
+#: Model/Server.php:919
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:885
+#: Model/Server.php:927
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:893
+#: Model/Server.php:935
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:901
+#: Model/Server.php:943
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:910
+#: Model/Server.php:952
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:921
+#: Model/Server.php:963
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr ""
 
-#: Model/Server.php:929
+#: Model/Server.php:971
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:937
+#: Model/Server.php:979
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:945
+#: Model/Server.php:987
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:953
+#: Model/Server.php:995
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:965
+#: Model/Server.php:1007
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:973
+#: Model/Server.php:1015
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:981
+#: Model/Server.php:1023
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:989
+#: Model/Server.php:1031
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:997
+#: Model/Server.php:1039
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1008
+#: Model/Server.php:1050
 msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
 msgstr ""
 
-#: Model/Server.php:1017
+#: Model/Server.php:1059
 msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
 msgstr ""
 
-#: Model/Server.php:1026
+#: Model/Server.php:1068
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr ""
 
-#: Model/Server.php:1034
+#: Model/Server.php:1076
 msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 msgstr ""
 
-#: Model/Server.php:1042
+#: Model/Server.php:1084
 msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
 msgstr ""
 
-#: Model/Server.php:1051
+#: Model/Server.php:1093
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1060
+#: Model/Server.php:1102
 msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
 msgstr ""
 
-#: Model/Server.php:1069
+#: Model/Server.php:1111
 msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
 msgstr ""
 
-#: Model/Server.php:1071
+#: Model/Server.php:1113
 msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
 msgstr ""
 
-#: Model/Server.php:1081
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1089
+#: Model/Server.php:1149
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr ""
 
-#: Model/Server.php:1100
+#: Model/Server.php:1160
 msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
 msgstr ""
 
-#: Model/Server.php:1108
+#: Model/Server.php:1168
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr ""
 
-#: Model/Server.php:1116
+#: Model/Server.php:1176
 msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
 msgstr ""
 
-#: Model/Server.php:1125
-msgid "The timeout duration of sessions (in MINUTES)."
-msgstr ""
-
-#: Model/Server.php:1133
-msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
-msgstr ""
-
-#: Model/Server.php:1144
-msgid "The default policy action for the values added to the RPZ."
-msgstr ""
-
-#: Model/Server.php:1153
-msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
-msgstr ""
-
-#: Model/Server.php:1161
-msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
-msgstr ""
-
-#: Model/Server.php:1169
-msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
-#: Model/Server.php:1177
-msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
-msgstr ""
-
 #: Model/Server.php:1185
-msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
 msgstr ""
 
 #: Model/Server.php:1193
+msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
+msgstr ""
+
+#: Model/Server.php:1204
+msgid "The default policy action for the values added to the RPZ."
+msgstr ""
+
+#: Model/Server.php:1213
+msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
+msgstr ""
+
+#: Model/Server.php:1221
+msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
+msgstr ""
+
+#: Model/Server.php:1229
+msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1237
+msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1245
+msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1253
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1201
+#: Model/Server.php:1261
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1217
+#: Model/Server.php:1277
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:1225
+#: Model/Server.php:1285
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1233
+#: Model/Server.php:1293
 msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
 msgstr ""
 
-#: Model/Server.php:1242
+#: Model/Server.php:1302
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1251
+#: Model/Server.php:1311
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1260
+#: Model/Server.php:1320
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1269
+#: Model/Server.php:1329
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1278
+#: Model/Server.php:1338
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1287
+#: Model/Server.php:1347
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1296
+#: Model/Server.php:1356
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1304
+#: Model/Server.php:1364
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1312
+#: Model/Server.php:1372
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1320
+#: Model/Server.php:1380
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1328
+#: Model/Server.php:1388
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1336
+#: Model/Server.php:1396
 msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1344
+#: Model/Server.php:1404
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1352
+#: Model/Server.php:1412
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1360
+#: Model/Server.php:1420
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1368
+#: Model/Server.php:1428
 msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1376
+#: Model/Server.php:1436
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1384
-msgid "The URL(s) at which to access ElasticSearch - comma seperate if you want to have more than one."
+#: Model/Server.php:1444
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1392
+#: Model/Server.php:1452
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1460
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1468
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1416
+#: Model/Server.php:1476
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1424
+#: Model/Server.php:1484
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr ""
 
-#: Model/Server.php:1432
+#: Model/Server.php:1492
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:1440
+#: Model/Server.php:1500
 msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
 msgstr ""
 
-#: Model/Server.php:1449
+#: Model/Server.php:1509
 msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
 msgstr ""
 
-#: Model/Server.php:1457
+#: Model/Server.php:1517
 msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
 msgstr ""
 
-#: Model/Server.php:1465
+#: Model/Server.php:1525
 msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
 msgstr ""
 
-#: Model/Server.php:1475
+#: Model/Server.php:1535
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1484
+#: Model/Server.php:1544
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1493
+#: Model/Server.php:1553
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1502
+#: Model/Server.php:1562
 msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
 msgstr ""
 
-#: Model/Server.php:1511
+#: Model/Server.php:1571
 msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
 msgstr ""
 
-#: Model/Server.php:1520
+#: Model/Server.php:1580
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr ""
 
-#: Model/Server.php:1529
+#: Model/Server.php:1589
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1537
+#: Model/Server.php:1597
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1545
+#: Model/Server.php:1605
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1553;1665
+#: Model/Server.php:1613;1725
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:1561;1682
+#: Model/Server.php:1621;1742
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:1569
+#: Model/Server.php:1629
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1577
+#: Model/Server.php:1637
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1585
+#: Model/Server.php:1645
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1593
+#: Model/Server.php:1653
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1601
+#: Model/Server.php:1661
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:1609
+#: Model/Server.php:1669
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:1617
+#: Model/Server.php:1677
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1625
+#: Model/Server.php:1685
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:1633
+#: Model/Server.php:1693
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1641
+#: Model/Server.php:1701
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1649
+#: Model/Server.php:1709
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:1657
+#: Model/Server.php:1717
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:1673
+#: Model/Server.php:1733
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:1690
+#: Model/Server.php:1750
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:1699
+#: Model/Server.php:1759
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:1708
+#: Model/Server.php:1768
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr ""
 
-#: Model/Server.php:1717
+#: Model/Server.php:1777
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:1726
+#: Model/Server.php:1786
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:1735
+#: Model/Server.php:1795
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:1745
+#: Model/Server.php:1805
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:1754
+#: Model/Server.php:1814
 msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
 msgstr ""
 
-#: Model/Server.php:2401
+#: Model/Server.php:1947
+msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/Server.php:2054
+msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+msgstr ""
+
+#: Model/Server.php:2056
+msgid "Sorry, this is not yet implemented"
+msgstr ""
+
+#: Model/Server.php:2057
+msgid "Something went wrong while trying to pull"
+msgstr ""
+
+#: Model/Server.php:2069;2071
+msgid "Unknown issue."
+msgstr ""
+
+#: Model/Server.php:2535
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:2404
+#: Model/Server.php:2538
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:2412
+#: Model/Server.php:2546
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:2527
+#: Model/Server.php:2661
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3130
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
 msgid "Organisation logos"
 msgstr ""
 
-#: Model/Server.php:3131
+#: Model/Server.php:3476
 msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
 msgstr ""
 
-#: Model/Server.php:3133
+#: Model/Server.php:3478
 msgid "48x48 pixel .png files"
 msgstr ""
 
-#: Model/Server.php:3136;3151
+#: Model/Server.php:3481;3496
 msgid "Filename must be in the following format: *.png"
 msgstr ""
 
-#: Model/Server.php:3140
+#: Model/Server.php:3485
 msgid "Additional image files"
 msgstr ""
 
-#: Model/Server.php:3141
+#: Model/Server.php:3486
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:3148
+#: Model/Server.php:3493
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:3765
+#: Model/Server.php:3665
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr ""
+
+#: Model/Server.php:4115
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:3766
+#: Model/Server.php:4116
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:3770
+#: Model/Server.php:4120
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:3771
+#: Model/Server.php:4121
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
@@ -2029,7 +2311,7 @@ msgstr ""
 
 #: View/Attributes/add.ctp:7
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr ""
@@ -2074,7 +2356,7 @@ msgstr ""
 #: View/Attributes/add.ctp:36
 #: View/Attributes/add_attachment.ctp:24
 #: View/Attributes/edit.ctp:24
-#: View/Events/add.ctp:24
+#: View/Events/add.ctp:20
 msgid "Distribution "
 msgstr ""
 
@@ -2082,7 +2364,7 @@ msgstr ""
 #: View/Attributes/add_attachment.ctp:33
 #: View/Attributes/edit.ctp:32
 #: View/Attributes/ajax/attributeEditMassForm.ctp:24
-#: View/Events/add.ctp:34
+#: View/Events/add.ctp:30
 #: View/Events/edit.ctp:26
 #: View/Feeds/add.ctp:176
 #: View/Feeds/edit.ctp:172
@@ -2109,23 +2391,24 @@ msgstr ""
 msgid "for Intrusion Detection System"
 msgstr ""
 
-#: View/Attributes/add.ctp:87
+#: View/Attributes/add.ctp:91
 #: View/Attributes/attribute_replace.ctp:38
-#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_mitre_attack_matrix.ctp:14;113
+#: View/Elements/view_galaxy_matrix.ctp:76;199
 #: View/Events/contact.ctp:29
 #: View/Events/edit.ctp:59
 #: View/Events/free_text_import.ctp:27
 #: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:78
+#: View/ObjectReferences/ajax/add.ctp:130
 #: View/Objects/add.ctp:147
 #: View/Objects/revise_object.ctp:85
 #: View/Organisations/admin_add.ctp:49
 #: View/Organisations/admin_edit.ctp:60
-#: View/Servers/add.ctp:126
-#: View/Servers/edit.ctp:167
-#: View/SharingGroups/add.ctp:75
+#: View/Servers/add.ctp:115
+#: View/Servers/edit.ctp:162
+#: View/SharingGroups/add.ctp:115
+#: View/TagCollections/add.ctp:21
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
 #: View/TemplateElements/ajax/template_element_add_file.ctp:67
 #: View/TemplateElements/ajax/template_element_add_text.ctp:29
@@ -2134,7 +2417,7 @@ msgstr ""
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:29
 #: View/Users/admin_add.ctp:97
 #: View/Users/admin_edit.ctp:91
-#: View/Users/admin_email.ctp:51
+#: View/Users/admin_email.ctp:54
 #: View/Users/admin_quick_email.ctp:23
 #: View/Users/change_pw.ctp:23
 #: View/Users/edit.ctp:41
@@ -2142,14 +2425,17 @@ msgstr ""
 msgid "Submit"
 msgstr "Enviar"
 
-#: View/Attributes/add.ctp:88
+#: View/Attributes/add.ctp:92
 #: View/Attributes/attribute_replace.ctp:44
-#: View/Attributes/ajax/attributeEditMassForm.ctp:62
+#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/exportSearch.ctp:32
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Elements/eventattributecreation.ctp:89
-#: View/Elements/view_mitre_attack_matrix.ctp:114
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/view_galaxy_matrix.ctp:200
 #: View/Elements/serverRuleElements/pull.ctp:70
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2158,21 +2444,18 @@ msgstr "Enviar"
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/ajax/enrich_event.ctp:21
+#: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:15
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/exportChoice.ctp:51
 #: View/Events/ajax/importChoice.ctp:12
 #: View/Events/ajax/quick_edit.ctp:6
-#: View/Galaxies/ajax/cluster_choice.ctp:32
-#: View/Galaxies/ajax/galaxy_choice.ctp:22
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:15
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
-#: View/ObjectReferences/ajax/add.ctp:82
+#: View/ObjectReferences/ajax/add.ctp:134
 #: View/ObjectReferences/ajax/delete.ctp:37
-#: View/ObjectTemplates/ajax/object_choice.ctp:10
 #: View/Objects/add.ctp:153
 #: View/Objects/revise_object.ctp:87
 #: View/Objects/ajax/delete.ctp:24
@@ -2187,11 +2470,12 @@ msgstr "Enviar"
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
 #: View/Sightings/ajax/advanced.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
-#: View/Tags/ajax/select_tag.ctp:32
-#: View/Tags/ajax/taxonomy_choice.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:6
 #: View/TemplateElements/ajax/template_element_add_file.ctp:73
@@ -2201,6 +2485,7 @@ msgstr "Enviar"
 #: View/TemplateElements/ajax/template_element_edit_text.ctp:35
 #: View/Templates/ajax/template_choices.ctp:15
 #: View/Users/admin_filter_user_index.ctp:107
+#: View/Users/ajax/emailConfirmTemplate.ctp:14
 #: View/Users/ajax/fetchpgpkey.ctp:24
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
@@ -2239,8 +2524,6 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:4
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_view.ctp:14
-#: View/Users/view.ctp:14
 msgid "Org"
 msgstr ""
 
@@ -2255,7 +2538,7 @@ msgid "Event date"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Event graph"
 msgstr ""
 
@@ -2283,12 +2566,12 @@ msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:26
 #: View/Noticelists/view.ctp:36
-#: View/Warninglists/view.ctp:54
+#: View/Warninglists/view.ctp:35
 msgid "Values"
 msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:33;41
-#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+#: View/Attributes/ajax/attributeEditMassForm.ctp:75
 #: View/Elements/eventattributecreation.ctp:86
 #: View/Events/free_text_import.ctp:22
 #: View/ShadowAttributes/add.ctp:46
@@ -2322,7 +2605,7 @@ msgstr ""
 msgid "disabled"
 msgstr "desactivado"
 
-#: View/Attributes/edit.ctp:64
+#: View/Attributes/edit.ctp:68
 #: View/ShadowAttributes/add.ctp:55
 #: View/ShadowAttributes/edit.ctp:45;54
 msgid "Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this."
@@ -2330,7 +2613,7 @@ msgstr ""
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -2338,10 +2621,6 @@ msgstr ""
 msgid "Attributes"
 msgstr ""
 
-#: View/Attributes/index.ctp:7
-msgid "Results for all attributes"
-msgstr ""
-
 #: View/Attributes/index.ctp:8
 msgid " with the value containing "
 msgstr ""
@@ -2354,57 +2633,67 @@ msgstr ""
 msgid " from the events "
 msgstr ""
 
-#: View/Attributes/index.ctp:12
-msgid " of category "
+#: View/Attributes/index.ctp:11
+msgid " carrying the tag(s) "
 msgstr ""
 
-#: View/Attributes/index.ctp:13
+#: View/Attributes/index.ctp:12
 msgid " of type "
 msgstr ""
 
-#: View/Attributes/index.ctp:14
-msgid " created by the organisation "
+#: View/Attributes/index.ctp:13
+msgid " of category "
 msgstr ""
 
-#: View/Attributes/index.ctp:28;173
-#: View/Elements/eventattribute.ctp:60;258
+#: View/Attributes/index.ctp:14
+msgid " created by organisation "
+msgstr ""
+
+#: View/Attributes/index.ctp:26
+msgid "Results for all attributes"
+msgstr ""
+
+#: View/Attributes/index.ctp:39;132
+#: View/Elements/eventattribute.ctp:60;229
 #: View/Elements/eventdiscussion.ctp:15;126
+#: View/Elements/generic_table.ctp:16
+#: View/Elements/generic_table_row.ctp:16
 #: View/Elements/Feeds/eventattribute.ctp:20;86
 #: View/Elements/Servers/eventattribute.ctp:20;86
 #: View/EventBlacklists/index.ctp:13;54
-#: View/Events/index.ctp:12;89
+#: View/Events/index.ctp:12;115
 #: View/Events/proposal_event_index.ctp:12;95
 #: View/Events/ajax/index.ctp:13;39
 #: View/Feeds/freetext_index.ctp:22;86
-#: View/Feeds/index.ctp:20;230
-#: View/Feeds/preview_index.ctp:14;82
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
 #: View/Galaxies/index.ctp:13;53
-#: View/GalaxyClusters/ajax/index.ctp:11;96
+#: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:33;162
-#: View/Logs/admin_index.ctp:37;111
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
 #: View/Logs/event_index.ctp:17;61
 #: View/News/index.ctp:39
 #: View/Noticelists/index.ctp:13;83
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
-#: View/ObjectTemplates/index.ctp:13;126
+#: View/ObjectTemplates/index.ctp:13;137
 #: View/OrgBlacklists/index.ctp:13;52
-#: View/Organisations/index.ctp:42;138
+#: View/Organisations/index.ctp:42;159
 #: View/Regexp/admin_index.ctp:13;51
 #: View/Regexp/index.ctp:13;45
 #: View/Roles/admin_index.ctp:13;82
 #: View/Roles/index.ctp:13;55
-#: View/Servers/index.ctp:13;117
-#: View/Servers/preview_index.ctp:15;164
-#: View/ShadowAttributes/index.ctp:12;108
-#: View/SharingGroups/index.ctp:13;86
+#: View/Servers/index.ctp:13;156
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;63
-#: View/Taxonomies/view.ctp:53;169
+#: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:12;56
+#: View/Users/admin_index.ctp:12;86
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -2412,45 +2701,47 @@ msgstr ""
 msgid "previous"
 msgstr "anterior"
 
-#: View/Attributes/index.ctp:30;175
-#: View/Elements/eventattribute.ctp:62;260
+#: View/Attributes/index.ctp:41;134
+#: View/Elements/eventattribute.ctp:62;231
 #: View/Elements/eventdiscussion.ctp:17;128
+#: View/Elements/generic_table.ctp:18
+#: View/Elements/generic_table_row.ctp:18
 #: View/Elements/Feeds/eventattribute.ctp:22;88
 #: View/Elements/Servers/eventattribute.ctp:22;88
 #: View/EventBlacklists/index.ctp:15;56
-#: View/Events/index.ctp:14;91
+#: View/Events/index.ctp:14;117
 #: View/Events/proposal_event_index.ctp:14;97
 #: View/Events/ajax/index.ctp:15;41
 #: View/Feeds/freetext_index.ctp:24;88
-#: View/Feeds/index.ctp:22;232
-#: View/Feeds/preview_index.ctp:16;84
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
 #: View/Galaxies/index.ctp:15;55
-#: View/GalaxyClusters/ajax/index.ctp:13;98
+#: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:35;164
-#: View/Logs/admin_index.ctp:39;113
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
 #: View/Logs/event_index.ctp:19;63
 #: View/News/index.ctp:41
 #: View/Noticelists/index.ctp:15;85
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
-#: View/ObjectTemplates/index.ctp:15;128
+#: View/ObjectTemplates/index.ctp:15;139
 #: View/OrgBlacklists/index.ctp:15;54
-#: View/Organisations/index.ctp:44;140
+#: View/Organisations/index.ctp:44;161
 #: View/Regexp/admin_index.ctp:15;53
 #: View/Regexp/index.ctp:15;47
 #: View/Roles/admin_index.ctp:15;84
 #: View/Roles/index.ctp:15;57
-#: View/Servers/index.ctp:15;119
-#: View/Servers/preview_index.ctp:17;166
-#: View/ShadowAttributes/index.ctp:14;110
-#: View/SharingGroups/index.ctp:15;88
+#: View/Servers/index.ctp:15;158
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;65
-#: View/Taxonomies/view.ctp:55;171
+#: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:14;58
+#: View/Users/admin_index.ctp:14;88
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -2458,66 +2749,144 @@ msgstr "anterior"
 msgid "next"
 msgstr "siguiente"
 
-#: View/Attributes/index.ctp:148
-msgid "Are you sure you want to delete this attribute?"
+#: View/Attributes/index.ctp:53
+#: View/Elements/eventattribute.ctp:152
+#: View/Elements/Events/eventIndexTable.ctp:37
+#: View/Elements/Feeds/eventattribute.ctp:45
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/view.ctp:117
+#: View/Feeds/preview_event.ctp:16
+#: View/Noticelists/view.ctp:43
+#: View/Pages/doc/using_the_system.ctp:164;207;318
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
+#: View/Tags/index.ctp:10
+#: View/Templates/add.ctp:12
+#: View/Templates/edit.ctp:12
+#: View/Templates/view.ctp:19
+msgid "Tags"
 msgstr ""
 
-#: View/Attributes/index.ctp:151
-msgid "Propose an edit"
+#: View/Attributes/index.ctp:54
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/Galaxies/index.ctp:2
+msgid "Galaxies"
 msgstr ""
 
-#: View/Attributes/index.ctp:155
-#: View/Elements/Events/eventIndexTable.ctp:82;86;229
-#: View/Elements/Users/userIndexTable.ctp:94
-#: View/Elements/dashboard/dashboard_events.ctp:4;5
-#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
-#: View/Events/proposal_event_index.ctp:45;49
-#: View/Feeds/preview_index.ctp:66
-#: View/Noticelists/index.ctp:66
-#: View/ObjectTemplates/index.ctp:104
-#: View/Organisations/index.ctp:122
-#: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/preview_index.ctp:148
-#: View/Taxonomies/index.ctp:47
-#: View/Warninglists/index.ctp:60
-msgid "View"
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:161
+msgid "Correlate"
 msgstr ""
 
-#: View/Attributes/index.ctp:166
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Events/view.ctp:314
+#: View/Feeds/preview_event.ctp:73
+#: View/Pages/doc/using_the_system.ctp:235
+#: View/Servers/preview_event.ctp:95
+msgid "Related Events"
+msgstr ""
+
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:163
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+msgid "Feed hits"
+msgstr ""
+
+#: View/Attributes/index.ctp:61
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
+msgid "Sightings"
+msgstr ""
+
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
+#: View/Tags/index.ctp:73
+msgid "Activity"
+msgstr ""
+
+#: View/Attributes/index.ctp:63
+#: View/Elements/eventattribute.ctp:168
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/healthElements/files.ctp:33
+#: View/Elements/healthElements/workers.ctp:60
+#: View/Elements/templateElements/templateRowAttribute.ctp:94
+#: View/Elements/templateElements/templateRowFile.ctp:71
+#: View/Elements/templateElements/templateRowText.ctp:28
+#: View/EventBlacklists/index.ctp:27
+#: View/Events/export.ctp:31
+#: View/Events/resolved_attributes.ctp:53
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:51
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:66
+#: View/OrgBlacklists/index.ctp:26
+#: View/Organisations/index.ctp:102
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:25
+#: View/Roles/admin_index.ctp:35
+#: View/Servers/index.ctp:37
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:27
+#: View/Templates/index.ctp:27
+#: View/Threads/index.ctp:28
+#: View/Warninglists/index.ctp:38
+#: View/Whitelists/admin_index.ctp:24
+msgid "Actions"
+msgstr ""
+
+#: View/Attributes/index.ctp:125
 #: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
 #: View/EventBlacklists/index.ctp:47
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:223
-#: View/Feeds/preview_index.ctp:74
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
 #: View/Galaxies/index.ctp:46
-#: View/GalaxyClusters/ajax/index.ctp:90
+#: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:155
-#: View/Logs/admin_index.ctp:104
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
 #: View/Logs/event_index.ctp:54
 #: View/News/index.ctp:33
 #: View/Noticelists/index.ctp:76
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:66
-#: View/ObjectTemplates/index.ctp:119
+#: View/ObjectTemplates/index.ctp:130
 #: View/OrgBlacklists/index.ctp:45
-#: View/Organisations/index.ctp:131
+#: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
 #: View/Roles/admin_index.ctp:75
 #: View/Roles/index.ctp:48
-#: View/Servers/index.ctp:110
-#: View/Servers/preview_index.ctp:156
-#: View/ShadowAttributes/index.ctp:101
-#: View/SharingGroups/index.ctp:79
+#: View/Servers/index.ctp:149
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:56
-#: View/Taxonomies/view.ctp:162
+#: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:49
+#: View/Users/admin_index.ctp:79
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -2564,26 +2933,22 @@ msgid "Containing the following expressions"
 msgstr ""
 
 #: View/Attributes/search.ctp:11
-msgid "Being an attribute matching the following tags"
+msgid "Having tag or being an attribute of an event having the tag"
 msgstr ""
 
 #: View/Attributes/search.ctp:12
 msgid "Being attributes of the following event IDs, event UUIDs or attribute UUIDs"
 msgstr ""
 
-#: View/Attributes/search.ctp:13
-msgid "Being an attribute of an event matching the following tags"
-msgstr ""
-
-#: View/Attributes/search.ctp:20
+#: View/Attributes/search.ctp:15
 msgid "From the following organisation(s)"
 msgstr ""
 
-#: View/Attributes/search.ctp:36
-msgid "Only find IOCs to use in IDS"
+#: View/Attributes/search.ctp:29
+msgid "Only find IOCs flagged as to_ids"
 msgstr ""
 
-#: View/Attributes/search.ctp:40
+#: View/Attributes/search.ctp:33
 msgid "Alternate Search Result (Events)"
 msgstr ""
 
@@ -2601,26 +2966,26 @@ msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90
-#: View/Elements/galaxyQuickView.ctp:23
-#: View/Elements/side_menu.ctp:351
-#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/eventIndexTable.ctp:229
 #: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:30
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Roles/admin_index.ctp:67
-#: View/Servers/index.ctp:99
+#: View/Servers/index.ctp:138
 #: View/Tags/index.ctp:125
 msgid "Delete"
 msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
@@ -2634,34 +2999,36 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:56
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:168
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
 #: View/Events/ajax/handleSelected.ctp:17
 #: View/Events/ajax/toggle_correlation.ctp:20
 #: View/Feeds/preview_event.ctp:56
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:79
 #: View/Servers/ajax/update.ctp:11
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
 #: View/Templates/view.ctp:41
-#: View/Users/admin_view.ctp:32;37;104;114;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:27
 msgid "Yes"
 msgstr "Si"
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:21
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
@@ -2675,29 +3042,30 @@ msgstr "Si"
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:58;176
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:166
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:28
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/handleSelected.ctp:22
 #: View/Events/ajax/toggle_correlation.ctp:25
 #: View/Feeds/preview_event.ctp:61;66
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:89
 #: View/Servers/ajax/update.ctp:16
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
 #: View/Templates/view.ctp:42
-#: View/Users/admin_view.ctp:32;37;106;116;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
 msgid "No"
@@ -2706,7 +3074,6 @@ msgstr "No"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:5
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:5
 #: View/Attributes/ajax/attributeEditValueForm.ctp:6
 msgid "Accept change"
@@ -2715,7 +3082,6 @@ msgstr "Aceptar cambio"
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:6
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
 msgid "Discard change"
@@ -2732,7 +3098,7 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/view.ctp:143
+#: View/Events/view.ctp:145
 #: View/Feeds/add.ctp:167
 #: View/Feeds/edit.ctp:164
 #: View/Feeds/freetext_index.ctp:36
@@ -2754,6 +3120,50 @@ msgstr ""
 msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
 msgstr ""
 
+#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+msgid "Tags to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+msgid "Tags to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+msgid "Clusters to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+msgid "Clusters to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
 #: View/Attributes/ajax/attributeRestorationForm.ctp:5
 msgid "Attribute Restoration"
 msgstr ""
@@ -2762,6 +3172,15 @@ msgstr ""
 msgid "Are you sure you want to undelete Attribute #%s?"
 msgstr ""
 
+#: View/Attributes/ajax/exportSearch.ctp:2
+msgid "Choose the format that you wish to download the search results in"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:10;23
+#: View/Events/ajax/exportChoice.ctp:17;18;27;28
+msgid "Export as %s"
+msgstr ""
+
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
 msgid "Remove Tag"
 msgstr ""
@@ -2782,16 +3201,6 @@ msgstr ""
 msgid "Toggle Correlation %s "
 msgstr ""
 
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "on"
-msgstr ""
-
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "off"
-msgstr ""
-
 #: View/Attributes/ajax/toggle_correlation.ctp:11
 msgid "Re-enable the correlation for this attribute."
 msgstr ""
@@ -2804,13 +3213,21 @@ msgstr ""
 msgid "Toggle correlation for attribute"
 msgstr ""
 
-#: View/Elements/ajaxAttributeTags.ctp:25
+#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Elements/ajaxTagCollectionTags.ctp:16
 #: View/Elements/ajaxTags.ctp:14
 #: View/Elements/ajaxTemplateTag.ctp:10
 #: View/Elements/serverRuleElements/ajaxTags.ctp:17
 msgid "Remove tag"
 msgstr ""
 
+#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Pages/doc/using_the_system.ctp:303
+#: View/Templates/add.ctp:17
+#: View/Templates/edit.ctp:17
+msgid "Add tag"
+msgstr ""
+
 #: View/Elements/ajaxTags.ctp:17
 msgid "Remove tag %s"
 msgstr ""
@@ -2821,215 +3238,33 @@ msgstr ""
 msgid "Add a tag"
 msgstr "Añadir una etiqueta"
 
-#: View/Elements/eventattribute.ctp:71;269
+#: View/Elements/eventattribute.ctp:71;240
 #: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
 #: View/Elements/Servers/eventattribute.ctp:28;31;94;97
 msgid "view all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:117
-#: View/Pages/doc/using_the_system.ctp:86
-msgid "Add attribute"
-msgstr "Añadir atributo"
-
-#: View/Elements/eventattribute.ctp:118
-msgid "Edit selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:119
-msgid "Tag selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:120
-msgid "Delete selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:121
-msgid "Accept selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:122
-msgid "Discard selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:123
-msgid "Sightings display for selected attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:127
-msgid "Populate using a template"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:129
-msgid "Populate using the freetext import tool"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:131
-msgid "Replace all attributes of a category/type combination within the event"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:140;159
-msgid "Show all attributes"
-msgstr "Mostrar todos los atributos"
-
-#: View/Elements/eventattribute.ctp:144
-msgid "Only show %s related attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:148
-msgid "Only show proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:148
-#: View/Logs/event_index.ctp:44
-msgid "Proposal"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:149
-msgid "Only show correlating attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Only show potentially false positive attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Warnings"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:152
-msgid "Include deleted attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show attribute context fields"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:154
-msgid "Show context fields"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:157
-msgid "Filter on attributes value"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:159
-#: View/Events/index.ctp:41
-#: View/Servers/preview_index.ctp:42
-#: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:37
-msgid "Remove filters"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:170
+#: View/Elements/eventattribute.ctp:134
 msgid "Select all attributes/proposals on current page"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:188
-#: View/Elements/Events/eventIndexTable.ctp:37
-#: View/Elements/Feeds/eventattribute.ctp:45
-#: View/Elements/Servers/eventattribute.ctp:45
-#: View/Events/resolved_attributes.ctp:52
-#: View/Events/view.ctp:121
-#: View/Feeds/preview_event.ctp:16
-#: View/Noticelists/view.ctp:43
-#: View/Pages/doc/using_the_system.ctp:164;207;318
-#: View/Servers/preview_event.ctp:27
-#: View/Servers/preview_index.ctp:68
-#: View/Tags/index.ctp:10
-#: View/Templates/add.ctp:12
-#: View/Templates/edit.ctp:12
-#: View/Templates/view.ctp:19
-msgid "Tags"
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:189
-#: View/Elements/global_menu.ctp:56
-#: View/Events/view.ctp:387
-#: View/Galaxies/index.ctp:2
-msgid "Galaxies"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:191
-msgid "Correlate"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:192
-#: View/Elements/Feeds/eventattribute.ctp:47
-#: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:263
-#: View/Feeds/preview_event.ctp:73
-#: View/Pages/doc/using_the_system.ctp:235
-#: View/Servers/preview_event.ctp:95
-msgid "Related Events"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:193
-#: View/Elements/Feeds/eventattribute.ctp:48
-#: View/Elements/Servers/eventattribute.ctp:48
-msgid "Feed hits"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:196
-#: View/Events/view.ctp:198
-msgid "Sightings"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:197
-#: View/Events/view.ctp:205
-#: View/Tags/index.ctp:73
-msgid "Activity"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:198
-#: View/Elements/Users/userIndexTable.ctp:26
-#: View/Elements/healthElements/files.ctp:33
-#: View/Elements/healthElements/workers.ctp:55
-#: View/Elements/templateElements/templateRowAttribute.ctp:94
-#: View/Elements/templateElements/templateRowFile.ctp:71
-#: View/Elements/templateElements/templateRowText.ctp:28
-#: View/EventBlacklists/index.ctp:27
-#: View/Events/export.ctp:31
-#: View/Events/resolved_attributes.ctp:53
-#: View/Feeds/index.ctp:61
-#: View/Feeds/preview_index.ctp:38
-#: View/GalaxyClusters/ajax/index.ctp:51
-#: View/Noticelists/index.ctp:37
-#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:55
-#: View/OrgBlacklists/index.ctp:26
-#: View/Organisations/index.ctp:81
-#: View/Pages/doc/using_the_system.ctp:187;238;286;382
-#: View/Regexp/admin_index.ctp:25
-#: View/Roles/admin_index.ctp:35
-#: View/Servers/index.ctp:36
-#: View/Servers/preview_index.ctp:80
-#: View/SharingGroups/add.ctp:34;54
-#: View/SharingGroups/edit.ctp:34;62
-#: View/SharingGroups/index.ctp:30
-#: View/Sightings/ajax/list_sightings.ctp:11
-#: View/Tags/index.ctp:76
-#: View/Taxonomies/index.ctp:27
-#: View/Templates/index.ctp:27
-#: View/Threads/index.ctp:28
-#: View/Warninglists/index.ctp:38
-#: View/Whitelists/admin_index.ctp:24
-msgid "Actions"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:238
+#: View/Elements/eventattribute.ctp:209
 msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
 "a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
 "attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:242
+#: View/Elements/eventattribute.ctp:213
 msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
 msgstr ""
 
@@ -3037,6 +3272,140 @@ msgstr ""
 msgid "Create multiple attributes one per line"
 msgstr ""
 
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr "Mostrar todos los atributos"
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr "Añadir atributo"
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr ""
+
 #: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr ""
@@ -3046,14 +3415,14 @@ msgid "Deactivated user"
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:223
-#: View/Elements/Events/View/row_attribute.ctp:299
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/View/row_attribute.ctp:380
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/Feeds/edit.ctp:193
 #: View/OrgBlacklists/edit.ctp:22
 #: View/Pages/doc/using_the_system.ctp:191
-#: View/Servers/index.ctp:98
-#: View/Tags/edit.ctp:35
+#: View/Servers/index.ctp:137
+#: View/Tags/edit.ctp:36
 #: View/Templates/edit.ctp:49
 msgid "Edit"
 msgstr ""
@@ -3081,12 +3450,12 @@ msgid "Insert a link to an event - just enter the event ID between the [event][/
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:180;191
+#: View/Events/view.ctp:196;207
 #: View/Objects/orphaned_object_diagnostics.ctp:21
 #: View/Pages/doc/administration.ctp:167
 #: View/Pages/doc/using_the_system.ctp:200;279
 #: View/Posts/add.ctp:33
-#: View/ShadowAttributes/index.ctp:31
+#: View/ShadowAttributes/index.ctp:41
 msgid "Event"
 msgstr ""
 
@@ -3121,9 +3490,19 @@ msgid "Code"
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:156
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
 msgid "Send"
 msgstr ""
 
+#: View/Elements/flashErrorMessage.ctp:2
+msgid "Errors"
+msgstr ""
+
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Jobs/ajax/error.ctp:34
+msgid "Close"
+msgstr ""
+
 #: View/Elements/footer.ctp:5
 msgid "Keyboard shortcuts for this page"
 msgstr ""
@@ -3135,8 +3514,8 @@ msgstr ""
 #: View/Elements/footer.ctp:15
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:60
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
 msgid "GnuPG key"
 msgstr ""
 
@@ -3152,32 +3531,36 @@ msgstr ""
 msgid "View details about this galaxy"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:17
+#: View/Elements/galaxyQuickView.ctp:19
 #: View/Elements/galaxyQuickViewMini.ctp:69
 msgid "View details about this cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickView.ctp:18
+#: View/Elements/galaxyQuickView.ctp:20
 #: View/Elements/galaxyQuickViewMini.ctp:70
 msgid "View all events containing this cluster."
 msgstr ""
 
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
 #: View/Elements/galaxyQuickView.ctp:24
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:76
+#: View/Elements/galaxyQuickViewMini.ctp:74
 msgid "Are you sure you want to detach %s from this %s?"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 msgid "Add new cluster"
 msgstr ""
 
-#: View/Elements/galaxyQuickViewMini.ctp:91
+#: View/Elements/galaxyQuickViewMini.ctp:89
 #: View/EventBlacklists/add.ctp:35
 #: View/EventBlacklists/edit.ctp:29
-#: View/Events/add.ctp:72
+#: View/Events/add.ctp:68
 #: View/Events/filter_event_index.ctp:125
 #: View/Feeds/add.ctp:198
 #: View/Feeds/import_feeds.ctp:19
@@ -3187,113 +3570,139 @@ msgstr ""
 #: View/Roles/admin_add.ctp:44
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 #: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:19
 #: View/Tags/add.ctp:35
 #: View/Users/admin_filter_user_index.ctp:62
 #: View/Whitelists/admin_add.ctp:13
 msgid "Add"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/side_menu.ctp:174;188
+#: View/Elements/generic_picker.ctp:205
+msgid "Due to the large number of options, no contextual information is provided."
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:273
+msgid "Nothing to pick"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:11
+#: View/Pages/doc/general.ctp:20
+msgid "Event Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:26
-#: View/Elements/side_menu.ctp:179;194
-#: View/Events/add.ctp:8
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
+#: View/Events/add.ctp:4
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:28
-#: View/Elements/side_menu.ctp:213
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/side_menu.ctp:218
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:30
-#: View/Elements/side_menu.ctp:206
-#: View/Servers/rest.ctp:4
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
+#: View/Servers/rest.ctp:20
 msgid "REST client"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:32
-#: View/Elements/side_menu.ctp:238
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:35
-#: View/Elements/side_menu.ctp:446
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
+#: View/Pages/doc/general.ctp:39
+msgid "Events with proposals"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:37
-#: View/Elements/side_menu.ctp:450
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
+msgid "List Tag Collections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 #: View/Tags/edit.ctp:4
 msgid "Add Tag"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:39
-#: View/Elements/side_menu.ctp:471
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:41
-#: View/Elements/side_menu.ctp:485
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:43
-#: View/Elements/side_menu.ctp:487
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:46
-#: View/Elements/side_menu.ctp:247
+#: View/Elements/global_menu.ctp:78
 #: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:48
-#: View/Elements/side_menu.ctp:253
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
+#: View/Events/legacy_automation.ctp:2
 #: View/Pages/doc/general.ctp:45
 #: View/Pages/doc/using_the_system.ctp:15;361
 msgid "Automation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:60
-#: View/Elements/side_menu.ctp:529
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:67
+#: View/Elements/global_menu.ctp:101
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:72;76
+#: View/Elements/global_menu.ctp:104;109
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -3302,7 +3711,7 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:73;77
+#: View/Elements/global_menu.ctp:114;119
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -3311,82 +3720,88 @@ msgstr ""
 msgid "Signature Whitelist"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:79
-#: View/Elements/side_menu.ctp:274
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:80
-#: View/Elements/side_menu.ctp:283
+#: View/Elements/global_menu.ctp:128
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:90
+#: View/Elements/global_menu.ctp:135
+#: View/Pages/doc/general.ctp:22;54
+msgid "Global Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:139
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:91
-#: View/Elements/side_menu.ctp:311
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:92;203
-#: View/Elements/side_menu.ctp:312
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:96
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
-#: View/Users/statistics_data.ctp:32
+#: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:100
-#: View/Elements/side_menu.ctp:325
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:102
-#: View/Elements/side_menu.ctp:552
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:104
-#: View/Elements/side_menu.ctp:331
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:106
-#: View/Elements/side_menu.ctp:332
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:109
-#: View/Elements/side_menu.ctp:334
-#: View/Events/automation.ctp:42
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
+#: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:110
-#: View/Elements/side_menu.ctp:335
-#: View/Pages/doc/general.ctp:61
-#: View/Pages/doc/user_management.ctp:54
-msgid "Terms &amp; Conditions"
+#: View/Elements/global_menu.ctp:186
+msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:111
-#: View/Elements/side_menu.ctp:336
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -3399,30 +3814,34 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:113
+#: View/Elements/global_menu.ctp:201
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:114
+#: View/Elements/global_menu.ctp:205
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:125
-#: View/Elements/side_menu.ctp:354
+#: View/Elements/global_menu.ctp:212
+#: View/Pages/doc/general.ctp:23;66
+msgid "Sync Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:127
-#: View/Elements/side_menu.ctp:501
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:136
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/administration.ctp:8
-#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
 #: View/Pages/doc/quickstart.ctp:8
@@ -3431,95 +3850,100 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:140
-#: View/Elements/side_menu.ctp:376
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:141
-#: View/Elements/side_menu.ctp:375
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
 msgid "Add User"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:142
-#: View/Elements/side_menu.ctp:379
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:144
-#: View/Elements/side_menu.ctp:316;391
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
 msgid "List Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:146
-#: View/Elements/side_menu.ctp:383
-msgid "Add Organisation"
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:149
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:151
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-msgid "Maintenance"
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:158
-#: View/Elements/side_menu.ctp:401
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:160
-#: View/Elements/side_menu.ctp:403
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:165
-#: View/Elements/side_menu.ctp:407
+#: View/Elements/global_menu.ctp:300
+msgid "Blacklist Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
 msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:169
+#: View/Elements/global_menu.ctp:314
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:170
-#: View/Elements/side_menu.ctp:411
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
 msgid "Manage Org Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:180
+#: View/Elements/global_menu.ctp:327
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:184
-#: View/Elements/side_menu.ctp:417
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:185
-#: View/Elements/side_menu.ctp:418
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:207;209
+#: View/Elements/global_menu.ctp:362;367
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -3540,407 +3964,8 @@ msgstr ""
 msgid "Attributes per organization"
 msgstr ""
 
-#: View/Elements/side_menu.ctp:17;78
-msgid "Populate From Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:24
-msgid "Freetext Import Result"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:31
-msgid "View Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:36;465;540
-msgid "View Correlation Graph"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:41
-msgid "View Event History"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:48
-#: View/Events/edit.ctp:8
-msgid "Edit Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:50
-msgid "Delete Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:50;267;298;351;371
-#: View/Elements/Events/eventIndexTable.ctp:226
-#: View/Servers/index.ctp:99
-msgid "Are you sure you want to delete # %s?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:61
-msgid "Add Object"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:66
-msgid "Add Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:73
-msgid "Populate from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:86
-#: View/Events/ajax/enrich_event.ctp:2
-msgid "Enrich Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:91
-msgid "Merge attributes from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:98
-msgid "Propose Attribute"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:103
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:115
-#: View/Elements/Events/eventIndexTable.ctp:218
-msgid "Publish Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:123
-msgid "Publish (no email)"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:132
-msgid "Delegate Publishing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:143
-#: View/EventDelegations/ajax/accept_delegation.ctp:2
-msgid "Accept Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:151
-msgid "Discard Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:157
-msgid "Publish event to ZMQ"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:162
-msgid "Contact Reporter"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:169
-msgid "Download as..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:201
-msgid "Import from…"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:224
-msgid "Download results as JSON"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:228
-msgid "Download results as XML"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:232
-msgid "Download results as CSV"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:242
-#: View/Pages/doc/general.ctp:39
-msgid "Events with proposals"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:259
-msgid "List Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:261
-msgid "New Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:262
-msgid "Perform on existing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:266
-msgid "Edit Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:267
-msgid "Delete Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:273
-msgid "View Warninglist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:276
-msgid "Update Warninglists"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:282
-msgid "View Noticelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:285
-msgid "Update Noticelists"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:291
-msgid "List Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:293
-msgid "New Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:297
-msgid "Edit Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:298
-msgid "Delete Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:305
-#: View/Users/edit.ctp:4
-msgid "Edit My Profile"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:306
-#: View/Pages/doc/administration.ctp:126
-#: View/Users/admin_edit.ctp:70
-#: View/Users/change_pw.ctp:4
-msgid "Change Password"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:321;389
-msgid "View Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:328
-#: View/SharingGroups/edit.ctp:3
-msgid "Edit Sharing Group"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:329
-msgid "View Sharing Group"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:342
-msgid "Explore Remote Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:343
-msgid "Fetch This Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:343
-#: View/Feeds/preview_index.ctp:65
-#: View/Servers/preview_index.ctp:147
-msgid "Are you sure you want to fetch and save this event on your instance?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:344;347
-msgid "Explore Remote Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:350
-#: View/Servers/edit.ctp:4
-msgid "Edit Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:356
-msgid "New Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:363
-msgid "View User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:364
-msgid "Reset Password"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:365
-msgid "Edit User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:366
-msgid "Delete User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:366
-#: View/Elements/Users/userIndexTable.ctp:91
-msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:370
-#: View/Roles/admin_edit.ctp:4
-msgid "Edit Role"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:371
-msgid "Delete Role"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:385
-#: View/Organisations/admin_edit.ctp:4
-msgid "Edit Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:386
-#: View/Organisations/ajax/merge.ctp:5
-msgid "Merge Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:398
-#: View/Servers/server_settings.ctp:5
-msgid "Server Settings & Maintenance"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:406
-msgid "Blacklists Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:410
-msgid "Blacklists Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:426;433
-msgid "View Thread"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:427
-#: View/Posts/add.ctp:4
-msgid "Add Post"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:434
-#: View/Posts/edit.ctp:4
-msgid "Edit Post"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:439
-msgid "List Threads"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:440
-msgid "New Thread"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:445
-msgid "List Favourite Tags"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:455
-msgid "Edit Tag"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:461;473
-msgid "View Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:474
-msgid "Delete Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:492
-msgid "View Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:494
-#: View/Templates/edit.ctp:6
-msgid "Edit Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:502
-msgid "Add Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:503
-msgid "Import Feeds from JSON"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:504
-#: View/Feeds/compare_feeds.ctp:7
-msgid "Feed overlap analysis matrix"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:505
-msgid "Export Feed settings"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:507
-msgid "Edit Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:509
-msgid "PreviewIndex"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:511
-msgid "PreviewEvent"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:516
-msgid "View News"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:520
-#: View/News/add.ctp:6
-msgid "Add News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:522
-#: View/News/edit.ctp:6
-msgid "Edit News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:533
-msgid "Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:533
-msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:534
-msgid "Force Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:534
-msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:538;546
-msgid "View Galaxy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:539
-msgid "View Cluster"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:556
-msgid "Update Objects"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:561
-msgid "View Object Template"
-msgstr ""
-
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:84
+#: View/Layouts/default.ctp:87
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -3975,8 +4000,11 @@ msgid "Display"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Jobs/index.ctp:62
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
 #: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr ""
 
@@ -3989,12 +4017,12 @@ msgstr ""
 msgid "Toggle fullscreen"
 msgstr ""
 
-#: View/Elements/view_mitre_attack_matrix.ctp:27
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all events on current page"
 msgstr ""
 
@@ -4034,35 +4062,58 @@ msgstr ""
 msgid "#Posts"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:167
-msgid " correlation(s)"
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/dashboard/dashboard_events.ctp:4;5
+#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
+#: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/preview_index.ctp:174
+#: View/Taxonomies/index.ctp:47
+#: View/Warninglists/index.ctp:60
+msgid "View"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:177;182
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:187
+#: View/Elements/Events/eventIndexTable.ctp:190
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:207
-#: View/Jobs/index.ctp:15;63
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-msgid "All"
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:218
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:12
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
 msgid "Are you sure this event is complete and everyone should be informed?"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:219
+#: View/Elements/Events/eventIndexTable.ctp:222
 msgid "Not published"
 msgstr ""
 
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr ""
+
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid "Show "
 msgstr ""
@@ -4072,51 +4123,66 @@ msgid " more..."
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:295
+#: View/Events/view.ctp:346
 msgid "Collapse…"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:262
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr ""
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:343
 msgid "Restore attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:263;303
+#: View/Elements/Events/View/row_attribute.ctp:344;384
 msgid "Permanently delete attribute"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Query enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:270
+#: View/Elements/Events/View/row_attribute.ctp:351
 msgid "Propose enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Query Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:275
+#: View/Elements/Events/View/row_attribute.ctp:356
 msgid "Propose enrichment through Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:279
+#: View/Elements/Events/View/row_attribute.ctp:360
 msgid "Propose Edit"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:280
+#: View/Elements/Events/View/row_attribute.ctp:361
 msgid "Propose Deletion"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:290;295
+#: View/Elements/Events/View/row_attribute.ctp:371;376
 msgid "Add enrichment"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:295
+#: View/Elements/Events/View/row_attribute.ctp:376
 msgid "Add enrichment via Cortex"
 msgstr ""
 
-#: View/Elements/Events/View/row_attribute.ctp:307
+#: View/Elements/Events/View/row_attribute.ctp:388
 msgid "Soft-delete attribute"
 msgstr ""
 
@@ -4138,24 +4204,36 @@ msgid "Expand or Collapse"
 msgstr ""
 
 #: View/Elements/Events/View/row_object.ctp:69
-msgid "Meta-category: "
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
 msgstr ""
 
 #: View/Elements/Events/View/row_object.ctp:70
+msgid "Meta-category: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:71
 #: View/Elements/Feeds/View/row_object.ctp:21
 msgid "Description: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Events/View/row_object.ctp:72
 #: View/Elements/Feeds/View/row_object.ctp:22
 msgid "Template: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Soft delete object"
 msgstr ""
 
@@ -4196,6 +4274,7 @@ msgstr ""
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
 #: View/Sightings/ajax/advanced.ctp:10
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 msgid "Add sighting"
 msgstr ""
 
@@ -4204,7 +4283,6 @@ msgid "Mark as false-positive"
 msgstr ""
 
 #: View/Elements/Events/View/sighting_field.ctp:14
-#: View/Events/view.ctp:203
 msgid "Advanced sightings"
 msgstr ""
 
@@ -4232,7 +4310,7 @@ msgstr ""
 
 #: View/Elements/Feeds/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object.ctp:20
-#: View/ObjectTemplates/view.ctp:19
+#: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:23
 msgid "Meta-category"
 msgstr ""
@@ -4247,7 +4325,7 @@ msgid "all"
 msgstr ""
 
 #: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/view.ctp:126
+#: View/Events/view.ctp:131
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
 #: View/Servers/preview_event.ctp:36
 #: View/Sightings/ajax/list_sightings.ctp:5
@@ -4273,12 +4351,13 @@ msgstr ""
 #: View/Elements/Servers/View/row_attribute.ctp:93
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/healthElements/files.ctp:61
-#: View/Elements/healthElements/workers.ctp:61;62;63
-#: View/Events/automation.ctp:403;410;417;438;445
+#: View/Elements/healthElements/workers.ctp:66;67;68
+#: View/Events/automation.ctp:234;241;248;269;276
 #: View/Events/export.ctp:68;88
-#: View/Taxonomies/view.ctp:96;107;152
-#: View/Users/admin_view.ctp:83;92;122
-#: View/Users/view.ctp:62
+#: View/Events/legacy_automation.ctp:403;410;417;438;445
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
 msgid "N/A"
 msgstr ""
 
@@ -4287,23 +4366,24 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
 #: View/Galaxies/view.ctp:14
-#: View/ObjectTemplates/view.ctp:11
+#: View/ObjectTemplates/view.ctp:4
 #: View/Objects/revise_object.ctp:19
 #: View/Organisations/ajax/merge.ctp:57;64
 #: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/view.ctp:9
-#: View/SharingGroups/add.ctp:11;31;51
-#: View/SharingGroups/edit.ctp:11;31;59
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
 #: View/SharingGroups/view.ctp:42;67
 #: View/Templates/view.ctp:9
 #: View/Users/statistics_orgs.ctp:31
-#: View/Warninglists/view.ctp:9
+#: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr ""
 
 #: View/Elements/Servers/View/row_object.ctp:21
 #: View/Elements/healthElements/files.ctp:8
-#: View/Elements/healthElements/settings_tab.ctp:16
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:10
 #: View/Elements/templateElements/populateTemplateDescription.ctp:12
 #: View/Elements/templateElements/populateTemplateFile.ctp:10
@@ -4311,19 +4391,19 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:27
 #: View/Galaxies/view.ctp:20
-#: View/ObjectTemplates/view.ctp:21
+#: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:16;94
-#: View/Organisations/view.ctp:32;89;90
+#: View/Organisations/view.ctp:15;58;59
 #: View/Pages/doc/administration.ctp:48;241
-#: View/Pages/doc/categories_and_types.ctp:50;67
+#: View/Pages/doc/categories_and_types.ctp:44;61
 #: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
 #: View/Servers/preview_event.ctp:65
-#: View/SharingGroups/add.ctp:15
-#: View/SharingGroups/edit.ctp:15
-#: View/SharingGroups/index.ctp:28
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
 #: View/Taxonomies/view.ctp:14
 #: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:14
+#: View/Warninglists/view.ctp:11
 msgid "Description"
 msgstr ""
 
@@ -4342,11 +4422,17 @@ msgstr ""
 msgid "Referenced by"
 msgstr ""
 
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
+
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:2
+#: View/Roles/view.ctp:24
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_view.ctp:19
-#: View/Users/view.ctp:19
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
 msgstr ""
 
@@ -4357,7 +4443,7 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:17
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:54
+#: View/ShadowAttributes/index.ctp:64
 msgid "Created"
 msgstr ""
 
@@ -4369,6 +4455,11 @@ msgstr ""
 msgid "Create new credentials and inform user"
 msgstr ""
 
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Elements/dashboard/dashboard_events.ctp:2
 msgid "Changes since last visit"
 msgstr ""
@@ -4397,6 +4488,417 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr ""
+
 #: View/Elements/healthElements/diagnostics.ctp:5
 msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
 msgstr ""
@@ -4421,11 +4923,10 @@ msgstr ""
 msgid "Outdated version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:26;156;170;195
-#: View/Elements/healthElements/workers.ctp:18;71
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
+#: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
-#: View/Users/admin_view.ctp:81
 msgid "OK"
 msgstr ""
 
@@ -4445,131 +4946,135 @@ msgstr ""
 msgid "Current branch…"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Pull the latest MISP version from github"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:64
+#: View/Elements/healthElements/diagnostics.ctp:62
 msgid "Update MISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:64
 msgid "Writeable Directories and files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:67
+#: View/Elements/healthElements/diagnostics.ctp:65
 msgid "The following directories and files have to be writeable for MISP to function properly. Make sure that the apache user has write privileges for the directories below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:68
+#: View/Elements/healthElements/diagnostics.ctp:66
 msgid "Directories"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:75
+#: View/Elements/healthElements/diagnostics.ctp:73
 msgid "Directory "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:83
+#: View/Elements/healthElements/diagnostics.ctp:81
 msgid "Writeable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:90;104
+#: View/Elements/healthElements/diagnostics.ctp:88;102
 msgid "File "
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:97
+#: View/Elements/healthElements/diagnostics.ctp:95
 msgid "Readable Files"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:112
+#: View/Elements/healthElements/diagnostics.ctp:110
 msgid "PHP Settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:115;127
+#: View/Elements/healthElements/diagnostics.ctp:113;125
 msgid "Up to date"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:121
-#: View/Elements/healthElements/workers.ctp:78;80
-#: View/Organisations/view.ctp:66
+#: View/Elements/healthElements/diagnostics.ctp:119
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
 msgid "Unknown"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:123
+#: View/Elements/healthElements/diagnostics.ctp:121
 msgid "Issues determining version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:130;139
+#: View/Elements/healthElements/diagnostics.ctp:128;137
 msgid "Update highly recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:133;142
+#: View/Elements/healthElements/diagnostics.ctp:131;140
 msgid "Version unsupported, update ASAP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:146
+#: View/Elements/healthElements/diagnostics.ctp:144
 msgid "PHP ini path"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:147
+#: View/Elements/healthElements/diagnostics.ctp:145
 msgid "PHP Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:147;148
+#: View/Elements/healthElements/diagnostics.ctp:145;146
 msgid "recommended"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:148
+#: View/Elements/healthElements/diagnostics.ctp:146
 msgid "PHP CLI Version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:149
+#: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
 msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:156
+#: View/Elements/healthElements/diagnostics.ctp:155
 #: View/Events/filter_event_index.ctp:32;190
 #: View/Pages/doc/using_the_system.ctp:66;171
 msgid "Low"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:160
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP Extensions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:170
+#: View/Elements/healthElements/diagnostics.ctp:169
 msgid "Not loaded"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:175
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:183
+#: View/Elements/healthElements/diagnostics.ctp:182
 msgid "Advanced attachment handler"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:184
+#: View/Elements/healthElements/diagnostics.ctp:183
 msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PyMISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:189
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:201
+#: View/Elements/healthElements/diagnostics.ctp:200
 msgid "STIX and Cybox libraries"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:202
+#: View/Elements/healthElements/diagnostics.ctp:201
 msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:203
+#: View/Elements/healthElements/diagnostics.ctp:202
 msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
 msgstr ""
 
@@ -4806,72 +5311,35 @@ msgid "Permissions"
 msgstr ""
 
 #: View/Elements/healthElements/files.ctp:73
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
 #: View/Roles/admin_index.ctp:67
-#: View/SharingGroups/index.ctp:68
+#: View/SharingGroups/index.ctp:87
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:5
 msgid "Good, but there are some optional settings that are incorrect / not set."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:6
 msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
-msgid "Overall health"
+msgid "Test"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:17
-msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:26
-msgid " settings incorrectly or not set"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:27
-msgid " incorrect settings."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:33
-msgid "Critical issues revealed by the diagnostics"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:34
-msgid " issues detected."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:35
-msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:9
-msgid "Toggle subgroup"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:13
-#: View/Pages/doc/administration.ctp:45
-msgid "Priority"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:14
-#: View/Pages/doc/administration.ctp:46
-msgid "Setting"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:15
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
 #: View/Events/filter_event_index.ctp:134
 #: View/Events/resolved_attributes.ctp:45
 #: View/Events/show_i_o_c_results.ctp:13
@@ -4886,45 +5354,75 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: View/Elements/healthElements/settings_tab.ctp:17
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:3;15;27;36
-#: View/Events/index.ctp:30;58
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
-#: View/Users/admin_index.ctp:28
-msgid "Modify filters"
-msgstr ""
-
-#: View/Elements/healthElements/tabs.ctp:3
+#: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:28
-#: View/Pages/doc/administration.ctp:38
-msgid "Diagnostics"
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:37
-#: View/Pages/doc/administration.ctp:39
-msgid "Workers"
+#: View/Elements/healthElements/tabs.ctp:34
+#: View/Pages/doc/administration.ctp:38
+msgid "Diagnostics"
 msgstr ""
 
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:48
+#: View/Elements/healthElements/tabs.ctp:50;65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:5
-msgid "Warning"
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:5
@@ -4932,82 +5430,90 @@ msgid "MISP cannot access your /proc directory to check the status of the worker
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:10
-msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgid "Note:"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "You have set the \"manage_workers\" variable to \"false\", therefore worker controls have been disabled."
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:15
+msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:20
 msgid "Worker started with the correct user, but the current status is unknown."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:24
+#: View/Elements/healthElements/workers.ctp:29
 msgid "There are issues with the worker(s), but at least one healthy worker is monitoring the queue."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:30
+#: View/Elements/healthElements/workers.ctp:35
 msgid "Worker type: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:32
+#: View/Elements/healthElements/workers.ctp:37
 msgid "Jobs in the queue: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:40
+#: View/Elements/healthElements/workers.ctp:45
 msgid "Queue status: "
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:51
+#: View/Elements/healthElements/workers.ctp:56
 msgid "Worker PID"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:52
+#: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
-#: View/Users/admin_view.ctp:7
-#: View/Users/view.ctp:2
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
 msgid "User"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:53
+#: View/Elements/healthElements/workers.ctp:58
 msgid "Worker process"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:54
+#: View/Elements/healthElements/workers.ctp:59
 msgid "Information"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:64
+#: View/Elements/healthElements/workers.ctp:69
 msgid "Worker not running!"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:72
+#: View/Elements/healthElements/workers.ctp:77
 msgid "The worker appears to be healthy."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:75
+#: View/Elements/healthElements/workers.ctp:80
 msgid "The worker was started with a user other than the apache user. MISP cannot check whether the worker is alive or not."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:81
+#: View/Elements/healthElements/workers.ctp:86
 msgid "Cannot check whether the worker is alive or dead."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:85
+#: View/Elements/healthElements/workers.ctp:90
 msgid "Dead"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:86
+#: View/Elements/healthElements/workers.ctp:91
 msgid "The Worker appears to be dead."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:100
+#: View/Elements/healthElements/workers.ctp:106
 msgid "Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it."
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:111
+#: View/Elements/healthElements/workers.ctp:119
 msgid "Start a worker"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:119
+#: View/Elements/healthElements/workers.ctp:130
 msgid "Restart all workers"
 msgstr ""
 
@@ -5138,16 +5644,16 @@ msgstr ""
 #: View/Objects/revise_object.ctp:45
 #: View/Organisations/ajax/merge.ctp:59;66
 #: View/Pages/doc/administration.ctp:237
-#: View/Pages/doc/categories_and_types.ctp:66
+#: View/Pages/doc/categories_and_types.ctp:60
 #: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
-#: View/ShadowAttributes/index.ctp:36;51
-#: View/SharingGroups/add.ctp:30
-#: View/SharingGroups/edit.ctp:30
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
 #: View/Sightings/ajax/list_sightings.ctp:7
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:35
-#: View/Warninglists/view.ctp:24
+#: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr ""
 
@@ -5186,7 +5692,7 @@ msgid "Template Name"
 msgstr ""
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:60
+#: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr ""
@@ -5206,7 +5712,7 @@ msgid "s"
 msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
-#: View/ObjectReferences/ajax/add.ctp:60
+#: View/ObjectReferences/ajax/add.ctp:86
 #: View/Objects/revise_object.ctp:43
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
@@ -5220,9 +5726,9 @@ msgstr ""
 #: View/Feeds/freetext_index.ctp:31
 #: View/Objects/add.ctp:95
 #: View/Objects/revise_object.ctp:44
-#: View/Pages/doc/categories_and_types.ctp:17;23;37;43;49
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
 #: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
-#: View/ShadowAttributes/index.ctp:48
+#: View/ShadowAttributes/index.ctp:58
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
 #: View/TemplateElements/ajax/template_element_add_file.ctp:28
 #: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
@@ -5232,7 +5738,7 @@ msgid "Category"
 msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
-#: View/Pages/doc/categories_and_types.ctp:63
+#: View/Pages/doc/categories_and_types.ctp:57
 #: View/Pages/doc/using_the_system.ctp:109
 #: View/Pages/doc/md/categories_and_types.ctp:33
 msgid "Types"
@@ -5461,45 +5967,33 @@ msgstr ""
 msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
 msgstr ""
 
-#: View/Events/add.ctp:3
-msgid "The event created %s, but not synchronised to other MISP instances until it is published."
-msgstr ""
-
-#: View/Events/add.ctp:3
-msgid "will be restricted to your organisation"
-msgstr ""
-
-#: View/Events/add.ctp:3
-msgid "will be visible to the organisations having an account on this platform"
-msgstr ""
-
-#: View/Events/add.ctp:48
+#: View/Events/add.ctp:44
 #: View/Events/edit.ctp:35
 msgid "Threat Level "
 msgstr ""
 
-#: View/Events/add.ctp:52
+#: View/Events/add.ctp:48
 #: View/Events/edit.ctp:38
 msgid "Analysis "
 msgstr ""
 
-#: View/Events/add.ctp:56
+#: View/Events/add.ctp:52
 #: View/Events/edit.ctp:43
-#: View/ShadowAttributes/index.ctp:42
+#: View/ShadowAttributes/index.ctp:52
 msgid "Event Info"
 msgstr ""
 
-#: View/Events/add.ctp:60
+#: View/Events/add.ctp:56
 #: View/Events/edit.ctp:47
 msgid "Quick Event Description or Tracking Info"
 msgstr ""
 
-#: View/Events/add.ctp:63
+#: View/Events/add.ctp:59
 #: View/Events/edit.ctp:50
 msgid "Extends event"
 msgstr ""
 
-#: View/Events/add.ctp:66
+#: View/Events/add.ctp:62
 #: View/Events/edit.ctp:53
 msgid "Event UUID or ID. Leave blank if not applicable."
 msgstr ""
@@ -5510,7 +6004,8 @@ msgstr ""
 
 #: View/Events/add_i_o_c.ctp:13
 #: View/Events/add_misp_export.ctp:27
-#: View/Events/upload_stix.ctp:22
+#: View/Events/upload_analysis_file.ctp:22
+#: View/Events/upload_stix.ctp:29
 msgid "Upload"
 msgstr ""
 
@@ -5548,7 +6043,7 @@ msgid "Details"
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:89
+#: View/Jobs/index.ctp:124
 msgid "Failed"
 msgstr ""
 
@@ -5561,781 +6056,677 @@ msgid "Event with this UUID already exists."
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr ""
 
 #: View/Events/automation.ctp:3
-msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
-"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
-"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgid "Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.\n"
+"    To to make this functionality available for automated tools an authentication key is used."
 msgstr ""
 
 #: View/Events/automation.ctp:6
-msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgid "Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP."
 msgstr ""
 
-#: View/Events/automation.ctp:7
+#: View/Events/automation.ctp:9
+#: View/Events/legacy_automation.ctp:7
 msgid "Your current key is: <code>%s</code>.\n"
 "    You can %s this key."
 msgstr ""
 
-#: View/Events/automation.ctp:8
+#: View/Events/automation.ctp:10
+#: View/Events/legacy_automation.ctp:8
 msgid "reset"
 msgstr ""
 
-#: View/Events/automation.ctp:10
-msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
-msgstr ""
-
-#: View/Events/automation.ctp:11
-msgid "Please use the use the following header"
-msgstr ""
-
-#: View/Events/automation.ctp:12
-msgid "Authorization"
-msgstr ""
-
-#: View/Events/automation.ctp:13
-msgid "XML Export"
-msgstr ""
-
 #: View/Events/automation.ctp:14
-msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+#: View/Logs/admin_index.ctp:20;21
+msgid "Search"
 msgstr ""
 
-#: View/Events/automation.ctp:15;47;76
-msgid "You can configure your tools to automatically download the following file"
+#: View/Events/automation.ctp:16
+#: View/Events/legacy_automation.ctp:264
+msgid "It is possible to search the database for attributes based on a list of criteria."
 msgstr ""
 
 #: View/Events/automation.ctp:17
-msgid "If you only want to fetch a specific event append the eventid number"
+#: View/Events/legacy_automation.ctp:265
+msgid "To return an event or a list of events in a desired format, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:19;144
-msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+#: View/Events/automation.ctp:18
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
 msgstr ""
 
-#: View/Events/automation.ctp:26
-msgid "The xml download also accepts two additional the following optional parameters in the URL"
+#: View/Events/automation.ctp:21
+msgid "Set the return format of the search (Currently supported: json, xml, openioc, suricata, snort - more formats are being moved to restSearch with the goal being that all searches happen through this API). Can be passed as the first parameter after restSearch or via the JSON payload."
 msgstr ""
 
-#: View/Events/automation.ctp:29;52;85
-msgid "Restrict the download to a single event"
+#: View/Events/automation.ctp:22
+msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
 msgstr ""
 
-#: View/Events/automation.ctp:30
-msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+#: View/Events/automation.ctp:23
+msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
 msgstr ""
 
-#: View/Events/automation.ctp:31;54;87;112;134
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:24
+#: View/Events/legacy_automation.ctp:268;297
+msgid "Search for the given value in the attributes' value field."
 msgstr ""
 
-#: View/Events/automation.ctp:37;64;91;117;140;203;254;279
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:38;65;92;118;141;204;255;280
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:39;119;142;205;256;281;306
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:41;70;97;122;259;290
-msgid "The keywords false or null should be used for optional empty parameters in the URL."
-msgstr ""
-
-#: View/Events/automation.ctp:43
-msgid "Also check out the %s to read about the REST API."
-msgstr ""
-
-#: View/Events/automation.ctp:45
-msgid "CSV Export"
-msgstr ""
-
-#: View/Events/automation.ctp:46
-msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
-msgstr ""
-
-#: View/Events/automation.ctp:49
-msgid "You can specify additional flags for CSV exports as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:53
-msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
-msgstr ""
-
-#: View/Events/automation.ctp:58
-msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:61;270;299
-msgid "The attribute category, any valid MISP attribute category is accepted."
-msgstr ""
-
-#: View/Events/automation.ctp:62;199;269;298
+#: View/Events/automation.ctp:25
+#: View/Events/legacy_automation.ctp:62;199;269;298
 msgid "The attribute type, any valid MISP attribute type is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:63
-msgid "Include the event data with each attribute."
+#: View/Events/automation.ctp:26
+#: View/Events/legacy_automation.ctp:61;270;299
+msgid "The attribute category, any valid MISP attribute category is accepted."
 msgstr ""
 
-#: View/Events/automation.ctp:66
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+#: View/Events/automation.ctp:27
+#: View/Events/legacy_automation.ctp:271;300
+msgid "Search by the creator organisation by supplying the organisation identifier."
 msgstr ""
 
-#: View/Events/automation.ctp:67
-msgid "The CSV created when this setting is set to true will not contain the header row.\n"
-"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:71
-msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:74
-msgid "NIDS rules export"
-msgstr ""
-
-#: View/Events/automation.ctp:75
-msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:81
-msgid "The full API syntax is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:84
-msgid "The export format, can be \"suricata\" or \"snort\""
-msgstr ""
-
-#: View/Events/automation.ctp:86
-msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
-msgstr ""
-
-#: View/Events/automation.ctp:93
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:94
-msgid "Restrict the export to only use the given types."
-msgstr ""
-
-#: View/Events/automation.ctp:95;120;174;206;257
-msgid "All attributes that have a hit on a warninglist will be excluded."
-msgstr ""
-
-#: View/Events/automation.ctp:96
-msgid "All tags will be included even if not exportable."
-msgstr ""
-
-#: View/Events/automation.ctp:98
-msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
-msgstr ""
-
-#: View/Events/automation.ctp:100
-msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
-msgstr ""
-
-#: View/Events/automation.ctp:102
-msgid "Hash database export"
-msgstr ""
-
-#: View/Events/automation.ctp:103
-msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:104;188
-msgid "You can configure your tools to automatically download the following files"
-msgstr ""
-
-#: View/Events/automation.ctp:109
-msgid "The API's full format is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:111
-msgid "The export format, can be \"md5\" or \"sha1\""
-msgstr ""
-
-#: View/Events/automation.ctp:123
-msgid "For example, to only show sha1 values from events tagged tag1, use"
-msgstr ""
-
-#: View/Events/automation.ctp:126
-msgid "STIX export"
-msgstr ""
-
-#: View/Events/automation.ctp:127
-msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
-msgstr ""
-
-#: View/Events/automation.ctp:129
-msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:132;171
-msgid "The event's ID"
-msgstr ""
-
-#: View/Events/automation.ctp:133
-msgid "Encode attachments where applicable"
-msgstr ""
-
-#: View/Events/automation.ctp:151
-msgid "Various ways to narrow down the search results of the STIX export"
-msgstr ""
-
-#: View/Events/automation.ctp:152
-msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
-msgstr ""
-
-#: View/Events/automation.ctp:154
-msgid "To export the same events using a POST request use"
-msgstr ""
-
-#: View/Events/automation.ctp:156
-msgid "Together with this JSON object in the POST message"
-msgstr ""
-
-#: View/Events/automation.ctp:158
-msgid "XML is automagically assumed when using the stix export"
-msgstr ""
-
-#: View/Events/automation.ctp:160
-msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
-msgstr ""
-
-#: View/Events/automation.ctp:163
-msgid "RPZ export"
-msgstr ""
-
-#: View/Events/automation.ctp:164
-msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
-msgstr ""
-
-#: View/Events/automation.ctp:165
-msgid "It is possible to further restrict the exported values using the following filters"
-msgstr ""
-
-#: View/Events/automation.ctp:167
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
-"        "
-msgstr ""
-
-#: View/Events/automation.ctp:170
-msgid "Use semicolons instead (the search will automatically search for colons instead)"
-msgstr ""
-
-#: View/Events/automation.ctp:172
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
-msgstr ""
-
-#: View/Events/automation.ctp:173
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
-msgstr ""
-
-#: View/Events/automation.ctp:176
-msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
-msgstr ""
-
-#: View/Events/automation.ctp:180
-msgid "To override the above values, either use the url parameters as described below"
-msgstr ""
-
-#: View/Events/automation.ctp:182
-msgid "or POST an XML or JSON object with the above listed options"
-msgstr ""
-
-#: View/Events/automation.ctp:186
-msgid "Text export"
-msgstr ""
-
-#: View/Events/automation.ctp:187
-msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
-msgstr ""
-
-#: View/Events/automation.ctp:194
-msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
-msgstr ""
-
-#: View/Events/automation.ctp:197
-msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
-msgstr ""
-
-#: View/Events/automation.ctp:200
+#: View/Events/automation.ctp:28
+#: View/Events/legacy_automation.ctp:200
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'."
 msgstr ""
 
-#: View/Events/automation.ctp:201
-msgid "Only export the attributes of the given event ID"
+#: View/Events/automation.ctp:29
+#: View/Events/legacy_automation.ctp:278
+msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
 msgstr ""
 
-#: View/Events/automation.ctp:202
-msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+#: View/Events/automation.ctp:30;151
+#: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:207
-msgid "Include not published Events."
+#: View/Events/automation.ctp:31;152
+#: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:208;275
-msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
-"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+#: View/Events/automation.ctp:32
+#: View/Events/legacy_automation.ctp:282;307
+msgid "The events that should be included / excluded from the search"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:33
+#: View/Events/legacy_automation.ctp:283;308
+msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
+msgstr ""
+
+#: View/Events/automation.ctp:34
+#: View/Events/legacy_automation.ctp:284
+msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
+msgstr ""
+
+#: View/Events/automation.ctp:35
+#: View/Events/legacy_automation.ctp:285;309
+msgid "Restrict the results by uuid."
+msgstr ""
+
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:37
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:38
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:39
+#: View/Events/legacy_automation.ctp:288;311
+msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
+msgstr ""
+
+#: View/Events/automation.ctp:40
+#: View/Events/legacy_automation.ctp:289;313
+msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
+msgstr ""
+
+#: View/Events/automation.ctp:41
+#: View/Events/legacy_automation.ctp:314
+msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
+msgstr ""
+
+#: View/Events/automation.ctp:42
+#: View/Events/legacy_automation.ctp:315
+msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
+msgstr ""
+
+#: View/Events/automation.ctp:43
+#: View/Events/legacy_automation.ctp:316
+msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:44
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:45
+msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
+msgstr ""
+
+#: View/Events/automation.ctp:46
+msgid "Filter on the event's info field."
+msgstr ""
+
+#: View/Events/automation.ctp:47
+msgid "Search for a full or a substring (delimited by % for substrings) in the event info, event tags, attribute tags, attribute values or attribute comment fields."
+msgstr ""
+
+#: View/Events/automation.ctp:48
+msgid "CSV only, select the fields that you wish to include in the CSV export. By setting event level fields additionally, includeContext is not required to get event metadata."
+msgstr ""
+
+#: View/Events/automation.ctp:49
+msgid "CSV only, add additional event level data to the export. The additional fields can be added via requested_attributes too with more granularity."
+msgstr ""
+
+#: View/Events/automation.ctp:79
+msgid "CSV specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:81
+msgid "Limit the list of fields to be returned in the CSV."
+msgstr ""
+
+#: View/Events/automation.ctp:82
+msgid "Include the event level meta-data with each attribute."
+msgstr ""
+
+#: View/Events/automation.ctp:83
+msgid "The CSV created when this setting is set to true will not contain the header row."
+msgstr ""
+
+#: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
+msgid "RPZ specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:95
+#: View/Events/legacy_automation.ctp:164
+msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
+msgstr ""
+
+#: View/Events/automation.ctp:98
+#: View/Events/legacy_automation.ctp:176
+msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
+msgstr ""
+
+#: View/Events/automation.ctp:102
+#: View/Events/legacy_automation.ctp:180
+msgid "To override the above values, either use the url parameters as described below"
+msgstr ""
+
+#: View/Events/automation.ctp:104
+#: View/Events/legacy_automation.ctp:182
+msgid "or POST an XML or JSON object with the above listed options"
+msgstr ""
+
+#: View/Events/automation.ctp:108
+#: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:109
+#: View/Events/legacy_automation.ctp:212
 msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
 msgstr ""
 
-#: View/Events/automation.ctp:213
+#: View/Events/automation.ctp:110
+#: View/Events/legacy_automation.ctp:213
 msgid "You can configure your tools to automatically download a file one of the Bro types."
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:116
+#: View/Events/legacy_automation.ctp:219
 msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
 msgstr ""
 
-#: View/Events/automation.ctp:222
+#: View/Events/automation.ctp:119
+#: View/Events/legacy_automation.ctp:222
 msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
 msgstr ""
 
-#: View/Events/automation.ctp:240
+#: View/Events/automation.ctp:137
+#: View/Events/legacy_automation.ctp:240
 msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
 msgstr ""
 
-#: View/Events/automation.ctp:242
+#: View/Events/automation.ctp:139
+#: View/Events/legacy_automation.ctp:242
 msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:249;301
+#: View/Events/automation.ctp:146
+#: View/Events/legacy_automation.ctp:249;301
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
 "    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
 "    Use semicolons instead (the search will automatically search for colons instead)."
 msgstr ""
 
-#: View/Events/automation.ctp:252
+#: View/Events/automation.ctp:149
+#: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:150
+#: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:154
+#: View/Events/legacy_automation.ctp:95;120;174;206;257
+msgid "All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/automation.ctp:156
+#: View/Events/legacy_automation.ctp:41;70;97;122;259;290
+msgid "The keywords false or null should be used for optional empty parameters in the URL."
+msgstr ""
+
+#: View/Events/automation.ctp:157
+#: View/Events/legacy_automation.ctp:260
 msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
 msgstr ""
 
-#: View/Events/automation.ctp:263
-msgid "Searches with JSON/XML/OpenIOC results"
-msgstr ""
-
-#: View/Events/automation.ctp:264
-msgid "It is possible to search the database for attributes based on a list of criteria."
-msgstr ""
-
-#: View/Events/automation.ctp:265
-msgid "To return an event or a list of events in a desired format, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:267
-msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
-msgstr ""
-
-#: View/Events/automation.ctp:268;297
-msgid "Search for the given value in the attributes' value field."
-msgstr ""
-
-#: View/Events/automation.ctp:271;300
-msgid "Search by the creator organisation by supplying the organisation identifier."
-msgstr ""
-
-#: View/Events/automation.ctp:272
-msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
-"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
-msgstr ""
-
-#: View/Events/automation.ctp:278
-msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
-msgstr ""
-
-#: View/Events/automation.ctp:282;307
-msgid "The events that should be included / excluded from the search"
-msgstr ""
-
-#: View/Events/automation.ctp:283;308
-msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
-msgstr ""
-
-#: View/Events/automation.ctp:284
-msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
-msgstr ""
-
-#: View/Events/automation.ctp:285;309
-msgid "Restrict the results by uuid."
-msgstr ""
-
-#: View/Events/automation.ctp:286;310
-msgid "Restrict the results by the last publish timestamp (newer than)."
-msgstr ""
-
-#: View/Events/automation.ctp:287
-msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
-msgstr ""
-
-#: View/Events/automation.ctp:288;311
-msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
-msgstr ""
-
-#: View/Events/automation.ctp:289;313
-msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
-msgstr ""
-
-#: View/Events/automation.ctp:291
-msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
-msgstr ""
-
-#: View/Events/automation.ctp:294;320;349
-msgid "POST message payload (json)"
-msgstr ""
-
-#: View/Events/automation.ctp:296
-msgid "To just return a list of attributes, use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:304
-msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
-msgstr ""
-
-#: View/Events/automation.ctp:305
-msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
-msgstr ""
-
-#: View/Events/automation.ctp:312
-msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
-msgstr ""
-
-#: View/Events/automation.ctp:314
-msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
-msgstr ""
-
-#: View/Events/automation.ctp:315
-msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
-msgstr ""
-
-#: View/Events/automation.ctp:316
-msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
-msgstr ""
-
-#: View/Events/automation.ctp:317
-msgid "Only return attributes from events that have received a modification after the given timestamp."
-msgstr ""
-
-#: View/Events/automation.ctp:322
-msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
-msgstr ""
-
-#: View/Events/automation.ctp:324
-msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
-"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
-msgstr ""
-
-#: View/Events/automation.ctp:327
-msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
-msgstr ""
-
-#: View/Events/automation.ctp:329
+#: View/Events/automation.ctp:160
+#: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:330
+#: View/Events/automation.ctp:161
+#: View/Events/legacy_automation.ctp:330
 msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:332
+#: View/Events/automation.ctp:163
+#: View/Events/legacy_automation.ctp:332
 msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
 "    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
 "    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
 msgstr ""
 
-#: View/Events/automation.ctp:337
+#: View/Events/automation.ctp:168
+#: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:338
+#: View/Events/automation.ctp:169
+#: View/Events/legacy_automation.ctp:338
 msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:340
+#: View/Events/automation.ctp:171
+#: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:341
+#: View/Events/automation.ctp:172
+#: View/Events/legacy_automation.ctp:341
 msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
 msgstr ""
 
-#: View/Events/automation.ctp:342
+#: View/Events/automation.ctp:173
+#: View/Events/legacy_automation.ctp:342
 msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
 msgstr ""
 
-#: View/Events/automation.ctp:343
+#: View/Events/automation.ctp:174
+#: View/Events/legacy_automation.ctp:343
 msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
 msgstr ""
 
-#: View/Events/automation.ctp:345
+#: View/Events/automation.ctp:176
+#: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:353
+#: View/Events/automation.ctp:180
+#: View/Events/legacy_automation.ctp:294;320;349
+msgid "POST message payload (json)"
+msgstr ""
+
+#: View/Events/automation.ctp:184
+#: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:354
+#: View/Events/automation.ctp:185
+#: View/Events/legacy_automation.ctp:354
 msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
 msgstr ""
 
-#: View/Events/automation.ctp:355
+#: View/Events/automation.ctp:186
+#: View/Events/legacy_automation.ctp:355
 msgid "If set, it will return all samples from events that have a match for the hash provided above."
 msgstr ""
 
-#: View/Events/automation.ctp:356
+#: View/Events/automation.ctp:187
+#: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:357
+#: View/Events/automation.ctp:188
+#: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:359
+#: View/Events/automation.ctp:190
+#: View/Events/legacy_automation.ctp:359
 msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
 msgstr ""
 
-#: View/Events/automation.ctp:360
+#: View/Events/automation.ctp:191
+#: View/Events/legacy_automation.ctp:360
 msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
 msgstr ""
 
-#: View/Events/automation.ctp:361
+#: View/Events/automation.ctp:192
+#: View/Events/legacy_automation.ctp:361
 msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
 msgstr ""
 
-#: View/Events/automation.ctp:362
+#: View/Events/automation.ctp:193
+#: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:371
+#: View/Events/automation.ctp:202
+#: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:372
+#: View/Events/automation.ctp:203
+#: View/Events/legacy_automation.ctp:372
 msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
 msgstr ""
 
-#: View/Events/automation.ctp:373
+#: View/Events/automation.ctp:204
+#: View/Events/legacy_automation.ctp:373
 msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:374
+#: View/Events/automation.ctp:205
+#: View/Events/legacy_automation.ctp:374
 msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
 msgstr ""
 
-#: View/Events/automation.ctp:375
+#: View/Events/automation.ctp:206
+#: View/Events/legacy_automation.ctp:375
 msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 msgstr ""
 
-#: View/Events/automation.ctp:376
+#: View/Events/automation.ctp:207
+#: View/Events/legacy_automation.ctp:376
 msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
 msgstr ""
 
-#: View/Events/automation.ctp:377
+#: View/Events/automation.ctp:208
+#: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:378
+#: View/Events/automation.ctp:209
+#: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:379
+#: View/Events/automation.ctp:210
+#: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr ""
 
-#: View/Events/automation.ctp:380
+#: View/Events/automation.ctp:211
+#: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:381
+#: View/Events/automation.ctp:212
+#: View/Events/legacy_automation.ctp:381
 msgid "You can add or remove an existing tag from an event in the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:384
+#: View/Events/automation.ctp:215
+#: View/Events/legacy_automation.ctp:384
 msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
 msgstr ""
 
-#: View/Events/automation.ctp:386
+#: View/Events/automation.ctp:217
+#: View/Events/legacy_automation.ctp:386
 msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:388
+#: View/Events/automation.ctp:219
+#: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:389
+#: View/Events/automation.ctp:220
+#: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr ""
 
-#: View/Events/automation.ctp:393
+#: View/Events/automation.ctp:224
+#: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:394
+#: View/Events/automation.ctp:225
+#: View/Events/legacy_automation.ctp:394
 #: View/Pages/doc/using_the_system.ctp:445
-#: View/SharingGroups/add.ctp:52
-#: View/SharingGroups/edit.ctp:60
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
 msgid "URL"
 msgstr ""
 
-#: View/Events/automation.ctp:395
+#: View/Events/automation.ctp:226
+#: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:396
+#: View/Events/automation.ctp:227
+#: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:397
-#: View/Servers/rest.ctp:53
+#: View/Events/automation.ctp:228
+#: View/Events/legacy_automation.ctp:397
+#: View/Servers/rest.ctp:115
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:402
+#: View/Events/automation.ctp:233
+#: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:404;424;425;431;432
+#: View/Events/automation.ctp:235;255;256;262;263
+#: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:409
+#: View/Events/automation.ctp:240
+#: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:411;418
+#: View/Events/automation.ctp:242;249
+#: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:416
+#: View/Events/automation.ctp:247
+#: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:423
+#: View/Events/automation.ctp:254
+#: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:430
+#: View/Events/automation.ctp:261
+#: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:437
+#: View/Events/automation.ctp:268
+#: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:439;446
+#: View/Events/automation.ctp:270;277
+#: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
 #: View/Pages/doc/using_the_system.ctp:254
 msgid "Message"
 msgstr ""
 
-#: View/Events/automation.ctp:444
+#: View/Events/automation.ctp:275
+#: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:449
+#: View/Events/automation.ctp:280
+#: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:454
+#: View/Events/automation.ctp:285
+#: View/Events/legacy_automation.ctp:454
 msgid "None of the above fields are mandatory, but at least one of them has to be provided."
 msgstr ""
 
-#: View/Events/automation.ctp:456
+#: View/Events/automation.ctp:287
+#: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:457
+#: View/Events/automation.ctp:288
+#: View/Events/legacy_automation.ctp:457
 msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
 msgstr ""
 
-#: View/Events/automation.ctp:461
+#: View/Events/automation.ctp:292
+#: View/Events/legacy_automation.ctp:461
 msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
 "    An example for a valid lookup"
 msgstr ""
 
-#: View/Events/automation.ctp:472
+#: View/Events/automation.ctp:303
+#: View/Events/legacy_automation.ctp:472
 msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
 msgstr ""
 
-#: View/Events/automation.ctp:473
+#: View/Events/automation.ctp:304
+#: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:474
+#: View/Events/automation.ctp:305
+#: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:475
+#: View/Events/automation.ctp:306
+#: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:476
+#: View/Events/automation.ctp:307
+#: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:477
+#: View/Events/automation.ctp:308
+#: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:478
+#: View/Events/automation.ctp:309
+#: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:479
+#: View/Events/automation.ctp:310
+#: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:480
+#: View/Events/automation.ctp:311
+#: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:481
+#: View/Events/automation.ctp:312
+#: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:482
+#: View/Events/automation.ctp:313
+#: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:483
+#: View/Events/automation.ctp:314
+#: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:484
+#: View/Events/automation.ctp:315
+#: View/Events/legacy_automation.ctp:484
 msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:485
+#: View/Events/automation.ctp:316
+#: View/Events/legacy_automation.ctp:485
 msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
+#: View/Events/automation.ctp:319
+msgid "Freetext Import API"
+msgstr ""
+
+#: View/Events/automation.ctp:321
+msgid "The freetext import tool is also exposed to the API."
+msgstr ""
+
+#: View/Events/automation.ctp:322
+msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
+msgstr ""
+
+#: View/Events/automation.ctp:323
+msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:324
+msgid "The contents of the POST body should be the text to be parsed."
+msgstr ""
+
 #: View/Events/contact.ctp:8
 msgid "Contact organization reporting event "
 msgstr ""
@@ -6529,7 +6920,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:9;101
+#: View/Jobs/index.ctp:9;136
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr ""
@@ -6553,7 +6944,7 @@ msgid "All communities"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:53
+#: View/Feeds/index.ctp:103
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -6605,47 +6996,378 @@ msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/Organisations/view.ctp:97;98
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:33
 msgid "Events"
 msgstr ""
 
-#: View/Events/index.ctp:30
-msgid "Filter events"
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
 msgstr ""
 
-#: View/Events/index.ctp:31
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr ""
 
-#: View/Events/index.ctp:44
-msgid "Quickfilter"
+#: View/Events/index.ctp:73
+msgid "My events only"
 msgstr ""
 
-#: View/Events/index.ctp:44
-#: View/Organisations/index.ctp:59
-#: View/Servers/preview_index.ctp:45
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr ""
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr ""
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr ""
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
 msgid "Filter"
 msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My events only"
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
 msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My Events"
+#: View/Events/legacy_automation.ctp:3
+msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
+"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
 msgstr ""
 
-#: View/Events/index.ctp:72
-msgid "My organisation's events only"
+#: View/Events/legacy_automation.ctp:6
+msgid "Make sure you keep that key secret as it gives access to the entire database !"
 msgstr ""
 
-#: View/Events/index.ctp:72
-msgid "Org Events"
+#: View/Events/legacy_automation.ctp:10
+msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:11
+msgid "Please use the use the following header"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:12
+msgid "Authorization"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:13
+msgid "XML Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:14
+msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:15;47;76
+msgid "You can configure your tools to automatically download the following file"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:17
+msgid "If you only want to fetch a specific event append the eventid number"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:19;144
+msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:26
+msgid "The xml download also accepts two additional the following optional parameters in the URL"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:29;52;85
+msgid "Restrict the download to a single event"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:30
+msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:31;54;87;112;134
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:43
+msgid "Also check out the %s to read about the REST API."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:45
+msgid "CSV Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:46
+msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:49
+msgid "You can specify additional flags for CSV exports as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:53
+msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:58
+msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:63
+msgid "Include the event data with each attribute."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:66
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:67
+msgid "The CSV created when this setting is set to true will not contain the header row.\n"
+"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:71
+msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:74
+msgid "NIDS rules export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:75
+msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:81
+msgid "The full API syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:84
+msgid "The export format, can be \"suricata\" or \"snort\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:86
+msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:93
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:94
+msgid "Restrict the export to only use the given types."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:96
+msgid "All tags will be included even if not exportable."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:98
+msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:100
+msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:102
+msgid "Hash database export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:103
+msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:104;188
+msgid "You can configure your tools to automatically download the following files"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:109
+msgid "The API's full format is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:111
+msgid "The export format, can be \"md5\" or \"sha1\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:123
+msgid "For example, to only show sha1 values from events tagged tag1, use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:126
+msgid "STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:127
+msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:129
+msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:132;171
+msgid "The event's ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:133
+msgid "Encode attachments where applicable"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:151
+msgid "Various ways to narrow down the search results of the STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:152
+msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:154
+msgid "To export the same events using a POST request use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:156
+msgid "Together with this JSON object in the POST message"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:158
+msgid "XML is automagically assumed when using the stix export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:160
+msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:163
+msgid "RPZ export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:165
+msgid "It is possible to further restrict the exported values using the following filters"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:167
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
+"        "
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:170
+msgid "Use semicolons instead (the search will automatically search for colons instead)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:172
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:173
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:186
+msgid "Text export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:187
+msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:194
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:197
+msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:201
+msgid "Only export the attributes of the given event ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:202
+msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:207
+msgid "Include not published Events."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:208;275
+msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:263
+msgid "Searches with JSON/XML/OpenIOC results"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:267
+msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:272
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:291
+msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:296
+msgid "To just return a list of attributes, use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:304
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:305
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:312
+msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:322
+msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:324
+msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
+"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:327
+msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
 msgstr ""
 
 #: View/Events/merge.ctp:4
@@ -6671,19 +7393,19 @@ msgid "Proposals"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:93
+#: View/Events/view.ctp:106
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:113
-#: View/Jobs/index.ctp:65
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
 #: View/Logs/admin_search.ctp:6
 #: View/Pages/doc/administration.ctp:87;104;116;181;195
 #: View/Pages/doc/using_the_system.ctp:166
-#: View/Users/admin_view.ctp:24
-#: View/Users/view.ctp:9
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
 msgid "Email"
 msgstr ""
 
@@ -6761,11 +7483,8 @@ msgid "Successfully added attributes"
 msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Events/view.ctp:56
 #: View/Feeds/preview_event.ctp:11
 #: View/Galaxies/view.ctp:18
-#: View/ObjectTemplates/view.ctp:15
-#: View/Organisations/view.ctp:54
 #: View/Organisations/ajax/merge.ctp:58
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
@@ -6788,6 +7507,14 @@ msgstr ""
 msgid "Visualisation"
 msgstr ""
 
+#: View/Events/upload_analysis_file.ctp:6
+msgid "Import analysis file"
+msgstr ""
+
+#: View/Events/upload_analysis_file.ctp:61
+msgid "Create Objects"
+msgstr ""
+
 #: View/Events/upload_stix.ctp:6
 msgid "Import %s file"
 msgstr ""
@@ -6796,193 +7523,186 @@ msgstr ""
 msgid "%s file"
 msgstr ""
 
-#: View/Events/view.ctp:49
-msgid "Extended view"
+#: View/Events/upload_stix.ctp:24
+msgid "Include the original imported file as attachment"
 msgstr ""
 
-#: View/Events/view.ctp:51
+#: View/Events/view.ctp:53
 #: View/Servers/preview_event.ctp:12
 #: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Event ID"
 msgstr ""
 
-#: View/Events/view.ctp:63
+#: View/Events/view.ctp:57
 msgid "Source Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:68
+#: View/Events/view.ctp:66
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:83
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
 msgid "Owner org"
 msgstr ""
 
-#: View/Events/view.ctp:131
+#: View/Events/view.ctp:135
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
 #: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
 msgstr ""
 
-#: View/Events/view.ctp:139
+#: View/Events/view.ctp:140
 #: View/Feeds/preview_event.ctp:37
 #: View/Pages/doc/using_the_system.ctp:70;177;210
 #: View/Servers/preview_event.ctp:48
 msgid "Analysis"
 msgstr ""
 
-#: View/Events/view.ctp:159
+#: View/Events/view.ctp:161
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr ""
 
-#: View/Events/view.ctp:165;167
+#: View/Events/view.ctp:165
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:169
+#: View/Events/view.ctp:173
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:171
+#: View/Events/view.ctp:177
+msgid "First recorded change"
+msgstr ""
+
+#: View/Events/view.ctp:181
 msgid "Last change"
 msgstr ""
 
-#: View/Events/view.ctp:176
+#: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:187
+#: View/Events/view.ctp:210
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:194
-msgid "Currently in "
+#: View/Events/view.ctp:217
+msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:202
-msgid "- restricted to own organisation only."
+#: View/Events/view.ctp:217
+msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:203
-msgid "Advanced Sightings"
-msgstr ""
-
-#: View/Events/view.ctp:219
-msgid "you"
-msgstr ""
-
-#: View/Events/view.ctp:220
-msgid " has"
-msgstr ""
-
-#: View/Events/view.ctp:223
-msgid "You have"
-msgstr ""
-
-#: View/Events/view.ctp:226
+#: View/Events/view.ctp:265
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:227
-msgid "%s requested that %s take over this event."
-msgstr ""
-
-#: View/Events/view.ctp:227
+#: View/Events/view.ctp:277
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:232
-msgid "Correlation"
-msgstr ""
-
-#: View/Events/view.ctp:238;247
-#: View/Users/admin_view.ctp:125
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:238
-msgid "enable"
-msgstr ""
-
-#: View/Events/view.ctp:242;249
-#: View/ObjectTemplates/index.ctp:32
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
 #: View/Taxonomies/view.ctp:24
-#: View/Warninglists/view.ctp:38
 msgid "Enabled"
 msgstr ""
 
-#: View/Events/view.ctp:242
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr ""
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:277
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr ""
+
+#: View/Events/view.ctp:328
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:335
+#: View/Events/view.ctp:386;415
 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."
+#: View/Events/view.ctp:387;416
+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
+#: View/Events/view.ctp:424
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:360
+#: View/Events/view.ctp:440
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:363
+#: View/Events/view.ctp:443
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:366
+#: View/Events/view.ctp:446
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:369
+#: View/Events/view.ctp:449
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:372
+#: View/Events/view.ctp:452
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:375
+#: View/Events/view.ctp:455
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:378
+#: View/Events/view.ctp:458
 msgid "Discussion"
 msgstr ""
 
@@ -7018,16 +7738,24 @@ msgstr ""
 msgid " Event #"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:7
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:6
 msgid "Publish Event%s"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:8
+msgid "Unpublish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:20
 msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
-#: View/Events/ajax/eventPublishConfirmationForm.ctp:23
-#: View/Feeds/index.ctp:54
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Feeds/index.ctp:104
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -7037,10 +7765,6 @@ msgstr ""
 msgid "Choose the format that you wish to download the event in"
 msgstr ""
 
-#: View/Events/ajax/exportChoice.ctp:17;18;27;28
-msgid "Export as %s"
-msgstr ""
-
 #: View/Events/ajax/importChoice.ctp:2
 msgid "Choose the format that you would like to use for the import"
 msgstr ""
@@ -7211,7 +7935,7 @@ msgstr ""
 
 #: View/Feeds/add.ctp:156
 #: View/Feeds/edit.ctp:153
-#: View/Feeds/index.ctp:55
+#: View/Feeds/index.ctp:105
 msgid "Delta Merge"
 msgstr ""
 
@@ -7252,16 +7976,16 @@ msgstr ""
 
 #: View/Feeds/add.ctp:196
 #: View/Feeds/edit.ctp:191
-#: View/Servers/add.ctp:113
-#: View/Servers/edit.ctp:152;158
+#: View/Servers/add.ctp:102
+#: View/Servers/edit.ctp:147;153
 msgid "Modify"
 msgstr ""
 
-#: View/Feeds/compare_feeds.ctp:58
+#: View/Feeds/compare_feeds.ctp:66
 msgid "None or less than 1% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
-#: View/Feeds/compare_feeds.ctp:59
+#: View/Feeds/compare_feeds.ctp:67
 msgid "%s\\% of the data of %s is contained in %s (%s matching values)"
 msgstr ""
 
@@ -7282,53 +8006,53 @@ msgid "The base-url to the external server you want to sync with. Example: https
 msgstr ""
 
 #: View/Feeds/edit.ctp:207
-#: View/Servers/add.ctp:143
-#: View/Servers/edit.ctp:186
+#: View/Servers/add.ctp:132
+#: View/Servers/edit.ctp:181
 msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
 msgstr ""
 
 #: View/Feeds/edit.ctp:208
-#: View/Servers/add.ctp:144
-#: View/Servers/edit.ctp:185
+#: View/Servers/add.ctp:133
+#: View/Servers/edit.ctp:180
 msgid "The organization having the external server you want to sync with. Example: BE"
 msgstr ""
 
 #: View/Feeds/edit.ctp:209
-#: View/Servers/add.ctp:145
-#: View/Servers/edit.ctp:187
+#: View/Servers/add.ctp:134
+#: View/Servers/edit.ctp:182
 msgid "You can find the authentication key on your profile on the external server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:210
-#: View/Servers/add.ctp:146
-#: View/Servers/edit.ctp:188
+#: View/Servers/add.ctp:135
+#: View/Servers/edit.ctp:183
 msgid "Allow the upload of events and their attributes."
 msgstr ""
 
 #: View/Feeds/edit.ctp:211
-#: View/Servers/add.ctp:147
-#: View/Servers/edit.ctp:189
+#: View/Servers/add.ctp:136
+#: View/Servers/edit.ctp:184
 msgid "Allow the download of events and their attributes from the server."
 msgstr ""
 
 #: View/Feeds/edit.ctp:212
-#: View/Servers/edit.ctp:190
+#: View/Servers/edit.ctp:185
 msgid "Unpublish new event (working with Push event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:213
-#: View/Servers/edit.ctp:191
+#: View/Servers/edit.ctp:186
 msgid "Publish new event without email (working with Pull event)."
 msgstr ""
 
 #: View/Feeds/edit.ctp:214
-#: View/Servers/edit.ctp:192
+#: View/Servers/edit.ctp:187
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority."
 msgstr ""
 
 #: View/Feeds/edit.ctp:215
-#: View/Servers/add.ctp:151
-#: View/Servers/edit.ctp:194
+#: View/Servers/add.ctp:140
+#: View/Servers/edit.ctp:189
 msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
 msgstr ""
 
@@ -7380,130 +8104,104 @@ msgstr ""
 msgid "Fetch and store all feed data"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
+#: View/Feeds/index.ctp:33
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
-msgid "Enable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:28
+#: View/Feeds/index.ctp:39
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:28
-msgid "Disable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:29
+#: View/Feeds/index.ctp:45
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:29
-msgid "Enable Caching for Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:51
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:30
-msgid "Disable Caching for  Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
-msgid "Default feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:61
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:31
+#: View/Feeds/index.ctp:66
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:32
+#: View/Feeds/index.ctp:71
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:32
-msgid "All Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:33
+#: View/Feeds/index.ctp:76
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:33
-msgid "Enabled Feeds"
+#: View/Feeds/index.ctp:95
+msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:48
+#: View/Feeds/index.ctp:96
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:98
 msgid "Feed Format"
 msgstr ""
 
-#: View/Feeds/index.ctp:50
-#: View/Jobs/index.ctp:76
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr ""
 
-#: View/Feeds/index.ctp:56
+#: View/Feeds/index.ctp:106
 msgid "Override IDS"
 msgstr ""
 
-#: View/Feeds/index.ctp:60
+#: View/Feeds/index.ctp:110
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:108
-#: View/Servers/index.ctp:73;74
+#: View/Feeds/index.ctp:158
+#: View/Servers/index.ctp:74;75
 msgid "Rules"
 msgstr ""
 
-#: View/Feeds/index.ctp:135
+#: View/Feeds/index.ctp:185
 msgid "Error: Invalid event!"
 msgstr ""
 
-#: View/Feeds/index.ctp:140
+#: View/Feeds/index.ctp:190
 msgid "Fixed event %s"
 msgstr ""
 
-#: View/Feeds/index.ctp:143
+#: View/Feeds/index.ctp:193
 msgid "New fixed event"
 msgstr ""
 
-#: View/Feeds/index.ctp:195
+#: View/Feeds/index.ctp:245
+#: View/Servers/index.ctp:94
 msgid "Age: "
 msgstr ""
 
-#: View/Feeds/index.ctp:197
+#: View/Feeds/index.ctp:247
+#: View/Servers/index.ctp:102
 msgid "Not cached"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:210
+#: View/Feeds/index.ctp:260
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:214
+#: View/Feeds/index.ctp:265
 msgid "Are you sure you want to permanently remove the feed (%s)?"
 msgstr ""
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:267
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -7525,46 +8223,30 @@ msgid "Namespace"
 msgstr ""
 
 #: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:17
+#: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:19
+#: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:2
-msgid "Select Cluster"
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:11
-msgid "search clusters…"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "Galaxy Cluster Deletion"
 msgstr ""
 
-#: View/Galaxies/ajax/cluster_choice.ctp:28
-msgid "Back to Galaxy Selection"
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies."
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:2
-msgid "Select Cluster Source"
+#: View/GalaxyClusters/ajax/index.ctp:82
+msgid "Delete galaxy cluster"
 msgstr ""
 
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All clusters"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_choice.ctp:6
-msgid "All Galaxies"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:2
-msgid "Select Galaxy Namespace Source"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All namespaces"
-msgstr ""
-
-#: View/Galaxies/ajax/galaxy_namespace_choice.ctp:6
-msgid "All Namespaces"
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
 msgstr ""
 
 #: View/Jobs/index.ctp:12
@@ -7579,37 +8261,37 @@ msgstr ""
 msgid "Completed."
 msgstr ""
 
-#: View/Jobs/index.ctp:63
+#: View/Jobs/index.ctp:68;98
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:74;99
 msgid "Show default queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:99
 #: View/Roles/admin_index.ctp:22
 #: View/Roles/index.ctp:22
 msgid "Default"
 msgstr ""
 
-#: View/Jobs/index.ctp:65
-msgid "Show email queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
-msgid "Show cache queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:101
 msgid "Cache"
 msgstr ""
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:127
 msgid "No worker active"
 msgstr ""
 
-#: View/Jobs/index.ctp:124
+#: View/Jobs/index.ctp:159
 msgid "View stacktrace"
 msgstr ""
 
@@ -7629,10 +8311,6 @@ msgstr ""
 msgid "No error data found. Generally job error data is purged from Redis after 24 hours, however, you can still view the errors in the log files in \"/app/tmp/logs\"."
 msgstr ""
 
-#: View/Jobs/ajax/error.ctp:34
-msgid "Close"
-msgstr ""
-
 #: View/Logs/admin_index.ctp:2
 #: View/Logs/event_index.ctp:6
 msgid "Logs"
@@ -7674,22 +8352,20 @@ msgstr ""
 msgid "from IP"
 msgstr ""
 
-#: View/Logs/admin_index.ctp:20;21
-msgid "Search"
-msgstr ""
-
-#: View/Logs/admin_index.ctp:59
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr ""
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:50
-#: View/ObjectTemplates/view.ctp:13
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/Templates/view.ctp:33
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
 msgstr ""
 
@@ -7775,12 +8451,12 @@ msgstr ""
 msgid "Target UUID"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:53
+#: View/ObjectReferences/ajax/add.ctp:54
 #: View/Objects/orphaned_object_diagnostics.ctp:38
 msgid "Object"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:68
+#: View/ObjectReferences/ajax/add.ctp:120
 msgid "Target Details"
 msgstr ""
 
@@ -7801,7 +8477,7 @@ msgid " The Attribute will be permanently deleted and unrecoverable. Also, this
 msgstr ""
 
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:24
-#: View/Pages/doc/categories_and_types.ctp:46
+#: View/Pages/doc/categories_and_types.ctp:40
 #: View/Pages/doc/md/categories_and_types.ctp:23
 msgid "Categories"
 msgstr ""
@@ -7822,43 +8498,35 @@ msgstr ""
 msgid "Object Template index"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:54
-#: View/ObjectTemplates/view.ctp:23
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:107
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:108
+#: View/ObjectTemplates/index.ctp:119
 msgid "Are you sure you want to delete template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:7
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/ObjectTemplates/view.ctp:33
 msgid " Object Template"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:9
-msgid "Object Template ID"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:2
-msgid "Select Object Category"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All meta-categories"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:6
-msgid "All Objects"
-msgstr ""
-
-#: View/ObjectTemplates/ajax/object_choice.ctp:50
-msgid "Back to categories"
-msgstr ""
-
 #: View/Objects/add.ctp:6
 msgid " Object"
 msgstr ""
@@ -7935,15 +8603,6 @@ msgstr ""
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:49
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/ajax/merge.ctp:65
-#: View/SharingGroups/add.ctp:32
-#: View/SharingGroups/edit.ctp:32
-msgid "UUID"
-msgstr ""
-
 #: View/Objects/ajax/delete.ctp:6
 msgid "Object Deletion"
 msgstr ""
@@ -7965,6 +8624,7 @@ msgid "Simply paste a list of all the organisation UUIDs that you wish to block
 msgstr ""
 
 #: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr ""
 
@@ -8089,9 +8749,9 @@ msgstr ""
 msgid "Click here"
 msgstr ""
 
-#: View/Organisations/index.ctp:5
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
-#: View/Users/statistics_data.ctp:51
+#: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
 msgid "All organisations"
 msgstr ""
@@ -8100,7 +8760,7 @@ msgstr ""
 msgid ", both local and remote"
 msgstr ""
 
-#: View/Organisations/index.ctp:9
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr ""
@@ -8109,7 +8769,7 @@ msgstr ""
 msgid " on other instances"
 msgstr ""
 
-#: View/Organisations/index.ctp:13
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr ""
@@ -8126,55 +8786,52 @@ msgstr ""
 msgid "View all"
 msgstr ""
 
-#: View/Organisations/index.ctp:65
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:30
 msgid "Logo"
 msgstr ""
 
-#: View/Organisations/index.ctp:76
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr ""
 
-#: View/Organisations/index.ctp:117
+#: View/Organisations/index.ctp:138
 #: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 ""
 
-#: View/Organisations/view.ctp:3
-msgid "Organisation "
-msgstr ""
-
-#: View/Organisations/view.ctp:7
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:4
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/Users/admin_view.ctp:9
-#: View/Users/view.ctp:4
-#: View/Warninglists/view.ctp:4
-msgid "Id"
-msgstr ""
-
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:12
 #: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr ""
 
-#: View/Organisations/view.ctp:26
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:40
-msgid "E-mail domain restrictions"
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
 msgstr ""
 
-#: View/Organisations/view.ctp:93;94
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr ""
+
+#: View/Organisations/view.ctp:62;63
 msgid "Members"
 msgstr ""
 
@@ -8187,7 +8844,6 @@ msgid "Available Organisations"
 msgstr ""
 
 #: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
-#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
 msgid "Added Organisations"
 msgstr ""
 
@@ -8252,6 +8908,14 @@ msgstr ""
 msgid "Events need to have no validation issues"
 msgstr ""
 
+#: View/Pages/administration.ctp:15
+msgid "Recorrelate attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:16
+msgid "Recorrelate proposals"
+msgstr ""
+
 #: View/Pages/administration.ctp:18
 msgid "Verify Certificates"
 msgstr ""
@@ -8268,6 +8932,10 @@ msgstr ""
 msgid "Hotfix 2.3.57: Increase the max length of the organization field when adding a new server connection."
 msgstr ""
 
+#: View/Pages/administration.ctp:20
+msgid "Convert log fields to text"
+msgstr ""
+
 #: View/Pages/administration.ctp:20
 msgid "Hotfix 2.3.78: Some of the log fields that were varchar(255) ended up truncating the data. This function will change them to \"text\""
 msgstr ""
@@ -8280,18 +8948,34 @@ msgstr ""
 msgid "Hotfix 2.3.107: it was previously possible to get duplicate attribute UUIDs in the database, this script will remove all duplicates and ensure that duplicates will not be entered into the database in the future."
 msgstr ""
 
+#: View/Pages/administration.ctp:22
+msgid "Remove duplicate events (with the same UUID)"
+msgstr ""
+
 #: View/Pages/administration.ctp:22
 msgid "Hotfix 2.3.115: In some rare situations it could occur that a duplicate of an event was created on an instance, with the exact same uuid. This action will remove any such duplicates and make sure that this cannot happen again."
 msgstr ""
 
+#: View/Pages/administration.ctp:23
+msgid "Prune orphaned attributes"
+msgstr ""
+
 #: View/Pages/administration.ctp:23
 msgid "In some rare occasions it can happen that you end up with some attributes in your database that do not belong to an event - for example during a race condition between an event insert and a delete. This tool will collect and delete any such orphaned attributes. If you ever run into an issue where you cannot add an attribute with a specific valid value, this is probably the reason."
 msgstr ""
 
+#: View/Pages/administration.ctp:24
+msgid "Clean regex table of potentially malicious entries"
+msgstr ""
+
 #: View/Pages/administration.ctp:24
 msgid "Hotfix 2.3.160: Prior to this version it was possible for a user/admin with Regex permission to create a malicious regular expression that could be used to execute arbitrary code. Since this version it is no longer possible to input such expressions, but already existing malicious entries still have to be cleaned using this tool."
 msgstr ""
 
+#: View/Pages/administration.ctp:25
+msgid "Remove URL type attribute sanitisation"
+msgstr ""
+
 #: View/Pages/administration.ctp:25
 msgid "Hotfix 2.3.173: Sanitised URLs can cause issues with the NIDS exports and as of this version attributes will be modified on entry to correct this. To correct existing entries, run this script."
 msgstr ""
@@ -8345,7 +9029,6 @@ msgid "If the migration of your data from 2.4 is not complete this will lead to
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:3
-#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:3
 #: View/Pages/doc/general.ctp:3
 #: View/Pages/doc/quickstart.ctp:3;14
@@ -8355,7 +9038,6 @@ msgid "Quick Start"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:4
-#: View/Pages/doc/categories_and_types.ctp:4
 #: View/Pages/doc/concepts.ctp:4
 #: View/Pages/doc/general.ctp:4;14
 #: View/Pages/doc/quickstart.ctp:4
@@ -8365,7 +9047,6 @@ msgid "General Layout"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:5
-#: View/Pages/doc/categories_and_types.ctp:5
 #: View/Pages/doc/concepts.ctp:5;14
 #: View/Pages/doc/general.ctp:5
 #: View/Pages/doc/quickstart.ctp:5
@@ -8375,7 +9056,6 @@ msgid "General Concepts"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:6
-#: View/Pages/doc/categories_and_types.ctp:6
 #: View/Pages/doc/concepts.ctp:6
 #: View/Pages/doc/general.ctp:6
 #: View/Pages/doc/quickstart.ctp:6
@@ -8385,7 +9065,6 @@ msgid "User Management and Global actions"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:7
-#: View/Pages/doc/categories_and_types.ctp:7
 #: View/Pages/doc/concepts.ctp:7
 #: View/Pages/doc/general.ctp:7
 #: View/Pages/doc/quickstart.ctp:7
@@ -8428,7 +9107,7 @@ msgid "FAQ"
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:22
-#: View/Pages/doc/categories_and_types.ctp:9
+#: View/Pages/doc/categories_and_types.ctp:3
 #: View/Pages/doc/concepts.ctp:9
 #: View/Pages/doc/general.ctp:9
 #: View/Pages/doc/quickstart.ctp:9
@@ -8486,6 +9165,7 @@ msgid "Settings controlling the brute-force protection and the application's sal
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:37
+#: View/Servers/edit.ctp:82
 msgid "Misc settings"
 msgstr ""
 
@@ -8704,8 +9384,8 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_view.ctp:40
-#: View/Users/view.ctp:34
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
 msgid "Authkey"
 msgstr ""
 
@@ -8758,8 +9438,8 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_view.ctp:29
-#: View/Users/view.ctp:24
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr ""
 
@@ -8780,8 +9460,6 @@ msgid "Shows the currently assigned NIDS ID."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:109;125
-#: View/Users/admin_view.ctp:100
-#: View/Users/view.ctp:55
 msgid "Termsaccepted"
 msgstr ""
 
@@ -8790,7 +9468,7 @@ msgid "This flag indicates whether the user has accepted the terms of use or not
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:110
-#: View/Users/admin_view.ctp:120
+#: View/Users/admin_view.ctp:84
 msgid "Newsread"
 msgstr ""
 
@@ -8852,7 +9530,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:133;184;197
 #: View/Pages/doc/using_the_system.ctp:269
-#: View/Taxonomies/view.ctp:78
+#: View/Taxonomies/view.ctp:89
 msgid "Action"
 msgstr ""
 
@@ -9329,16 +10007,16 @@ msgstr ""
 msgid "This will create a new password hash using the currently set salt."
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:13
+#: View/Pages/doc/categories_and_types.ctp:7
 msgid "Attribute Categories and Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:14
+#: View/Pages/doc/categories_and_types.ctp:8
 #: View/Pages/doc/md/categories_and_types.ctp:1
 msgid "Attribute Categories vs. Types"
 msgstr ""
 
-#: View/Pages/doc/categories_and_types.ctp:80
+#: View/Pages/doc/categories_and_types.ctp:74
 msgid "Click here to get the .md version for gitbook generation."
 msgstr ""
 
@@ -9347,7 +10025,7 @@ msgid "Admins and Site Admins"
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:16
-msgid "There are two types of admins in MISP: Admins (also refered to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
+msgid "There are two types of admins in MISP: Admins (also referred to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
 msgstr ""
 
 #: View/Pages/doc/concepts.ctp:17
@@ -9478,10 +10156,6 @@ msgstr ""
 msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:20
-msgid "Event Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:20
 msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
 msgstr ""
@@ -9490,18 +10164,10 @@ msgstr ""
 msgid "Input filters alter what and how data can be entered into this instance. Apart from the basic validation of attribute entry by type, it is possible for the site administrators to define regular expression replacements and blacklists for certain values in addition to blocking certain values from being exportable. Users can view these replacement and blacklist rules here whilst administrator can alter them."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:22;54
-msgid "Global Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:22
 msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
 msgstr ""
 
-#: View/Pages/doc/general.ctp:23;66
-msgid "Sync Actions"
-msgstr ""
-
 #: View/Pages/doc/general.ctp:23
 msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
 msgstr ""
@@ -9627,6 +10293,11 @@ msgstr ""
 msgid "A link to this user guide."
 msgstr ""
 
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr ""
+
 #: View/Pages/doc/general.ctp:61
 msgid "View the terms &amp; conditions again."
 msgstr ""
@@ -9892,7 +10563,7 @@ msgstr ""
 
 #: View/Pages/doc/user_management.ctp:61
 #: View/Users/statistics.ctp:42
-#: View/Users/statistics_data.ctp:47
+#: View/Users/statistics_data.ctp:53
 msgid "Activity Heatmap"
 msgstr ""
 
@@ -10814,12 +11485,6 @@ msgstr ""
 msgid "As described earlier, users with tagging rights can arbitrarily tag events using tags chosen from a pool of available options. If you have tagging privileges and would like to create a new tag, navigate to Event Actions - Add Tag. You'll be presented with the following form"
 msgstr ""
 
-#: View/Pages/doc/using_the_system.ctp:303
-#: View/Templates/add.ctp:17
-#: View/Templates/edit.ctp:17
-msgid "Add tag"
-msgstr ""
-
 #: View/Pages/doc/using_the_system.ctp:303
 msgid "Enter a name for the tag and click on the color field to be able to pick a colour for it."
 msgstr ""
@@ -11149,8 +11814,8 @@ msgid "Make sure that you enter the authentication key that you have been given
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:397
-#: View/Servers/add.ctp:7
-#: View/Servers/edit.ctp:7
+#: View/Servers/add.ctp:8
+#: View/Servers/edit.ctp:8
 msgid "Base URL"
 msgstr ""
 
@@ -11251,7 +11916,7 @@ msgid "Clicking the delete button will delete the link to the instance."
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:418
-#: View/Servers/index.ctp:92
+#: View/Servers/index.ctp:128
 msgid "Push all"
 msgstr ""
 
@@ -11260,7 +11925,7 @@ msgid " By clicking this button, all events that are eligible to be pushed on th
 msgstr ""
 
 #: View/Pages/doc/using_the_system.ctp:419
-#: View/Servers/index.ctp:89
+#: View/Servers/index.ctp:125
 msgid "Pull all"
 msgstr ""
 
@@ -11414,7 +12079,7 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
-#: View/Roles/view.ctp:14
+#: View/Roles/view.ctp:5
 msgid "Permission level"
 msgstr ""
 
@@ -11422,136 +12087,155 @@ msgstr ""
 msgid "Add Server"
 msgstr ""
 
-#: View/Servers/add.ctp:10
-#: View/Servers/edit.ctp:10
+#: View/Servers/add.ctp:6
+#: View/Servers/edit.ctp:6
+msgid "Instance identification"
+msgstr ""
+
+#: View/Servers/add.ctp:11
+#: View/Servers/edit.ctp:11
 msgid "Instance name"
 msgstr ""
 
-#: View/Servers/add.ctp:16
+#: View/Servers/add.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change."
 msgstr ""
 
-#: View/Servers/add.ctp:19
-#: View/Servers/edit.ctp:19
+#: View/Servers/add.ctp:20
+#: View/Servers/edit.ctp:20
 msgid "Internal instance"
 msgstr ""
 
-#: View/Servers/add.ctp:29
+#: View/Servers/add.ctp:30
+#: View/Servers/edit.ctp:31
+msgid "Instance ownership and credentials"
+msgstr ""
+
+#: View/Servers/add.ctp:31
+#: View/Servers/edit.ctp:32
 msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
 msgstr ""
 
-#: View/Servers/add.ctp:35
+#: View/Servers/add.ctp:37
 msgid "Remote Sync Organisation Type"
 msgstr ""
 
-#: View/Servers/add.ctp:40
-#: View/Servers/edit.ctp:37
+#: View/Servers/add.ctp:42
+#: View/Servers/edit.ctp:43
 msgid "External Organisation"
 msgstr ""
 
-#: View/Servers/add.ctp:46
-#: View/Servers/edit.ctp:48
-msgid "Local Organisation"
+#: View/Servers/add.ctp:48
+msgid "Owner of remote instance"
 msgstr ""
 
-#: View/Servers/add.ctp:52
-#: View/Servers/edit.ctp:59
+#: View/Servers/add.ctp:54
+#: View/Servers/edit.ctp:65
 msgid "Remote Organisation's Name"
 msgstr ""
 
-#: View/Servers/add.ctp:56
-#: View/Servers/edit.ctp:63
+#: View/Servers/add.ctp:58
+#: View/Servers/edit.ctp:69
 msgid "Remote Organisation's Uuid"
 msgstr ""
 
-#: View/Servers/add.ctp:97
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:78
+msgid "Enabled synchronisation methods"
+msgstr ""
+
+#: View/Servers/add.ctp:86
 msgid "Server certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:103
+#: View/Servers/add.ctp:92
 msgid "Client certificate file"
 msgstr ""
 
-#: View/Servers/add.ctp:108
-#: View/Servers/edit.ctp:147
+#: View/Servers/add.ctp:97
+#: View/Servers/edit.ctp:142
 msgid "Push rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:109;115
-#: View/Servers/edit.ctp:148;154
+#: View/Servers/add.ctp:98;104
+#: View/Servers/edit.ctp:143;149
 msgid "Events with the following tags allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:110;116
-#: View/Servers/edit.ctp:149;155
+#: View/Servers/add.ctp:99;105
+#: View/Servers/edit.ctp:144;150
 msgid "Events with the following tags blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:111;117
-#: View/Servers/edit.ctp:150;156
+#: View/Servers/add.ctp:100;106
+#: View/Servers/edit.ctp:145;151
 msgid "Events with the following organisations allowed: "
 msgstr ""
 
-#: View/Servers/add.ctp:112;118
-#: View/Servers/edit.ctp:151;157
+#: View/Servers/add.ctp:101;107
+#: View/Servers/edit.ctp:146;152
 msgid "Events with the following organisations blocked: "
 msgstr ""
 
-#: View/Servers/add.ctp:114
-#: View/Servers/edit.ctp:153
+#: View/Servers/add.ctp:103
+#: View/Servers/edit.ctp:148
 msgid "Pull rules:"
 msgstr ""
 
-#: View/Servers/add.ctp:142
-#: View/Servers/edit.ctp:184
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:179
 msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
 msgstr ""
 
-#: View/Servers/add.ctp:148
+#: View/Servers/add.ctp:137
 msgid "Unpublish new event (working with Pull event)."
 msgstr ""
 
-#: View/Servers/add.ctp:149
+#: View/Servers/add.ctp:138
 msgid "Publish new event without email (working with Push event)."
 msgstr ""
 
-#: View/Servers/add.ctp:150
+#: View/Servers/add.ctp:139
 msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
 msgstr ""
 
-#: View/Servers/edit.ctp:16
+#: View/Servers/edit.ctp:17
 msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change. This also requires that the current instance's host organisation and the remote sync organisation are the same."
 msgstr ""
 
-#: View/Servers/edit.ctp:31
+#: View/Servers/edit.ctp:37
 msgid "Organisation Type"
 msgstr ""
 
-#: View/Servers/edit.ctp:69
+#: View/Servers/edit.ctp:54
+msgid "Local Organisation"
+msgstr ""
+
+#: View/Servers/edit.ctp:75
 msgid "Leave empty to use current key"
 msgstr ""
 
-#: View/Servers/edit.ctp:104
+#: View/Servers/edit.ctp:99
 msgid "Server certificate file (*.pem): "
 msgstr ""
 
-#: View/Servers/edit.ctp:112;134
+#: View/Servers/edit.ctp:107;129
 msgid "Add certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:113;135
+#: View/Servers/edit.ctp:108;130
 msgid "Remove certificate file"
 msgstr ""
 
-#: View/Servers/edit.ctp:126
+#: View/Servers/edit.ctp:121
 msgid "Client certificate file: "
 msgstr ""
 
-#: View/Servers/edit.ctp:193
+#: View/Servers/edit.ctp:188
 msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
 msgstr ""
 
-#: View/Servers/edit.ctp:250;254
+#: View/Servers/edit.ctp:245;249
 msgid "Not set."
 msgstr ""
 
@@ -11564,7 +12248,7 @@ msgid "Example:"
 msgstr ""
 
 #: View/Servers/filter_event_index.ctp:21
-msgid "Apply filters to the remote instance"
+msgid "Apply filters to the remote instance's index"
 msgstr ""
 
 #: View/Servers/index.ctp:2
@@ -11575,34 +12259,38 @@ msgstr ""
 msgid "Connection test"
 msgstr ""
 
-#: View/Servers/index.ctp:30
+#: View/Servers/index.ctp:31
 msgid "Remote Organisation"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Test the connection to the remote instance"
 msgstr ""
 
-#: View/Servers/index.ctp:71
+#: View/Servers/index.ctp:72
 msgid "Run"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Internal instance that ignores distribution level degradation *WARNING: Only use this setting if you have several internal instances and the sync link is to an internal extension of the current MISP community*"
 msgstr ""
 
-#: View/Servers/index.ctp:72
+#: View/Servers/index.ctp:73
 msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
 msgstr ""
 
-#: View/Servers/index.ctp:86
+#: View/Servers/index.ctp:122
 msgid "Explore"
 msgstr ""
 
-#: View/Servers/index.ctp:88
+#: View/Servers/index.ctp:124
 msgid "Pull updates to events that already exist locally"
 msgstr ""
 
+#: View/Servers/index.ctp:131
+msgid "Cache instance"
+msgstr ""
+
 #: View/Servers/preview_event.ctp:7
 msgid "You are currently viewing an event on the remote instance %s "
 msgstr ""
@@ -11619,15 +12307,15 @@ msgstr ""
 msgid "You are currently viewing the event index of the remote instance %s"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "published"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:147
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr ""
 
@@ -11671,19 +12359,23 @@ msgstr ""
 msgid "No succeeded pushes"
 msgstr ""
 
-#: View/Servers/rest.ctp:7;17
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
 msgid "Relative path to query"
 msgstr ""
 
-#: View/Servers/rest.ctp:54
+#: View/Servers/rest.ctp:116
 msgid "Response code"
 msgstr ""
 
-#: View/Servers/rest.ctp:55
+#: View/Servers/rest.ctp:117
 msgid "Request duration"
 msgstr ""
 
-#: View/Servers/rest.ctp:56
+#: View/Servers/rest.ctp:118
 msgid "Headers"
 msgstr ""
 
@@ -11703,6 +12395,10 @@ msgstr ""
 msgid "Available Instances"
 msgstr ""
 
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
+msgid "Added Instances"
+msgstr ""
+
 #: View/Servers/ajax/fetch_servers_for_sg.ctp:26
 msgid "Add servers to sharing group"
 msgstr ""
@@ -11750,39 +12446,31 @@ msgstr ""
 msgid "IDS Signature?"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:21
-msgid "Only list proposals of my organisation"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:21
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:26
-msgid "List all proposals"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:26
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:33
+#: View/ShadowAttributes/index.ctp:43
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:39
+#: View/ShadowAttributes/index.ctp:49
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:45
+#: View/ShadowAttributes/index.ctp:55
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:71
+#: View/ShadowAttributes/index.ctp:81
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:73
+#: View/ShadowAttributes/index.ctp:83
 msgid "New Attribute"
 msgstr ""
 
@@ -11810,166 +12498,166 @@ msgstr ""
 msgid "New Sharing Group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
-msgid "General tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
 msgid "General"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
 msgid "Organisations tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
-msgid "MISP instances tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
 msgid "MISP Instances"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
-msgid "Sharing group summary"
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:12
-#: View/SharingGroups/edit.ctp:12
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
 msgid "Example: Multinational sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:13
-#: View/SharingGroups/edit.ctp:13
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
 msgid "Releasable to"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:14
-#: View/SharingGroups/edit.ctp:14
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
 msgid "Example: Community1, Organisation1, Organisation2"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:16
-#: View/SharingGroups/edit.ctp:16
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
 msgid "A description of the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:18
-#: View/SharingGroups/edit.ctp:18
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
 msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:19
-#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
 msgid "Make the sharing group selectable (active)"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:21;38;59
-#: View/SharingGroups/edit.ctp:21;38;67
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
 msgid "Next page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation(s) to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisations to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:33
-#: View/SharingGroups/edit.ctp:33
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
 #: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:37;58;74
-#: View/SharingGroups/edit.ctp:37;66;82
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
 msgid "Previous page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:42
-#: View/SharingGroups/edit.ctp:50
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
 msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:43
-#: View/SharingGroups/edit.ctp:51
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
 msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:47
-#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:53
-#: View/SharingGroups/edit.ctp:61
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
 #: View/SharingGroups/view.ctp:69
 msgid "All orgs"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:63
+#: View/SharingGroups/add.ctp:103
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:64
+#: View/SharingGroups/add.ctp:104
 msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/add.ctp:105
 msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/add.ctp:106
 msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:67
-#: View/SharingGroups/edit.ctp:75
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
 msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:75
-#: View/SharingGroups/edit.ctp:83
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
 msgid "Submit and create sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:95
+#: View/SharingGroups/add.ctp:135
 msgid "Local instance"
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:71
+#: View/SharingGroups/edit.ctp:111
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
 "                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
 "                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:74
+#: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
@@ -11977,23 +12665,15 @@ msgstr ""
 msgid "Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:20
-msgid "View only active sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:20
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:21
-msgid "View only passive sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:21
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:61
+#: View/SharingGroups/index.ctp:80
 msgid "Distribution List"
 msgstr ""
 
@@ -12037,6 +12717,18 @@ msgstr ""
 msgid "Delete sighting"
 msgstr ""
 
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
+msgid "Add Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
+msgstr ""
+
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
 msgid "Remove Sighting"
 msgstr ""
@@ -12049,6 +12741,26 @@ msgstr ""
 msgid "Remove sighting"
 msgstr ""
 
+#: View/TagCollections/add.ctp:8
+msgid "Edit Tag Collection"
+msgstr ""
+
+#: View/TagCollections/add.ctp:16
+msgid "Visible to all orgs"
+msgstr ""
+
+#: View/TagCollections/import.ctp:4
+msgid "Paste tag collection data"
+msgstr ""
+
+#: View/TagCollections/import.ctp:5
+msgid "Paste a MISP tag collection JSON below to add tag collections."
+msgstr ""
+
+#: View/TagCollections/import.ctp:10
+msgid "Tag collection JSON"
+msgstr ""
+
 #: View/Tags/add.ctp:12
 #: View/Tags/edit.ctp:12
 msgid "Restrict tagging to org"
@@ -12059,6 +12771,10 @@ msgstr ""
 msgid "Restrict tagging to user"
 msgstr ""
 
+#: View/Tags/edit.ctp:31
+msgid "Unselectable Tag"
+msgstr ""
+
 #: View/Tags/index.ctp:10
 msgid "Your Favourite Tags"
 msgstr ""
@@ -12091,57 +12807,6 @@ msgstr ""
 msgid "Favourite"
 msgstr ""
 
-#: View/Tags/index.ctp:125
-#: View/Whitelists/admin_index.ctp:32
-msgid "Are you sure you want to delete \"%s\"?"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:2
-msgid "Select Tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:16
-#: View/Tags/ajax/taxonomy_choice.ctp:4
-msgid "search tags…"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:25
-msgid "Attach tag"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Return to taxonomy selection"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Select Taxonomy"
-msgstr ""
-
-#: View/Tags/ajax/select_tag.ctp:31
-msgid "Back to Taxonomy Selection"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:2
-msgid "Select Tag Source"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:10
-msgid "Favourite Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:14
-msgid "Custom Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:17
-msgid "All Tags"
-msgstr ""
-
-#: View/Tags/ajax/taxonomy_choice.ctp:21
-#: View/Taxonomies/view.ctp:2
-msgid "Taxonomy Library"
-msgstr ""
-
 #: View/Tasks/index.ctp:4
 msgid "Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks."
 msgstr ""
@@ -12179,7 +12844,8 @@ msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:41
-#: View/Taxonomies/view.ctp:29;143
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr ""
 
@@ -12189,7 +12855,8 @@ msgid "Are you sure you want to disable this taxonomy library?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:31;147
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr ""
 
@@ -12206,19 +12873,27 @@ msgstr ""
 msgid "Create and/or update selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:116
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
 msgid "Hidden"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:125
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:142
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:147
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr ""
 
@@ -12246,6 +12921,30 @@ msgstr ""
 msgid "Create / update all taxonomy entries as tags"
 msgstr ""
 
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
 #: View/TemplateElements/ajax/ajaxIndex.ctp:2
 msgid "Template Elements"
 msgstr ""
@@ -12498,6 +13197,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
 msgid "Terms accepted"
 msgstr ""
 
@@ -12564,15 +13265,19 @@ msgstr ""
 msgid "All users"
 msgstr ""
 
-#: View/Users/admin_email.ctp:36
+#: View/Users/admin_email.ctp:19
+msgid "All users of the same organisation"
+msgstr ""
+
+#: View/Users/admin_email.ctp:39
 msgid "Enter a custom message"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "New user registration"
 msgstr ""
 
-#: View/Users/admin_email.ctp:69
+#: View/Users/admin_email.ctp:73
 msgid "Password reset"
 msgstr ""
 
@@ -12596,10 +13301,6 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: View/Users/admin_index.ctp:40
-msgid "Filter user index"
-msgstr ""
-
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr ""
@@ -12612,42 +13313,48 @@ msgstr ""
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr ""
 
-#: View/Users/admin_view.ctp:35
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
 msgid "Contactalert"
 msgstr ""
 
-#: View/Users/admin_view.ctp:46
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/admin_view.ctp:44
 msgid "Invited By"
 msgstr ""
 
-#: View/Users/admin_view.ctp:51
-msgid "Org admin"
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:74
-#: View/Users/view.ctp:67
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr ""
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:80
-#: View/Users/view.ctp:73
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
 msgid "GnuPG status"
 msgstr ""
 
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:83
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
 msgid "SMIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:95
-msgid "Nids Sid"
-msgstr ""
-
-#: View/Users/admin_view.ctp:110
-msgid "Password change"
-msgstr ""
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr ""
@@ -12680,37 +13387,37 @@ msgid "Proposals active"
 msgstr ""
 
 #: View/Users/statistics.ctp:29
-#: View/Users/statistics_data.ctp:34
+#: View/Users/statistics_data.ctp:40
 msgid "Discussion threads"
 msgstr ""
 
 #: View/Users/statistics.ctp:34
-#: View/Users/statistics_data.ctp:39
+#: View/Users/statistics_data.ctp:45
 msgid "Discussion posts"
 msgstr ""
 
 #: View/Users/statistics.ctp:43
-#: View/Users/statistics_data.ctp:48
+#: View/Users/statistics_data.ctp:54
 msgid "A heatmap showing user activity for each day during this month and the 4 months that preceded it. Use the buttons below to only show the heatmap of a specific organisation."
 msgstr ""
 
 #: View/Users/statistics.ctp:60
-#: View/Users/statistics_data.ctp:65
+#: View/Users/statistics_data.ctp:71
 msgid "Go left"
 msgstr ""
 
 #: View/Users/statistics.ctp:66
-#: View/Users/statistics_data.ctp:71
+#: View/Users/statistics_data.ctp:77
 msgid "Go right"
 msgstr ""
 
 #: View/Users/statistics.ctp:113
-#: View/Users/statistics_data.ctp:118
+#: View/Users/statistics_data.ctp:124
 msgid "The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings."
 msgstr ""
 
 #: View/Users/statistics.ctp:117
-#: View/Users/statistics_data.ctp:122
+#: View/Users/statistics_data.ctp:128
 msgid "The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer."
 msgstr ""
 
@@ -12718,6 +13425,18 @@ msgstr ""
 msgid "A heatmap showing the usage of ATT&CK Tactic."
 msgstr ""
 
+#: View/Users/statistics_data.ctp:32
+msgid "Users with PGP keys"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:36
+msgid "Local Organisations"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:38
+msgid "Average Users / Org"
+msgstr ""
+
 #: View/Users/statistics_orgs.ctp:17
 msgid "Organisation list"
 msgstr ""
@@ -12786,12 +13505,12 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
-#: View/Users/view.ctp:45
-msgid "Request API access"
+#: View/Users/ajax/emailConfirmTemplate.ctp:2
+msgid "Confirm sending"
 msgstr ""
 
-#: View/Users/view.ctp:50
-msgid "NIDS Start SID"
+#: View/Users/ajax/emailConfirmTemplate.ctp:4
+msgid "You are about to send a mail to %s recipient(s)?"
 msgstr ""
 
 #: View/Users/ajax/fetchpgpkey.ctp:2
@@ -12854,7 +13573,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:29
+#: View/Warninglists/view.ctp:14;16
 msgid "Accepted attribute types"
 msgstr ""
 
@@ -12930,6 +13649,7 @@ msgstr ""
 #: Model/Attribute.php:validation for field uuid
 #: Model/Event.php:validation for field uuid;validation for field extends_uuid
 #: Model/EventBlacklist.php:validation for field event_uuid
+#: Model/MispObject.php:validation for field uuid
 #: Model/OrgBlacklist.php:validation for field org_uuid
 #: Model/Organisation.php:validation for field uuid
 #: Model/ShadowAttribute.php:validation for field uuid
@@ -12938,6 +13658,7 @@ msgid "Please provide a valid UUID"
 msgstr ""
 
 #: Model/Attribute.php:validation for field uuid
+#: Model/MispObject.php:validation for field uuid
 msgid "The UUID provided is not unique"
 msgstr ""
 
@@ -12957,6 +13678,7 @@ msgstr ""
 #: Model/ServerTag.php:validation for field server_id;validation for field tag_id
 #: Model/SharingGroup.php:validation for field name
 #: Model/Tag.php:validation for field name;validation for field colour
+#: Model/TagCollection.php:validation for field name
 #: Model/TemplateElementAttribute.php:validation for field name;validation for field description
 #: Model/ThreatLevel.php:validation for field name;validation for field description;validation for field form_description
 #: Model/User.php:validation for field org_id;validation for field authkey
@@ -13056,6 +13778,7 @@ msgid "This field is required."
 msgstr ""
 
 #: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
 #: Model/Whitelist.php:validation for field name
 msgid "A similar name already exists."
 msgstr ""
diff --git a/app/Locale/swe/LC_MESSAGES/default.po b/app/Locale/swe/LC_MESSAGES/default.po
new file mode 100644
index 000000000..50ca88dfa
--- /dev/null
+++ b/app/Locale/swe/LC_MESSAGES/default.po
@@ -0,0 +1,13855 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: misp\n"
+"PO-Revision-Date: 2019-03-06 02:08\n"
+"Last-Translator: SteveClement <steve@localhost.lu>\n"
+"Language-Team: Swedish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: crowdin.com\n"
+"X-Crowdin-Project: misp\n"
+"X-Crowdin-Language: sv-SE\n"
+"X-Crowdin-File: default.pot\n"
+"Language: sv_SE\n"
+
+#: Console/Command/EventShell.php:13
+#: Controller/AttributesController.php:125;129;133
+#: Controller/EventGraphController.php:34;69
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
+#: Controller/PostsController.php:56
+#: Model/Galaxy.php:292
+msgid "Invalid event"
+msgstr "Ogiltigt event"
+
+#: Console/Command/ServerShell.php:49
+#: Controller/ServersController.php:632
+msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
+msgstr "Hämting slutförd. %s events hämtade, %s events kunde inte hämtas, %s förslag hämtade."
+
+#: Console/Command/ServerShell.php:51
+msgid "ERROR: %s"
+msgstr "FEL: %s"
+
+#: Controller/AppController.php:383
+msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
+msgstr "Någonting gick fel. Ditt användarkonto som du authentiserade dig med finns inte längre."
+
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
+msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
+msgstr "Authentiseringsnyckeln är inte auktoriserad att användas för exporter. Kontakta din administratör."
+
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
+msgid "You have to be logged in to do that."
+msgstr "Du måste vara inloggad för att göra det där."
+
+#: Controller/AppController.php:627
+msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
+msgstr "Specificera söktermerna i URLen, eller POSTa en json med filter parametrar."
+
+#: Controller/AppController.php:752
+msgid "All done. attribute_count generated from scratch for "
+msgstr "All klart. attribute_count generarad från början för "
+
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
+#: Controller/ShadowAttributesController.php:1276
+msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
+msgstr "Jobbet köat. Du kan titta på hur det utvecklas om du går till aktiva jobb vyn (administration -> jobb)."
+
+#: Controller/AttributesController.php:116;1403
+#: Controller/EventGraphController.php:19;77
+msgid "No event ID set."
+msgstr "Inget event-ID satt."
+
+#: Controller/AttributesController.php:119
+msgid "You don't have permissions to create attributes"
+msgstr "Du har inte rättigheter att skapa attribut"
+
+#: Controller/AttributesController.php:139;488;668
+#: Controller/EventGraphController.php:88
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
+msgid "You do not have permission to do that."
+msgstr "Du har inte rättigheter att göra det där."
+
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
+#: Controller/TagsController.php:491
+msgid "Invalid attribute"
+msgstr "Ogiltigt attribut"
+
+#: Controller/AttributesController.php:421
+#: Controller/ShadowAttributesController.php:499
+msgid "You do not have the permission to view this event."
+msgstr "Du har inte rättigheterna för att titta på det här eventet."
+
+#: Controller/AttributesController.php:468
+msgid "Attribute not an attachment or malware-sample"
+msgstr "Attributet är inte ett attachment eller malware sampel"
+
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
+msgid "Invalid Event."
+msgstr "Ogiltigt Event."
+
+#: Controller/AttributesController.php:503;679
+#: Controller/ShadowAttributesController.php:546
+msgid "PHP says file was not uploaded. Are you attacking me?"
+msgstr "PHP säger att filen inte blev uppladdad. Attackerar du mig?"
+
+#: Controller/AttributesController.php:682
+#: Controller/ShadowAttributesController.php:549;559
+msgid "There was a problem to upload the file."
+msgstr "Det uppstod ett problem när filen laddades upp."
+
+#: Controller/AttributesController.php:826
+msgid "The ThreatConnect data has been imported."
+msgstr "ThreatConnect datat har blivit importerat."
+
+#: Controller/AttributesController.php:829
+msgid "%s entries imported."
+msgstr "%s uppslag importerade."
+
+#: Controller/AttributesController.php:833
+msgid "%s entries could not be imported."
+msgstr "%s uppslag kunde inte importeras."
+
+#: Controller/AttributesController.php:883;931;933
+#: Controller/ShadowAttributesController.php:829
+msgid "Invalid attribute."
+msgstr "Ogiltigt attribut."
+
+#: Controller/AttributesController.php:927
+msgid "Attribute could not be saved: Attribute in the request not newer than the local copy."
+msgstr "Attributet kunde inte sparas: Attributet i förfrågan är inte nyare än den lokala kopian."
+
+#: Controller/AttributesController.php:960
+msgid "The attribute has been saved"
+msgstr "Attributet har blivit sparat"
+
+#: Controller/AttributesController.php:995
+msgid "The attribute could not be saved. Please, try again."
+msgstr "Attributet kunde inte sparas. Vänligen försök igen."
+
+#: Controller/AttributesController.php:1087
+msgid "Invalid event id."
+msgstr "Ogiltigt event id."
+
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
+#: Controller/ShadowAttributesController.php:729
+msgid "Invalid input."
+msgstr "Ogiltig input."
+
+#: Controller/AttributesController.php:1122
+msgid "Invalid field."
+msgstr "Ogiltigt fält."
+
+#: Controller/AttributesController.php:1167
+msgid "Invalid attribute id."
+msgstr "Ogiltigt attribut id."
+
+#: Controller/AttributesController.php:1242;1252
+msgid "Attribute deleted"
+msgstr "Attributet raderat"
+
+#: Controller/AttributesController.php:1247;1249
+msgid "Attribute was not deleted"
+msgstr "Attributet har inte raderats"
+
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
+msgid "Invalid Attribute"
+msgstr "Ogiltigt Attribut"
+
+#: Controller/AttributesController.php:1301
+msgid "Could not restore the attribute"
+msgstr "Kunde inte återläsa attributet"
+
+#: Controller/AttributesController.php:1322;1329;1333
+msgid "Attribute not found or not authorised."
+msgstr "Attributet hittades inte eller auktorisation saknas."
+
+#: Controller/AttributesController.php:1383
+msgid "This function is only accessible via POST requests."
+msgstr "Funktionen finns endast tillgänglig via POST förfrågingar."
+
+#: Controller/AttributesController.php:1438
+msgid "No matching attributes found."
+msgstr "Inget matchande attribut hittades."
+
+#: Controller/AttributesController.php:1472
+msgid "This method can only be accessed via AJAX."
+msgstr "Den här metoden kan endast accessas via AJAX."
+
+#: Controller/AttributesController.php:1482
+msgid "You are not authorized to edit this event."
+msgstr "Du är inte auktoriserad att editera den här eventen."
+
+#: Controller/AttributesController.php:1580
+msgid "No event ID provided."
+msgstr "Inget event ID angett."
+
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
+msgid "Synonyms: "
+msgstr "Synonymer: "
+
+#: Controller/AttributesController.php:1997;2104
+msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
+msgstr "Du är inte auktoriserad. Var vänlig och skicka Authorization headern med din authkey tillsammans med en Accept header för application/xml."
+
+#: Controller/AttributesController.php:2010
+msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
+msgstr "Specifiera söktermen i URLen, eller POSTa en json array / xml (med root-elementet som \"request\" samt ange korrekt accept och content-type headrarna)."
+
+#: Controller/AttributesController.php:2030
+msgid "You don't have access to that event."
+msgstr "Du har inte access till det eventet."
+
+#: Controller/AttributesController.php:2093
+msgid "No matches."
+msgstr "Inga träffar."
+
+#: Controller/AttributesController.php:2115;2124
+msgid "Invalid attribute or no authorisation to view it."
+msgstr "Ogiltigt attribut eller ingen auktorisation att se det."
+
+#: Controller/AttributesController.php:2192
+msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
+msgstr "Specifiera sök-termen i URLen, eller POSTa en json matris / xml (med root elementet som \"request\" samt specificera de korrekta headrarna baserat på content-type."
+
+#: Controller/AttributesController.php:2256
+msgid "Invalid event ID format."
+msgstr "Ogiltigt event ID format."
+
+#: Controller/AttributesController.php:2365
+#: Controller/ShadowAttributesController.php:1254
+msgid "All done. "
+msgstr "Allt klart."
+
+#: Controller/AttributesController.php:2397;2444
+#: Controller/ShadowAttributesController.php:1062
+msgid "Invalid field requested."
+msgstr "Ogiltigt fält efterfrågat."
+
+#: Controller/AttributesController.php:2400;2447
+msgid "This function can only be accessed via AJAX."
+msgstr "Funktionen kan endast nås via AJAX."
+
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
+msgid "Event not found or you don't have permissions to create attributes"
+msgstr "Eventet hittades inte eller så saknar du rättigheter att skapa attributen"
+
+#: Controller/AttributesController.php:2541
+msgid "This action can only be accessed via AJAX."
+msgstr "Den här mekanismen kan endast nås via AJAX."
+
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
+msgid "You are not authorised to do that."
+msgstr "Du saknar rättigheter att göra det där."
+
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
+msgid "This functionality requires API key access."
+msgstr "Den här funktionen kräver API nyckel access."
+
+#: Controller/AttributesController.php:2663
+msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
+msgstr "Den här mekanismen är endast för API:et. Vänligen referera till automation-sidan för information om hur det används."
+
+#: Controller/AttributesController.php:2675
+msgid "No hash or event ID received. You need to set at least one of the two."
+msgstr "Ingen hash eller event ID mottaget. Du behöver sätta åtminstone en av de två."
+
+#: Controller/AttributesController.php:2836
+msgid "Invalid script."
+msgstr "Ogiltigt skript."
+
+#: Controller/AttributesController.php:2901
+msgid "No valid enrichment options found for this attribute."
+msgstr "Inget giltiga enrichment optioner hittade för det här attributet."
+
+#: Controller/AttributesController.php:2964
+msgid "Invalid type requested."
+msgstr "Ogiltigt typ efterfrågad."
+
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
+msgid "Disabling the correlation is not permitted on this instance."
+msgstr "Slå av korrelation är inte tillåtet på den här instansen."
+
+#: Controller/AttributesController.php:3243;3258
+#: Controller/ShadowAttributesController.php:677
+msgid "Invalid Attribute."
+msgstr "Ogiltigt Attribut."
+
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
+msgid "You don't have permission to do that."
+msgstr "Du saknar rättigheter att göra det där."
+
+#: Controller/EventBlacklistsController.php:15
+msgid "Event Blacklisting is not currently enabled on this instance."
+msgstr "Event Blacklisting är för närvarande inte påslaget på den här instansen."
+
+#: Controller/EventsController.php:848
+msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
+msgstr ""
+
+#: Controller/EventsController.php:850
+msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
+msgstr ""
+
+#: Controller/EventsController.php:856
+msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
+msgstr ""
+
+#: Controller/EventsController.php:858
+msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
+msgstr ""
+
+#: Controller/EventsController.php:1559
+msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
+msgstr ""
+
+#: Controller/EventsController.php:1769
+msgid "You don't have permissions to create events"
+msgstr ""
+
+#: Controller/EventsController.php:1775
+msgid "No valid event data received."
+msgstr ""
+
+#: Controller/EventsController.php:1811
+msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
+msgstr ""
+
+#: Controller/EventsController.php:1815;1819
+msgid "Invalid Sharing Group or not authorised."
+msgstr ""
+
+#: Controller/EventsController.php:1843
+msgid "Event blocked by local blacklist."
+msgstr ""
+
+#: Controller/EventsController.php:1856;1933;2197
+msgid "The event has been saved"
+msgstr ""
+
+#: Controller/EventsController.php:1864
+msgid "Event already exists, if you would like to edit it, use the url in the location header."
+msgstr ""
+
+#: Controller/EventsController.php:1870
+msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
+msgstr ""
+
+#: Controller/EventsController.php:1872;2200
+msgid "The event could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/EventsController.php:1912
+msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
+msgstr ""
+
+#: Controller/EventsController.php:1959
+msgid "You may only upload MISP XML or MISP JSON files."
+msgstr ""
+
+#: Controller/EventsController.php:1960
+msgid "File upload failed or file does not have the expected extension (.xml / .json)."
+msgstr ""
+
+#: Controller/EventsController.php:2009
+msgid "STIX document imported, event's created: "
+msgstr ""
+
+#: Controller/EventsController.php:2012
+msgid "STIX document imported."
+msgstr ""
+
+#: Controller/EventsController.php:2015
+msgid "Could not import STIX document: "
+msgstr ""
+
+#: Controller/EventsController.php:2022
+msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
+msgstr ""
+
+#: Controller/EventsController.php:2046;2131
+msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
+msgstr ""
+
+#: Controller/EventsController.php:2054
+msgid "Invalid event ID entered."
+msgstr ""
+
+#: Controller/EventsController.php:2059
+msgid "You are not authorised to read the selected event."
+msgstr ""
+
+#: Controller/EventsController.php:2349;2387;2450
+msgid "You don't have the permission to do that."
+msgstr ""
+
+#: Controller/EventsController.php:2358
+msgid "Event unpublished."
+msgstr ""
+
+#: Controller/EventsController.php:2537
+msgid "Email sent to the reporter."
+msgstr ""
+
+#: Controller/EventsController.php:2539
+msgid "Sending of email failed"
+msgstr ""
+
+#: Controller/EventsController.php:2678
+msgid "This feature is currently disabled"
+msgstr ""
+
+#: Controller/EventsController.php:2720;3986
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
+msgstr ""
+
+#: Controller/EventsController.php:2756
+msgid "Invalid Event ID."
+msgstr ""
+
+#: Controller/EventsController.php:2803
+msgid "No events found that match the passed parameters."
+msgstr ""
+
+#: Controller/EventsController.php:2828
+msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
+msgstr ""
+
+#: Controller/EventsController.php:2903
+msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
+msgstr ""
+
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
+msgid "Invalid hash type."
+msgstr ""
+
+#: Controller/EventsController.php:3025
+msgid "Filename not allowed."
+msgstr ""
+
+#: Controller/EventsController.php:3045
+msgid "Problem with writing the ioc file. Please report to administrator."
+msgstr ""
+
+#: Controller/EventsController.php:3139
+msgid "This is not a valid MISP XML file."
+msgstr ""
+
+#: Controller/EventsController.php:3291
+msgid "Not yet implemented"
+msgstr ""
+
+#: Controller/EventsController.php:3309;3313
+msgid "Invalid event or not authorised."
+msgstr ""
+
+#: Controller/EventsController.php:3333;3403
+msgid "You don't have the privileges to access this."
+msgstr ""
+
+#: Controller/EventsController.php:3610
+#: Controller/TagCollectionsController.php:307
+msgid "Invalid Tag."
+msgstr ""
+
+#: Controller/EventsController.php:3626
+#: Controller/TagCollectionsController.php:323
+msgid "Tag is already attached to this event."
+msgstr ""
+
+#: Controller/EventsController.php:3637;3643
+#: Controller/TagCollectionsController.php:330
+msgid "Tag(s) added."
+msgstr ""
+
+#: Controller/EventsController.php:3639
+msgid "Tag could not be added."
+msgstr ""
+
+#: Controller/EventsController.php:3645
+#: Controller/TagCollectionsController.php:338
+msgid "All tags are already present, nothing to add."
+msgstr ""
+
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
+msgid "Invalid event."
+msgstr ""
+
+#: Controller/EventsController.php:3918
+msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
+msgstr ""
+
+#: Controller/EventsController.php:4049;4079;4095
+msgid "You do not have the permission to do that."
+msgstr ""
+
+#: Controller/EventsController.php:4160;4300
+msgid "Invalid ID"
+msgstr ""
+
+#: Controller/EventsController.php:4164;4304
+msgid "Event not found or you are not authorised to view it."
+msgstr ""
+
+#: Controller/EventsController.php:4405;4412
+msgid "Please POST the samples as described on the automation page."
+msgstr ""
+
+#: Controller/EventsController.php:4441
+msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
+msgstr ""
+
+#: Controller/EventsController.php:4449
+msgid "Event not found"
+msgstr ""
+
+#: Controller/EventsController.php:4472
+msgid "Event not found."
+msgstr ""
+
+#: Controller/EventsController.php:4482
+msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
+msgstr ""
+
+#: Controller/EventsController.php:4507
+msgid "The creation of a new event with the supplied information has failed."
+msgstr ""
+
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
+msgid "Invalid type."
+msgstr ""
+
+#: Controller/EventsController.php:4906
+msgid "Invalid method."
+msgstr ""
+
+#: Controller/EventsController.php:4989
+msgid "%s services are not enabled."
+msgstr ""
+
+#: Controller/EventsController.php:4993
+msgid "Attribute not found or you are not authorised to see it."
+msgstr ""
+
+#: Controller/EventsController.php:4999
+msgid "No valid %s options found for this attribute."
+msgstr ""
+
+#: Controller/EventsController.php:5016
+msgid "no valid %s options found for this attribute."
+msgstr ""
+
+#: Controller/EventsController.php:5038
+msgid "%s service not reachable."
+msgstr ""
+
+#: Controller/EventsController.php:5050
+msgid ": Enriched via the %s"
+msgstr ""
+
+#: Controller/EventsController.php:5184
+msgid "Import service not reachable."
+msgstr ""
+
+#: Controller/EventsController.php:5351
+msgid "Invalid ID."
+msgstr ""
+
+#: Controller/EventsController.php:5399
+#: Controller/ShadowAttributesController.php:311;316;532
+msgid "Invalid Event"
+msgstr ""
+
+#: Controller/EventsController.php:5420
+msgid "Enrichment task queued for background processing. Check back later to see the results."
+msgstr ""
+
+#: Controller/FeedsController.php:27
+msgid "You don't have the required privileges to do that."
+msgstr ""
+
+#: Controller/FeedsController.php:205;303
+msgid "Feed added."
+msgstr ""
+
+#: Controller/FeedsController.php:213
+msgid "Feed could not be added. Invalid field: %s"
+msgstr ""
+
+#: Controller/FeedsController.php:238;338;360;482;517;721
+msgid "Invalid feed."
+msgstr ""
+
+#: Controller/FeedsController.php:311
+msgid "Feed could not be updated. Invalid fields: %s"
+msgstr ""
+
+#: Controller/FeedsController.php:334
+msgid "This action requires a post request."
+msgstr ""
+
+#: Controller/FeedsController.php:367;486
+msgid "Feed is currently not enabled. Make sure you enable it."
+msgstr ""
+
+#: Controller/FeedsController.php:380;446
+msgid "Starting fetch from Feed."
+msgstr ""
+
+#: Controller/FeedsController.php:391
+msgid "Pull queued for background execution."
+msgstr ""
+
+#: Controller/FeedsController.php:396;398
+msgid "Fetching the feed has failed."
+msgstr ""
+
+#: Controller/FeedsController.php:402
+msgid "Fetching the feed has successfuly completed."
+msgstr ""
+
+#: Controller/FeedsController.php:463
+msgid "Fetching the feed has successfully completed."
+msgstr ""
+
+#: Controller/FeedsController.php:493
+msgid "Event added."
+msgstr ""
+
+#: Controller/FeedsController.php:496
+msgid "Event already up to date."
+msgstr ""
+
+#: Controller/FeedsController.php:498
+msgid "Event updated."
+msgstr ""
+
+#: Controller/FeedsController.php:502
+msgid "Could not %s event."
+msgstr ""
+
+#: Controller/FeedsController.php:505
+msgid "Download failed."
+msgstr ""
+
+#: Controller/FeedsController.php:597
+msgid "Feed could not be fetched. The HTTP error code returned was: "
+msgstr ""
+
+#: Controller/FeedsController.php:636;687
+msgid "Invalid feed type."
+msgstr ""
+
+#: Controller/FeedsController.php:753
+msgid "This event is blocked by the Feed filters."
+msgstr ""
+
+#: Controller/FeedsController.php:755
+msgid "Could not download the selected Event"
+msgstr ""
+
+#: Controller/FeedsController.php:791;795
+msgid "Invalid Feed."
+msgstr ""
+
+#: Controller/FeedsController.php:816
+msgid "Only POST requests are allowed."
+msgstr ""
+
+#: Controller/FeedsController.php:820
+msgid "Feed not found."
+msgstr ""
+
+#: Controller/FeedsController.php:829
+msgid "Data pulled."
+msgstr ""
+
+#: Controller/FeedsController.php:831
+msgid "Could not pull the selected data. Reason: %s"
+msgstr ""
+
+#: Controller/FeedsController.php:848
+msgid "Starting feed caching."
+msgstr ""
+
+#: Controller/FeedsController.php:863
+msgid "Caching the feeds has failed."
+msgstr ""
+
+#: Controller/FeedsController.php:866
+msgid "Caching the feeds has successfully completed."
+msgstr ""
+
+#: Controller/FeedsController.php:900
+msgid "Invalid feed list received."
+msgstr ""
+
+#: Controller/GalaxiesController.php:92
+msgid "All clusters"
+msgstr ""
+
+#: Controller/GalaxiesController.php:135
+msgid "All namespaces"
+msgstr ""
+
+#: Controller/GalaxiesController.php:250
+msgid "Failed to parse request."
+msgstr ""
+
+#: Controller/GalaxiesController.php:253
+msgid "No clusters picked."
+msgstr ""
+
+#: Controller/JobsController.php:156
+msgid "All completed jobs have been purged"
+msgstr ""
+
+#: Controller/JobsController.php:159
+msgid "All jobs have been purged"
+msgstr ""
+
+#: Controller/ObjectReferencesController.php:37
+msgid "Invalid object"
+msgstr ""
+
+#: Controller/ObjectReferencesController.php:188
+msgid "Invalid object reference"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:31
+msgid "All Objects"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:99
+msgid "Invalid object template"
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:103
+msgid "Invalid object template id."
+msgstr ""
+
+#: Controller/ObjectTemplatesController.php:143
+msgid "ObjectTemplate deleted"
+msgstr ""
+
+#: Controller/ObjectsController.php:29
+msgid "This action can only be reached via POST requests"
+msgstr ""
+
+#: Controller/ObjectsController.php:69;82
+msgid "Invalid sharing group."
+msgstr ""
+
+#: Controller/ObjectsController.php:103
+msgid "You don't have permissions to create objects."
+msgstr ""
+
+#: Controller/ObjectsController.php:131
+#: Model/Template.php:25
+msgid "Invalid template."
+msgstr ""
+
+#: Controller/ObjectsController.php:311
+msgid "You don't have permissions to edit objects."
+msgstr ""
+
+#: Controller/ObjectsController.php:325;336;439
+msgid "Invalid object."
+msgstr ""
+
+#: Controller/ObjectsController.php:433
+msgid "You don't have permissions to delete objects."
+msgstr ""
+
+#: Controller/ObjectsController.php:543;550;554
+msgid "Object not found or not authorised."
+msgstr ""
+
+#: Controller/ObjectsController.php:811
+msgid "%s objects successfully reconstructed."
+msgstr ""
+
+#: Controller/OrgBlacklistsController.php:15
+msgid "Organisation Blacklisting is not currently enabled on this instance."
+msgstr ""
+
+#: Controller/OrganisationsController.php:251
+msgid "Organisation deleted"
+msgstr ""
+
+#: Controller/OrganisationsController.php:258
+msgid "Organisation could not be deleted. Generally organisations should never be deleted, instead consider moving them to the known remote organisations list. Alternatively, if you are certain that you would like to remove an organisation and are aware of the impact, make sure that there are no users or events still tied to this organisation before deleting it."
+msgstr ""
+
+#: Controller/PostsController.php:80
+msgid "Invalid thread"
+msgstr ""
+
+#: Controller/PostsController.php:176
+msgid "Post added"
+msgstr ""
+
+#: Controller/PostsController.php:208;256
+msgid "Invalid post"
+msgstr ""
+
+#: Controller/RegexpController.php:27
+msgid "The Regexp has been saved."
+msgstr ""
+
+#: Controller/RegexpController.php:31
+msgid "The Regexp could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/RegexpController.php:45;116
+msgid "The Regular expressions have been saved."
+msgstr ""
+
+#: Controller/RegexpController.php:48;123
+msgid "Could not create the Regex entry as no types were selected. Either check \"All\" or check the types that you wish the Regex to affect."
+msgstr ""
+
+#: Controller/RegexpController.php:211
+msgid "All done! Number of changed attributes: "
+msgstr ""
+
+#: Controller/RegexpController.php:231
+msgid "All done! Found and cleaned "
+msgstr ""
+
+#: Controller/RolesController.php:33
+msgid "Invalid role"
+msgstr ""
+
+#: Controller/RolesController.php:67;108
+msgid "The Role could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/RolesController.php:157
+msgid "Role deleted"
+msgstr ""
+
+#: Controller/ServersController.php:226;417
+msgid "The pull filter rules must be in valid JSON format."
+msgstr ""
+
+#: Controller/ServersController.php:236;427
+msgid "The push filter rules must be in valid JSON format."
+msgstr ""
+
+#: Controller/ServersController.php:291;457
+msgid "That organisation could not be created as the uuid is in use already."
+msgstr ""
+
+#: Controller/ServersController.php:303
+msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format? Also, make sure the organisation's name doesn't clash with an existing one."
+msgstr ""
+
+#: Controller/ServersController.php:332;513
+msgid "The server has been saved"
+msgstr ""
+
+#: Controller/ServersController.php:339;520
+msgid "The server could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/ServersController.php:392;589;614;623;683;1360
+msgid "Invalid server"
+msgstr ""
+
+#: Controller/ServersController.php:474
+msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
+msgstr ""
+
+#: Controller/ServersController.php:596
+msgid "Server deleted"
+msgstr ""
+
+#: Controller/ServersController.php:599
+msgid "Server was not deleted"
+msgstr ""
+
+#: Controller/ServersController.php:626
+msgid "Pull setting not enabled for this server."
+msgstr ""
+
+#: Controller/ServersController.php:659
+msgid "Pull queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:696
+msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
+msgstr ""
+
+#: Controller/ServersController.php:709
+msgid "Push complete. %s events pushed, %s events could not be pushed."
+msgstr ""
+
+#: Controller/ServersController.php:734
+msgid "Push queued for background execution. Job ID: %s"
+msgstr ""
+
+#: Controller/ServersController.php:1257
+msgid "File not found."
+msgstr ""
+
+#: Controller/ServersController.php:1263
+msgid "File could not be deleted."
+msgstr ""
+
+#: Controller/ServersController.php:1286;1302
+msgid "Upload failed."
+msgstr ""
+
+#: Controller/ServersController.php:1294
+msgid "File already exists. If you would like to replace it, remove the old one first."
+msgstr ""
+
+#: Controller/ServersController.php:1748
+msgid "Starting server caching."
+msgstr ""
+
+#: Controller/ServersController.php:1763
+msgid "Caching the servers has failed."
+msgstr ""
+
+#: Controller/ServersController.php:1766
+msgid "Caching the servers has successfully completed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:211
+msgid "Moving of the file that this attachment references failed."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:279
+msgid "Could not discard proposal."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:340
+msgid "Attribute has not been added: attachments are added by \"Add attachment\" button"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:388;391;400
+msgid "The lines"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:440
+msgid "The proposal has been saved"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:452;761
+msgid "Could not save the proposal. Errors: %s"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:454
+msgid "The proposal could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:491
+msgid "Invalid Proposal"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:521
+msgid "Proposal not an attachment or malware-sample"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:617
+msgid "The attachment has been uploaded"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:619
+msgid "The attachment has been uploaded, but some of the proposals could not be created. The failed proposals are: "
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:622
+msgid "The attachment could not be saved, please contact your administrator."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:752
+msgid "The proposed Attribute has been saved"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:763
+msgid "The ShadowAttribute could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:894;904
+msgid "Invalid proposal."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:948
+msgid "No proposals found or invalid event."
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:980;1016
+msgid "This feature is only available using the API to Sync users"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:983
+msgid "Invalid UUID"
+msgstr ""
+
+#: Controller/ShadowAttributesController.php:1019
+msgid "This feature is only available using POST requests"
+msgstr ""
+
+#: Controller/SharingGroupsController.php:237
+msgid "Sharing Group deleted"
+msgstr ""
+
+#: Controller/SharingGroupsController.php:242
+msgid "Sharing Group could not be deleted. Make sure that there are no events, attributes or threads belonging to this sharing group."
+msgstr ""
+
+#: Controller/SightingsController.php:86
+msgid "Could not add the Sighting. Reason: "
+msgstr ""
+
+#: Controller/SightingsController.php:96;99
+msgid "Sighting added"
+msgstr ""
+
+#: Controller/SightingsController.php:152
+msgid "You are not authorised to remove sightings data as you don't have permission to modify your organisation's data."
+msgstr ""
+
+#: Controller/SightingsController.php:158
+msgid "Attribute not found"
+msgstr ""
+
+#: Controller/SightingsController.php:176
+msgid "Invalid request."
+msgstr ""
+
+#: Controller/SightingsController.php:185
+msgid "Sighting added."
+msgstr ""
+
+#: Controller/SightingsController.php:187
+msgid "Sighting could not be added"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:56;177
+msgid "The tag collection has been saved"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:64;185
+msgid "The tag collection could not be added. Reason: "
+msgstr ""
+
+#: Controller/TagCollectionsController.php:85
+msgid "%s new tag collections added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:154
+msgid "Invalid Tag Collection"
+msgstr ""
+
+#: Controller/TagCollectionsController.php:161
+msgid "You don't have editing rights on this Tag Collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:201;380
+msgid "Invalid tag collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:207
+msgid "Tag collection deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:215
+msgid "Tag collection could not be deleted."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:224
+msgid "You are not allowed to delete that."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:332
+msgid "Tag(s) could not be added."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:384
+msgid "Insufficient privileges to remove the tag from the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:395
+msgid "Invalid tag or tag not associated with the collection."
+msgstr ""
+
+#: Controller/TagCollectionsController.php:399
+msgid "Failed to remove tag from the collection."
+msgstr ""
+
+#: Controller/TagsController.php:367
+msgid "Tag deleted"
+msgstr ""
+
+#: Controller/TagsController.php:372
+msgid "Tag was not deleted"
+msgstr ""
+
+#: Controller/TagsController.php:580
+msgid "Favourite Tags"
+msgstr ""
+
+#: Controller/TagsController.php:586
+msgid "Tag Collections"
+msgstr ""
+
+#: Controller/TagsController.php:591
+msgid "All Tags"
+msgstr ""
+
+#: Controller/TagsController.php:601
+#: View/Taxonomies/view.ctp:2
+msgid "Taxonomy Library"
+msgstr ""
+
+#: Controller/TagsController.php:756
+msgid "Includes: "
+msgstr ""
+
+#: Controller/TemplatesController.php:408
+msgid "Event populated, "
+msgstr ""
+
+#: Controller/TemplatesController.php:410
+msgid "Event populated, but "
+msgstr ""
+
+#: Controller/UsersController.php:42;247
+msgid "Invalid user or not authorised."
+msgstr ""
+
+#: Controller/UsersController.php:54;456;683;929
+msgid "Invalid user"
+msgstr ""
+
+#: Controller/UsersController.php:119;590;754
+msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
+msgstr ""
+
+#: Controller/UsersController.php:146
+msgid "The profile has been updated"
+msgstr ""
+
+#: Controller/UsersController.php:150
+msgid "The profile could not be updated. Please, try again."
+msgstr ""
+
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
+msgid "Password Changed."
+msgstr ""
+
+#: Controller/UsersController.php:222
+msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
+msgstr ""
+
+#: Controller/UsersController.php:601
+msgid "The user could not be saved. Invalid organisation."
+msgstr ""
+
+#: Controller/UsersController.php:623
+msgid "The user has been saved."
+msgstr ""
+
+#: Controller/UsersController.php:632;865
+msgid "The user could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/UsersController.php:857
+msgid "The user has been saved"
+msgstr ""
+
+#: Controller/UsersController.php:937
+msgid "User deleted"
+msgstr ""
+
+#: Controller/UsersController.php:941
+msgid "User was not deleted"
+msgstr ""
+
+#: Controller/UsersController.php:1019
+msgid "Invalid username or password, try again"
+msgstr ""
+
+#: Controller/UsersController.php:1106
+msgid "Good-Bye"
+msgstr ""
+
+#: Controller/UsersController.php:1147
+msgid "New authkey generated."
+msgstr ""
+
+#: Controller/UsersController.php:1256
+msgid "You accepted the Terms and Conditions."
+msgstr ""
+
+#: Controller/UsersController.php:1438
+msgid "Recipient email not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1443
+msgid "Recipient organisation not provided"
+msgstr ""
+
+#: Controller/UsersController.php:1480
+msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
+msgstr ""
+
+#: Controller/UsersController.php:1482
+msgid "E-mails sent."
+msgstr ""
+
+#: Controller/Component/AdminCrudComponent.php:20
+msgid "The %s has been saved."
+msgstr ""
+
+#: Controller/Component/AdminCrudComponent.php:24;61
+msgid "The %s could not be saved. Please, try again."
+msgstr ""
+
+#: Controller/Component/AdminCrudComponent.php:52;85
+msgid "Invalid %s"
+msgstr ""
+
+#: Controller/Component/AdminCrudComponent.php:57
+msgid "The %s has been saved"
+msgstr ""
+
+#: Controller/Component/AdminCrudComponent.php:88
+msgid "%s deleted"
+msgstr ""
+
+#: Controller/Component/AdminCrudComponent.php:91
+msgid "%s was not deleted"
+msgstr ""
+
+#: Controller/Component/BlackListComponent.php:75
+msgid "Done. Added %d new entries to the blacklist. %d entries could not be saved."
+msgstr ""
+
+#: Controller/Component/BlackListComponent.php:126
+msgid "Blacklist item added."
+msgstr ""
+
+#: Controller/Component/BlackListComponent.php:155
+msgid "Invalid blacklist entry"
+msgstr ""
+
+#: Controller/Component/BlackListComponent.php:159
+msgid "Blacklist entry removed"
+msgstr ""
+
+#: Controller/Component/BlackListComponent.php:161
+msgid "Could not remove the blacklist entry"
+msgstr ""
+
+#: Model/Attribute.php:591
+msgid "Composite type, but value not explodable"
+msgstr ""
+
+#: Model/Attribute.php:703
+msgid "Delete of file attachment failed. Please report to administrator."
+msgstr ""
+
+#: Model/Attribute.php:828
+msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
+msgstr ""
+
+#: Model/Attribute.php:953
+msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:960
+msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:967
+msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
+msgstr ""
+
+#: Model/Attribute.php:978
+msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
+msgstr ""
+
+#: Model/Attribute.php:989
+msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
+msgstr ""
+
+#: Model/Attribute.php:996
+msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
+msgstr ""
+
+#: Model/Attribute.php:1011
+msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
+msgstr ""
+
+#: Model/Attribute.php:1029
+msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:1034
+msgid "Invalid composite type. The format has to be %s."
+msgstr ""
+
+#: Model/Attribute.php:1045
+msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
+msgstr ""
+
+#: Model/Attribute.php:1053
+msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:1064
+msgid "Invalid CIDR notation value found."
+msgstr ""
+
+#: Model/Attribute.php:1071;1122
+msgid "IP address has an invalid format."
+msgstr ""
+
+#: Model/Attribute.php:1076
+msgid "Port numbers have to be positive integers between 1 and 65535."
+msgstr ""
+
+#: Model/Attribute.php:1105
+msgid " name has an invalid format. Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:1125
+msgid "Domain name has an invalid format."
+msgstr ""
+
+#: Model/Attribute.php:1138
+msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:1146
+msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
+msgstr ""
+
+#: Model/Attribute.php:1157
+msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
+msgstr ""
+
+#: Model/Attribute.php:1272
+msgid "Datetime has to be in the ISO 8601 format."
+msgstr ""
+
+#: Model/Attribute.php:1278
+msgid "The value has to be a number greater or equal 0."
+msgstr ""
+
+#: Model/Attribute.php:1285
+msgid "The value has to be a number between 0 and 10."
+msgstr ""
+
+#: Model/Attribute.php:1968;2036
+msgid "Could not read user."
+msgstr ""
+
+#: Model/Attribute.php:2616
+msgid "This field is mandatory."
+msgstr ""
+
+#: Model/Attribute.php:3069
+msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
+msgstr ""
+
+#: Model/Event.php:5392
+msgid "Issues while loading the stix file. "
+msgstr ""
+
+#: Model/Event.php:5394
+msgid "Issues with the maec library. "
+msgstr ""
+
+#: Model/Event.php:5396
+msgid "Issues executing the ingestion script or invalid input. "
+msgstr ""
+
+#: Model/Event.php:5399
+msgid "Please ask your administrator to "
+msgstr ""
+
+#: Model/Event.php:5401
+msgid "Please "
+msgstr ""
+
+#: Model/Event.php:5403
+msgid "check whether the dependencies for STIX are met via the diagnostic tool."
+msgstr ""
+
+#: Model/Event.php:5435
+msgid "#"
+msgstr ""
+
+#: Model/Event.php:5444
+msgid "%s not set"
+msgstr ""
+
+#: Model/Event.php:5667
+msgid "Could not add tags."
+msgstr ""
+
+#: Model/Galaxy.php:219;276;286;300
+msgid "Invalid %s."
+msgstr ""
+
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
+msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
+msgstr ""
+
+#: Model/Server.php:122
+msgid "Administering MISP via the CLI"
+msgstr ""
+
+#: Model/Server.php:132
+msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
+msgstr ""
+
+#: Model/Server.php:133
+#: View/Tasks/index.ctp:6
+msgid "Automating certain console tasks"
+msgstr ""
+
+#: Model/Server.php:142
+msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
+msgstr ""
+
+#: Model/Server.php:144
+msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
+msgstr ""
+
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
+msgid "Unless set to true, the instance will only be accessible by site admins."
+msgstr ""
+
+#: Model/Server.php:166
+msgid "Select the language MISP should use. The default is english."
+msgstr ""
+
+#: Model/Server.php:176
+msgid "Enable some performance heavy correlations (currently CIDR correlation)"
+msgstr ""
+
+#: Model/Server.php:185
+msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
+msgstr ""
+
+#: Model/Server.php:195
+msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
+msgstr ""
+
+#: Model/Server.php:204
+msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
+msgstr ""
+
+#: Model/Server.php:212
+msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
+msgstr ""
+
+#: Model/Server.php:221
+msgid "The message that users will see if the instance is not live."
+msgstr ""
+
+#: Model/Server.php:223
+msgid "If this is not set the default value will be used."
+msgstr ""
+
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
+msgid "This setting is deprecated and can be safely removed."
+msgstr ""
+
+#: Model/Server.php:245
+msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
+msgstr ""
+
+#: Model/Server.php:263
+msgid "Footer text prepending the \"Powered by MISP\" text."
+msgstr ""
+
+#: Model/Server.php:271
+msgid "Footer text following the \"Powered by MISP\" text."
+msgstr ""
+
+#: Model/Server.php:311
+msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
+msgstr ""
+
+#: Model/Server.php:319
+msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
+msgstr ""
+
+#: Model/Server.php:327
+msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
+msgstr ""
+
+#: Model/Server.php:335
+msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
+msgstr ""
+
+#: Model/Server.php:343
+msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
+msgstr ""
+
+#: Model/Server.php:352
+msgid "The MISP instance UUID. This UUID is used to identify this instance."
+msgstr ""
+
+#: Model/Server.php:354
+msgid "No valid UUID set"
+msgstr ""
+
+#: Model/Server.php:368
+msgid "Setting this setting to 'false' will hide all organisation names / logos."
+msgstr ""
+
+#: Model/Server.php:376
+msgid "Put the event threat level in the notification E-mail subject."
+msgstr ""
+
+#: Model/Server.php:384
+msgid "This is the TLP string for e-mails when email_subject_tag is not found."
+msgstr ""
+
+#: Model/Server.php:392
+msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
+msgstr ""
+
+#: Model/Server.php:400
+msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
+msgstr ""
+
+#: Model/Server.php:424
+msgid "Enables the use of MISP's background processing."
+msgstr ""
+
+#: Model/Server.php:432
+msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
+msgstr ""
+
+#: Model/Server.php:441
+msgid "Allow the XML caches to include the encoded attachments."
+msgstr ""
+
+#: Model/Server.php:449
+msgid "Always download attachments when loaded by a user in a browser"
+msgstr ""
+
+#: Model/Server.php:457
+msgid "The e-mail address that MISP should use for all notifications"
+msgstr ""
+
+#: Model/Server.php:465
+msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
+msgstr ""
+
+#: Model/Server.php:474
+msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
+msgstr ""
+
+#: Model/Server.php:490
+msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
+msgstr ""
+
+#: Model/Server.php:498
+msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
+msgstr ""
+
+#: Model/Server.php:506
+msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
+msgstr ""
+
+#: Model/Server.php:514
+msgid "The default distribution setting for events (0-3)."
+msgstr ""
+
+#: Model/Server.php:523
+msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
+msgstr ""
+
+#: Model/Server.php:532
+msgid "The default threat level setting when creating events."
+msgstr ""
+
+#: Model/Server.php:541
+msgid "The tag collection to be applied to all events created manually."
+msgstr ""
+
+#: Model/Server.php:550
+msgid "Enable the tagging feature of MISP. This is highly recommended."
+msgstr ""
+
+#: Model/Server.php:558
+msgid "Show the full tag names on the event index."
+msgstr ""
+
+#: Model/Server.php:567
+msgid "Used on the login page, before the MISP logo"
+msgstr ""
+
+#: Model/Server.php:575
+msgid "Used on the login page, after the MISP logo"
+msgstr ""
+
+#: Model/Server.php:583
+msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
+msgstr ""
+
+#: Model/Server.php:591
+msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
+msgstr ""
+
+#: Model/Server.php:599
+msgid "Used in the page title, after the name of the page"
+msgstr ""
+
+#: Model/Server.php:607
+msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
+msgstr ""
+
+#: Model/Server.php:615
+msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
+msgstr ""
+
+#: Model/Server.php:623
+msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
+msgstr ""
+
+#: Model/Server.php:631
+msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
+msgstr ""
+
+#: Model/Server.php:639
+msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
+msgstr ""
+
+#: Model/Server.php:648
+msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
+msgstr ""
+
+#: Model/Server.php:657
+msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
+msgstr ""
+
+#: Model/Server.php:665
+msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
+msgstr ""
+
+#: Model/Server.php:672
+msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
+msgstr ""
+
+#: Model/Server.php:679
+msgid "If enabled, all log entries will include the IP address of the user."
+msgstr ""
+
+#: Model/Server.php:688
+msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
+msgstr ""
+
+#: Model/Server.php:696
+msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
+msgstr ""
+
+#: Model/Server.php:705
+msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
+msgstr ""
+
+#: Model/Server.php:714
+msgid "When enabled, the number of proposals for the events are shown on the index."
+msgstr ""
+
+#: Model/Server.php:723
+msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
+msgstr ""
+
+#: Model/Server.php:732
+msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
+msgstr ""
+
+#: Model/Server.php:741
+msgid "When enabled only Org and Site admins can edit a user's profile."
+msgstr ""
+
+#: Model/Server.php:751
+msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
+msgstr ""
+
+#: Model/Server.php:760
+msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
+msgstr ""
+
+#: Model/Server.php:769
+msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
+msgstr ""
+
+#: Model/Server.php:778
+msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
+msgstr ""
+
+#: Model/Server.php:787
+msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
+msgstr ""
+
+#: Model/Server.php:796
+msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
+msgstr ""
+
+#: Model/Server.php:805
+msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
+msgstr ""
+
+#: Model/Server.php:814
+msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
+msgstr ""
+
+#: Model/Server.php:823
+msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
+msgstr ""
+
+#: Model/Server.php:833
+msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
+msgstr ""
+
+#: Model/Server.php:842
+msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
+msgstr ""
+
+#: Model/Server.php:850
+msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
+msgstr ""
+
+#: Model/Server.php:858
+msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
+msgstr ""
+
+#: Model/Server.php:866
+msgid "The password on the redis server (if any) to be used for generic MISP tasks."
+msgstr ""
+
+#: Model/Server.php:875
+msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
+msgstr ""
+
+#: Model/Server.php:883
+msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
+msgstr ""
+
+#: Model/Server.php:891
+msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
+msgstr ""
+
+#: Model/Server.php:903
+msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
+msgstr ""
+
+#: Model/Server.php:911
+msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
+msgstr ""
+
+#: Model/Server.php:919
+msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
+msgstr ""
+
+#: Model/Server.php:927
+msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
+msgstr ""
+
+#: Model/Server.php:935
+msgid "The e-mail address that the instance's GnuPG key is tied to."
+msgstr ""
+
+#: Model/Server.php:943
+msgid "The password (if it is set) of the GnuPG key of the instance."
+msgstr ""
+
+#: Model/Server.php:952
+msgid "The location of the GnuPG homedir."
+msgstr ""
+
+#: Model/Server.php:963
+msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
+msgstr ""
+
+#: Model/Server.php:971
+msgid "The e-mail address that the instance's SMIME key is tied to."
+msgstr ""
+
+#: Model/Server.php:979
+msgid "The location of the public half of the signing certificate."
+msgstr ""
+
+#: Model/Server.php:987
+msgid "The location of the private half of the signing certificate."
+msgstr ""
+
+#: Model/Server.php:995
+msgid "The password (if it is set) of the SMIME key of the instance."
+msgstr ""
+
+#: Model/Server.php:1007
+msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
+msgstr ""
+
+#: Model/Server.php:1015
+msgid "The TCP port for the HTTP proxy."
+msgstr ""
+
+#: Model/Server.php:1023
+msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
+msgstr ""
+
+#: Model/Server.php:1031
+msgid "The authentication username for the HTTP proxy."
+msgstr ""
+
+#: Model/Server.php:1039
+msgid "The authentication password for the HTTP proxy."
+msgstr ""
+
+#: Model/Server.php:1050
+msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
+msgstr ""
+
+#: Model/Server.php:1059
+msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
+msgstr ""
+
+#: Model/Server.php:1068
+msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
+msgstr ""
+
+#: Model/Server.php:1076
+msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
+msgstr ""
+
+#: Model/Server.php:1084
+msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
+msgstr ""
+
+#: Model/Server.php:1093
+msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
+msgstr ""
+
+#: Model/Server.php:1102
+msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
+msgstr ""
+
+#: Model/Server.php:1111
+msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
+msgstr ""
+
+#: Model/Server.php:1113
+msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
+msgstr ""
+
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
+msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
+msgstr ""
+
+#: Model/Server.php:1149
+msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
+msgstr ""
+
+#: Model/Server.php:1160
+msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
+msgstr ""
+
+#: Model/Server.php:1168
+msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
+msgstr ""
+
+#: Model/Server.php:1176
+msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
+msgstr ""
+
+#: Model/Server.php:1185
+msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
+msgstr ""
+
+#: Model/Server.php:1193
+msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
+msgstr ""
+
+#: Model/Server.php:1204
+msgid "The default policy action for the values added to the RPZ."
+msgstr ""
+
+#: Model/Server.php:1213
+msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
+msgstr ""
+
+#: Model/Server.php:1221
+msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
+msgstr ""
+
+#: Model/Server.php:1229
+msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1237
+msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1245
+msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1253
+msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1261
+msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
+msgstr ""
+
+#: Model/Server.php:1277
+msgid "Alternate nameserver"
+msgstr ""
+
+#: Model/Server.php:1285
+msgid "The e-mail address specified in the SOA portion of the zone file."
+msgstr ""
+
+#: Model/Server.php:1293
+msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
+msgstr ""
+
+#: Model/Server.php:1302
+msgid "The port that the pub/sub feature will use."
+msgstr ""
+
+#: Model/Server.php:1311
+msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
+msgstr ""
+
+#: Model/Server.php:1320
+msgid "The port that Redis is listening on."
+msgstr ""
+
+#: Model/Server.php:1329
+msgid "The password, if set for Redis."
+msgstr ""
+
+#: Model/Server.php:1338
+msgid "The database to be used for queuing messages for the pub/sub functionality."
+msgstr ""
+
+#: Model/Server.php:1347
+msgid "The namespace to be used for queuing messages for the pub/sub functionality."
+msgstr ""
+
+#: Model/Server.php:1356
+msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
+msgstr ""
+
+#: Model/Server.php:1364
+msgid "Enables or disables the publishing of any event creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:1372
+msgid "Enables or disables the publishing of any object creations/edits/deletions."
+msgstr ""
+
+#: Model/Server.php:1380
+msgid "Enables or disables the publishing of any object reference creations/deletions."
+msgstr ""
+
+#: Model/Server.php:1388
+msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
+msgstr ""
+
+#: Model/Server.php:1396
+msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
+msgstr ""
+
+#: Model/Server.php:1404
+msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
+msgstr ""
+
+#: Model/Server.php:1412
+msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
+msgstr ""
+
+#: Model/Server.php:1420
+msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
+msgstr ""
+
+#: Model/Server.php:1428
+msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
+msgstr ""
+
+#: Model/Server.php:1436
+msgid "Enabled logging to an ElasticSearch instance"
+msgstr ""
+
+#: Model/Server.php:1444
+msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
+msgstr ""
+
+#: Model/Server.php:1452
+msgid "The index in which to place logs"
+msgstr ""
+
+#: Model/Server.php:1460
+msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
+msgstr ""
+
+#: Model/Server.php:1468
+msgid "Bucket name to upload to"
+msgstr ""
+
+#: Model/Server.php:1476
+msgid "Region in which your S3 bucket resides"
+msgstr ""
+
+#: Model/Server.php:1484
+msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
+msgstr ""
+
+#: Model/Server.php:1492
+msgid "AWS secret key to use when uploading samples"
+msgstr ""
+
+#: Model/Server.php:1500
+msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
+msgstr ""
+
+#: Model/Server.php:1509
+msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
+msgstr ""
+
+#: Model/Server.php:1517
+msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
+msgstr ""
+
+#: Model/Server.php:1525
+msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
+msgstr ""
+
+#: Model/Server.php:1535
+msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
+msgstr ""
+
+#: Model/Server.php:1544
+msgid "Use a header namespace for the auth header - default setting is enabled"
+msgstr ""
+
+#: Model/Server.php:1553
+msgid "The default header namespace for the auth header - default setting is HTTP_"
+msgstr ""
+
+#: Model/Server.php:1562
+msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
+msgstr ""
+
+#: Model/Server.php:1571
+msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
+msgstr ""
+
+#: Model/Server.php:1580
+msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
+msgstr ""
+
+#: Model/Server.php:1589
+msgid "Disable the logout button for users authenticate with the external auth mechanism."
+msgstr ""
+
+#: Model/Server.php:1597
+msgid "Enable/disable the enrichment services"
+msgstr ""
+
+#: Model/Server.php:1605
+msgid "Set a timeout for the enrichment services"
+msgstr ""
+
+#: Model/Server.php:1613;1725
+msgid "Enable/disable the import services"
+msgstr ""
+
+#: Model/Server.php:1621;1742
+msgid "Set a timeout for the import services"
+msgstr ""
+
+#: Model/Server.php:1629
+msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:1637
+msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:1645
+msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:1653
+msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:1661
+msgid "Enable/disable the export services"
+msgstr ""
+
+#: Model/Server.php:1669
+msgid "Set a timeout for the export services"
+msgstr ""
+
+#: Model/Server.php:1677
+msgid "Enable/disable the hover over information retrieved from the enrichment modules"
+msgstr ""
+
+#: Model/Server.php:1685
+msgid "Set a timeout for the hover services"
+msgstr ""
+
+#: Model/Server.php:1693
+msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:1701
+msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
+msgstr ""
+
+#: Model/Server.php:1709
+msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
+msgstr ""
+
+#: Model/Server.php:1717
+msgid "The port used to access Cortex. By default, this is port 9000"
+msgstr ""
+
+#: Model/Server.php:1733
+msgid "Set an authentication key to be passed to Cortex"
+msgstr ""
+
+#: Model/Server.php:1750
+msgid "Set to false to disable SSL verification. This is not recommended."
+msgstr ""
+
+#: Model/Server.php:1759
+msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
+msgstr ""
+
+#: Model/Server.php:1768
+msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
+msgstr ""
+
+#: Model/Server.php:1777
+msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
+msgstr ""
+
+#: Model/Server.php:1786
+msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
+msgstr ""
+
+#: Model/Server.php:1795
+msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
+msgstr ""
+
+#: Model/Server.php:1805
+msgid "The debug level of the instance, always use 0 for production instances."
+msgstr ""
+
+#: Model/Server.php:1814
+msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
+msgstr ""
+
+#: Model/Server.php:1947
+msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
+msgstr ""
+
+#: Model/Server.php:2054
+msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
+msgstr ""
+
+#: Model/Server.php:2056
+msgid "Sorry, this is not yet implemented"
+msgstr ""
+
+#: Model/Server.php:2057
+msgid "Something went wrong while trying to pull"
+msgstr ""
+
+#: Model/Server.php:2069;2071
+msgid "Unknown issue."
+msgstr ""
+
+#: Model/Server.php:2535
+msgid "Enable or disable the %s module."
+msgstr ""
+
+#: Model/Server.php:2538
+msgid "Restrict the %s module to the given organisation."
+msgstr ""
+
+#: Model/Server.php:2546
+msgid "Set this required module specific setting."
+msgstr ""
+
+#: Model/Server.php:2661
+msgid "Value not set."
+msgstr ""
+
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
+msgid "Organisation logos"
+msgstr ""
+
+#: Model/Server.php:3476
+msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
+msgstr ""
+
+#: Model/Server.php:3478
+msgid "48x48 pixel .png files"
+msgstr ""
+
+#: Model/Server.php:3481;3496
+msgid "Filename must be in the following format: *.png"
+msgstr ""
+
+#: Model/Server.php:3485
+msgid "Additional image files"
+msgstr ""
+
+#: Model/Server.php:3486
+msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
+msgstr ""
+
+#: Model/Server.php:3493
+msgid "text/html if served inline, anything that conveys the terms of use if served as download"
+msgstr ""
+
+#: Model/Server.php:3665
+msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
+msgstr ""
+
+#: Model/Server.php:4115
+msgid "Removing a dead worker."
+msgstr ""
+
+#: Model/Server.php:4116
+msgid "Removing dead worker data. Worker was of type %s with pid %s"
+msgstr ""
+
+#: Model/Server.php:4120
+msgid "Stopping a worker."
+msgstr ""
+
+#: Model/Server.php:4121
+msgid "Stopping a worker. Worker was of type %s with pid %s"
+msgstr ""
+
+#: Plugin/Assets/models/behaviors/LogableBehavior.php:361
+msgid "deleted"
+msgstr ""
+
+#: Plugin/Assets/models/behaviors/LogableBehavior.php:412
+#: Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php:40
+msgid "added"
+msgstr ""
+
+#: Plugin/Assets/models/behaviors/LogableBehavior.php:414
+#: Plugin/SysLogLogable/Model/Behavior/SysLogLogableBehavior.php:42
+msgid "updated"
+msgstr ""
+
+#: Plugin/magic_tools/models/behaviors/orphans_protectable.php:104
+msgid "it has the following dependent items"
+msgstr ""
+
+#: View/Attributes/add.ctp:7
+#: View/Elements/eventattributecreation.ctp:9
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
+#: View/Pages/doc/using_the_system.ctp:84
+msgid "Add Attribute"
+msgstr ""
+
+#: View/Attributes/add.ctp:7
+#: View/Attributes/edit.ctp:4
+msgid "Edit Attribute"
+msgstr ""
+
+#: View/Attributes/add.ctp:14
+#: View/Attributes/attribute_replace.ctp:12
+#: View/Attributes/edit.ctp:8
+#: View/ShadowAttributes/add.ctp:10
+#: View/ShadowAttributes/edit.ctp:8
+msgid "(choose one)"
+msgstr ""
+
+#: View/Attributes/add.ctp:15
+#: View/Attributes/add_attachment.ctp:9
+#: View/Attributes/edit.ctp:9
+#: View/ShadowAttributes/add.ctp:12
+#: View/ShadowAttributes/add_attachment.ctp:9
+#: View/ShadowAttributes/edit.ctp:10
+msgid "Category "
+msgstr ""
+
+#: View/Attributes/add.ctp:18
+#: View/Attributes/attribute_replace.ctp:15
+#: View/Attributes/edit.ctp:12
+#: View/ShadowAttributes/add.ctp:15
+#: View/ShadowAttributes/edit.ctp:13
+msgid "(first choose category)"
+msgstr ""
+
+#: View/Attributes/add.ctp:19
+#: View/Attributes/edit.ctp:13
+#: View/ShadowAttributes/add.ctp:16
+#: View/ShadowAttributes/edit.ctp:14
+msgid "Type "
+msgstr ""
+
+#: View/Attributes/add.ctp:36
+#: View/Attributes/add_attachment.ctp:24
+#: View/Attributes/edit.ctp:24
+#: View/Events/add.ctp:20
+msgid "Distribution "
+msgstr ""
+
+#: View/Attributes/add.ctp:50
+#: View/Attributes/add_attachment.ctp:33
+#: View/Attributes/edit.ctp:32
+#: View/Attributes/ajax/attributeEditMassForm.ctp:24
+#: View/Events/add.ctp:30
+#: View/Events/edit.ctp:26
+#: View/Feeds/add.ctp:176
+#: View/Feeds/edit.ctp:172
+#: View/SharingGroups/view.ctp:2
+msgid "Sharing Group"
+msgstr ""
+
+#: View/Attributes/add.ctp:67
+#: View/Attributes/add_attachment.ctp:41
+#: View/Attributes/edit.ctp:46
+#: View/Attributes/ajax/attributeEditMassForm.ctp:44
+#: View/Elements/eventattributecreation.ctp:42
+#: View/Pages/doc/using_the_system.ctp:93;95;131
+#: View/ShadowAttributes/add.ctp:28
+#: View/ShadowAttributes/add_attachment.ctp:13
+#: View/ShadowAttributes/edit.ctp:32
+msgid "Contextual Comment"
+msgstr ""
+
+#: View/Attributes/add.ctp:76
+#: View/Attributes/edit.ctp:55
+#: View/Elements/eventattributecreation.ctp:53
+#: View/ShadowAttributes/add.ctp:38
+msgid "for Intrusion Detection System"
+msgstr ""
+
+#: View/Attributes/add.ctp:91
+#: View/Attributes/attribute_replace.ctp:38
+#: View/Attributes/ajax/attributeEditMassForm.ctp:80
+#: View/Attributes/ajax/attributeRestorationForm.ctp:11
+#: View/Elements/view_galaxy_matrix.ctp:76;199
+#: View/Events/contact.ctp:29
+#: View/Events/edit.ctp:59
+#: View/Events/free_text_import.ctp:27
+#: View/News/edit.ctp:34
+#: View/ObjectReferences/ajax/add.ctp:130
+#: View/Objects/add.ctp:147
+#: View/Objects/revise_object.ctp:85
+#: View/Organisations/admin_add.ctp:49
+#: View/Organisations/admin_edit.ctp:60
+#: View/Servers/add.ctp:115
+#: View/Servers/edit.ctp:162
+#: View/SharingGroups/add.ctp:115
+#: View/TagCollections/add.ctp:21
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
+#: View/TemplateElements/ajax/template_element_add_file.ctp:67
+#: View/TemplateElements/ajax/template_element_add_text.ctp:29
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:86
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:67
+#: View/TemplateElements/ajax/template_element_edit_text.ctp:29
+#: View/Users/admin_add.ctp:97
+#: View/Users/admin_edit.ctp:91
+#: View/Users/admin_email.ctp:54
+#: View/Users/admin_quick_email.ctp:23
+#: View/Users/change_pw.ctp:23
+#: View/Users/edit.ctp:41
+#: View/Whitelists/admin_edit.ctp:12
+msgid "Submit"
+msgstr ""
+
+#: View/Attributes/add.ctp:92
+#: View/Attributes/attribute_replace.ctp:44
+#: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
+#: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/exportSearch.ctp:32
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
+#: View/Attributes/ajax/toggle_correlation.ctp:25
+#: View/Elements/eventattributecreation.ctp:89
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Elements/view_galaxy_matrix.ctp:200
+#: View/Elements/serverRuleElements/pull.ctp:70
+#: View/Elements/serverRuleElements/push.ctp:72
+#: View/EventDelegations/ajax/accept_delegation.ctp:17
+#: View/EventDelegations/ajax/delegate_event.ctp:37
+#: View/EventDelegations/ajax/delete_delegation.ctp:17
+#: View/EventDelegations/ajax/view.ctp:24
+#: View/Events/filter_event_index.ctp:171
+#: View/Events/free_text_import.ctp:33
+#: View/Events/ajax/enrich_event.ctp:22
+#: View/Events/ajax/enrichmentChoice.ctp:15
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
+#: View/Events/ajax/exportChoice.ctp:51
+#: View/Events/ajax/importChoice.ctp:12
+#: View/Events/ajax/quick_edit.ctp:6
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
+#: View/Jobs/ajax/error.ctp:34
+#: View/Noticelists/ajax/delete_confirmation.ctp:25
+#: View/ObjectReferences/ajax/add.ctp:134
+#: View/ObjectReferences/ajax/delete.ctp:37
+#: View/Objects/add.ctp:153
+#: View/Objects/revise_object.ctp:87
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/ajax/fetch_orgs_for_sg.ctp:27
+#: View/Organisations/ajax/merge.ctp:71
+#: View/Servers/filter_event_index.ctp:22
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:27
+#: View/Servers/ajax/server_settings_edit.ctp:6
+#: View/Servers/ajax/update.ctp:16
+#: View/ShadowAttributes/add.ctp:58
+#: View/ShadowAttributes/edit.ctp:57
+#: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
+#: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/advanced.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
+#: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
+#: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:6
+#: View/TemplateElements/ajax/template_element_add_file.ctp:73
+#: View/TemplateElements/ajax/template_element_add_text.ctp:35
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:92
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:73
+#: View/TemplateElements/ajax/template_element_edit_text.ctp:35
+#: View/Templates/ajax/template_choices.ctp:15
+#: View/Users/admin_filter_user_index.ctp:107
+#: View/Users/ajax/emailConfirmTemplate.ctp:14
+#: View/Users/ajax/fetchpgpkey.ctp:24
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:32
+#: View/Warninglists/ajax/delete_confirmation.ctp:25
+msgid "Cancel"
+msgstr ""
+
+#: View/Attributes/add_attachment.ctp:4
+msgid "Add Attachment(s)"
+msgstr ""
+
+#: View/Attributes/add_attachment.ctp:64
+msgid "Is a malware sample (encrypt and hash)"
+msgstr ""
+
+#: View/Attributes/add_attachment.ctp:73
+msgid "Advanced extraction (if installed)"
+msgstr ""
+
+#: View/Attributes/add_threatconnect.ctp:4
+msgid "Import ThreatConnect CSV file"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:2
+msgid "Alternate Search Results"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:3
+msgid "This is a list of events that match the given search criteria sorted according to the percentage of matched attributes that are marked as IDS signatures (blue = IDS matches, red = non IDS matches)."
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:6
+msgid "Event id"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:7
+#: View/Elements/Users/userIndexTable.ctp:4
+#: View/Pages/doc/administration.ctp:90;119;182;196;227
+#: View/Pages/doc/using_the_system.ctp:161;205;268;280
+msgid "Org"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:8
+#: View/EventBlacklists/edit.ctp:17
+#: View/Events/add_misp_export_result.ctp:5
+msgid "Event info"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:9
+msgid "Event date"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:10
+#: View/Events/view.ctp:446
+msgid "Event graph"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:11
+msgid "Matches"
+msgstr ""
+
+#: View/Attributes/alternate_search_result.ctp:12
+#: View/Elements/Events/eventIndexTable.ctp:39
+msgid "Attribute Count"
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:6
+#: View/Pages/doc/using_the_system.ctp:117;119
+msgid "Attribute Replace Tool"
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:8
+msgid "Choose a category and a type, then paste a list of IOCs that match the selection into the field below. This will delete all of the attributes not found in the new inserted list, whilst creating the attributes that are in the new list but don't exist as attributes. Found matches will be left untouched."
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:19
+msgid "Mark all new attributes as to IDS"
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:26
+#: View/Noticelists/view.ctp:36
+#: View/Warninglists/view.ctp:35
+msgid "Values"
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:33;41
+#: View/Attributes/ajax/attributeEditMassForm.ctp:75
+#: View/Elements/eventattributecreation.ctp:86
+#: View/Events/free_text_import.ctp:22
+#: View/ShadowAttributes/add.ctp:46
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:94
+#: View/TemplateElements/ajax/template_element_add_file.ctp:70
+#: View/TemplateElements/ajax/template_element_add_text.ctp:32
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:89
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:70
+#: View/TemplateElements/ajax/template_element_edit_text.ctp:32
+msgid "Warning: You are about to share data that is of a classified nature (Attribution / targeting data). Make sure that you are authorised to share this."
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:38
+msgid "Replace attributes"
+msgstr ""
+
+#: View/Attributes/attribute_replace.ctp:38
+msgid "Replaceattributes"
+msgstr ""
+
+#: View/Attributes/check_composites.ctp:2
+msgid "Failed Composites"
+msgstr ""
+
+#: View/Attributes/check_composites.ctp:4
+msgid "No Failed Composites"
+msgstr ""
+
+#: View/Attributes/edit.ctp:16
+#: View/Pages/doc/using_the_system.ctp:368
+msgid "disabled"
+msgstr ""
+
+#: View/Attributes/edit.ctp:68
+#: View/ShadowAttributes/add.ctp:55
+#: View/ShadowAttributes/edit.ctp:45;54
+msgid "Warning: You are about to share data that is of a sensitive nature (Attribution / targeting data). Make sure that you are authorised to share this."
+msgstr ""
+
+#: View/Attributes/index.ctp:2
+#: View/Elements/histogram.ctp:4
+#: View/Events/view.ctp:455
+#: View/Objects/orphaned_object_diagnostics.ctp:44
+#: View/Pages/doc/using_the_system.ctp:242
+#: View/Users/statistics.ctp:16
+#: View/Users/statistics_data.ctp:19
+msgid "Attributes"
+msgstr ""
+
+#: View/Attributes/index.ctp:8
+msgid " with the value containing "
+msgstr ""
+
+#: View/Attributes/index.ctp:9
+msgid " being tagged with "
+msgstr ""
+
+#: View/Attributes/index.ctp:10
+msgid " from the events "
+msgstr ""
+
+#: View/Attributes/index.ctp:11
+msgid " carrying the tag(s) "
+msgstr ""
+
+#: View/Attributes/index.ctp:12
+msgid " of type "
+msgstr ""
+
+#: View/Attributes/index.ctp:13
+msgid " of category "
+msgstr ""
+
+#: View/Attributes/index.ctp:14
+msgid " created by organisation "
+msgstr ""
+
+#: View/Attributes/index.ctp:26
+msgid "Results for all attributes"
+msgstr ""
+
+#: View/Attributes/index.ctp:39;132
+#: View/Elements/eventattribute.ctp:60;229
+#: View/Elements/eventdiscussion.ctp:15;126
+#: View/Elements/generic_table.ctp:16
+#: View/Elements/generic_table_row.ctp:16
+#: View/Elements/Feeds/eventattribute.ctp:20;86
+#: View/Elements/Servers/eventattribute.ctp:20;86
+#: View/EventBlacklists/index.ctp:13;54
+#: View/Events/index.ctp:12;115
+#: View/Events/proposal_event_index.ctp:12;95
+#: View/Events/ajax/index.ctp:13;39
+#: View/Feeds/freetext_index.ctp:22;86
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
+#: View/Galaxies/index.ctp:13;53
+#: View/GalaxyClusters/ajax/index.ctp:11;97
+#: View/GalaxyElements/ajax/index.ctp:11;44
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
+#: View/Logs/event_index.ctp:17;61
+#: View/News/index.ctp:39
+#: View/Noticelists/index.ctp:13;83
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
+#: View/ObjectTemplates/index.ctp:13;137
+#: View/OrgBlacklists/index.ctp:13;52
+#: View/Organisations/index.ctp:42;159
+#: View/Regexp/admin_index.ctp:13;51
+#: View/Regexp/index.ctp:13;45
+#: View/Roles/admin_index.ctp:13;82
+#: View/Roles/index.ctp:13;55
+#: View/Servers/index.ctp:13;156
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
+#: View/Tags/index.ctp:21;141
+#: View/Tasks/index.ctp:18;106
+#: View/Taxonomies/index.ctp:13;63
+#: View/Taxonomies/view.ctp:53;181
+#: View/Templates/index.ctp:13;61
+#: View/Threads/index.ctp:13;98
+#: View/Users/admin_index.ctp:12;86
+#: View/Users/ajax/admin_index.ctp:13;32
+#: View/Warninglists/index.ctp:13;76
+#: View/Whitelists/admin_index.ctp:14;47
+#: View/Whitelists/index.ctp:14;42
+msgid "previous"
+msgstr ""
+
+#: View/Attributes/index.ctp:41;134
+#: View/Elements/eventattribute.ctp:62;231
+#: View/Elements/eventdiscussion.ctp:17;128
+#: View/Elements/generic_table.ctp:18
+#: View/Elements/generic_table_row.ctp:18
+#: View/Elements/Feeds/eventattribute.ctp:22;88
+#: View/Elements/Servers/eventattribute.ctp:22;88
+#: View/EventBlacklists/index.ctp:15;56
+#: View/Events/index.ctp:14;117
+#: View/Events/proposal_event_index.ctp:14;97
+#: View/Events/ajax/index.ctp:15;41
+#: View/Feeds/freetext_index.ctp:24;88
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
+#: View/Galaxies/index.ctp:15;55
+#: View/GalaxyClusters/ajax/index.ctp:13;99
+#: View/GalaxyElements/ajax/index.ctp:13;46
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
+#: View/Logs/event_index.ctp:19;63
+#: View/News/index.ctp:41
+#: View/Noticelists/index.ctp:15;85
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
+#: View/ObjectTemplates/index.ctp:15;139
+#: View/OrgBlacklists/index.ctp:15;54
+#: View/Organisations/index.ctp:44;161
+#: View/Regexp/admin_index.ctp:15;53
+#: View/Regexp/index.ctp:15;47
+#: View/Roles/admin_index.ctp:15;84
+#: View/Roles/index.ctp:15;57
+#: View/Servers/index.ctp:15;158
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
+#: View/Tags/index.ctp:23;143
+#: View/Tasks/index.ctp:20;108
+#: View/Taxonomies/index.ctp:15;65
+#: View/Taxonomies/view.ctp:55;183
+#: View/Templates/index.ctp:15;63
+#: View/Threads/index.ctp:15;100
+#: View/Users/admin_index.ctp:14;88
+#: View/Users/ajax/admin_index.ctp:15;34
+#: View/Warninglists/index.ctp:15;78
+#: View/Whitelists/admin_index.ctp:16;49
+#: View/Whitelists/index.ctp:16;44
+msgid "next"
+msgstr ""
+
+#: View/Attributes/index.ctp:53
+#: View/Elements/eventattribute.ctp:152
+#: View/Elements/Events/eventIndexTable.ctp:37
+#: View/Elements/Feeds/eventattribute.ctp:45
+#: View/Elements/Servers/eventattribute.ctp:45
+#: View/Events/resolved_attributes.ctp:52
+#: View/Events/view.ctp:117
+#: View/Feeds/preview_event.ctp:16
+#: View/Noticelists/view.ctp:43
+#: View/Pages/doc/using_the_system.ctp:164;207;318
+#: View/Servers/preview_event.ctp:27
+#: View/Servers/preview_index.ctp:94
+#: View/Tags/index.ctp:10
+#: View/Templates/add.ctp:12
+#: View/Templates/edit.ctp:12
+#: View/Templates/view.ctp:19
+msgid "Tags"
+msgstr ""
+
+#: View/Attributes/index.ctp:54
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
+#: View/Events/ajax/ajaxGalaxies.ctp:6
+#: View/Galaxies/index.ctp:2
+msgid "Galaxies"
+msgstr ""
+
+#: View/Attributes/index.ctp:56
+#: View/Elements/eventattribute.ctp:161
+msgid "Correlate"
+msgstr ""
+
+#: View/Attributes/index.ctp:57
+#: View/Elements/eventattribute.ctp:162
+#: View/Elements/Feeds/eventattribute.ctp:47
+#: View/Elements/Servers/eventattribute.ctp:47
+#: View/Events/view.ctp:314
+#: View/Feeds/preview_event.ctp:73
+#: View/Pages/doc/using_the_system.ctp:235
+#: View/Servers/preview_event.ctp:95
+msgid "Related Events"
+msgstr ""
+
+#: View/Attributes/index.ctp:58
+#: View/Elements/eventattribute.ctp:163
+#: View/Elements/Feeds/eventattribute.ctp:48
+#: View/Elements/Servers/eventattribute.ctp:48
+msgid "Feed hits"
+msgstr ""
+
+#: View/Attributes/index.ctp:61
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
+msgid "Sightings"
+msgstr ""
+
+#: View/Attributes/index.ctp:62
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
+#: View/Tags/index.ctp:73
+msgid "Activity"
+msgstr ""
+
+#: View/Attributes/index.ctp:63
+#: View/Elements/eventattribute.ctp:168
+#: View/Elements/Users/userIndexTable.ctp:26
+#: View/Elements/healthElements/files.ctp:33
+#: View/Elements/healthElements/workers.ctp:60
+#: View/Elements/templateElements/templateRowAttribute.ctp:94
+#: View/Elements/templateElements/templateRowFile.ctp:71
+#: View/Elements/templateElements/templateRowText.ctp:28
+#: View/EventBlacklists/index.ctp:27
+#: View/Events/export.ctp:31
+#: View/Events/resolved_attributes.ctp:53
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
+#: View/GalaxyClusters/ajax/index.ctp:51
+#: View/Noticelists/index.ctp:37
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:28
+#: View/ObjectTemplates/index.ctp:66
+#: View/OrgBlacklists/index.ctp:26
+#: View/Organisations/index.ctp:102
+#: View/Pages/doc/using_the_system.ctp:187;238;286;382
+#: View/Regexp/admin_index.ctp:25
+#: View/Roles/admin_index.ctp:35
+#: View/Servers/index.ctp:37
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
+#: View/Sightings/ajax/list_sightings.ctp:11
+#: View/Tags/index.ctp:76
+#: View/Taxonomies/index.ctp:27
+#: View/Templates/index.ctp:27
+#: View/Threads/index.ctp:28
+#: View/Warninglists/index.ctp:38
+#: View/Whitelists/admin_index.ctp:24
+msgid "Actions"
+msgstr ""
+
+#: View/Attributes/index.ctp:125
+#: View/Elements/eventdiscussion.ctp:119
+#: View/Elements/generic_table.ctp:53
+#: View/Elements/generic_table_row.ctp:45
+#: View/EventBlacklists/index.ctp:47
+#: View/Events/index.ctp:108
+#: View/Events/proposal_event_index.ctp:88
+#: View/Events/ajax/index.ctp:32
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
+#: View/Galaxies/index.ctp:46
+#: View/GalaxyClusters/ajax/index.ctp:91
+#: View/GalaxyElements/ajax/index.ctp:38
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
+#: View/Logs/event_index.ctp:54
+#: View/News/index.ctp:33
+#: View/Noticelists/index.ctp:76
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:66
+#: View/ObjectTemplates/index.ctp:130
+#: View/OrgBlacklists/index.ctp:45
+#: View/Organisations/index.ctp:152
+#: View/Regexp/admin_index.ctp:43
+#: View/Regexp/index.ctp:38
+#: View/Roles/admin_index.ctp:75
+#: View/Roles/index.ctp:48
+#: View/Servers/index.ctp:149
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
+#: View/Tags/index.ctp:134
+#: View/Tasks/index.ctp:99
+#: View/Taxonomies/index.ctp:56
+#: View/Taxonomies/view.ctp:174
+#: View/Templates/index.ctp:54
+#: View/Threads/index.ctp:91
+#: View/Users/admin_index.ctp:79
+#: View/Users/ajax/admin_index.ctp:25
+#: View/Warninglists/index.ctp:69
+#: View/Whitelists/admin_index.ctp:40
+#: View/Whitelists/index.ctp:35
+msgid "Page {:page} of {:pages}, showing {:current} records out of {:count} total, starting on record {:start}, ending on {:end}"
+msgstr ""
+
+#: View/Attributes/report_validation_issues_attributes.ctp:2
+msgid "Listing invalid attribute validations"
+msgstr ""
+
+#: View/Attributes/report_validation_issues_attributes.ctp:6
+msgid "Validation errors for attribute: "
+msgstr ""
+
+#: View/Attributes/report_validation_issues_attributes.ctp:10
+msgid "Value found: "
+msgstr ""
+
+#: View/Attributes/report_validation_issues_attributes.ctp:10
+#: View/Elements/templateElements/populateTemplateFile.ctp:21
+#: View/Errors/error403.ctp:3
+msgid "Error"
+msgstr ""
+
+#: View/Attributes/report_validation_issues_attributes.ctp:13
+msgid "[Attribute details]"
+msgstr ""
+
+#: View/Attributes/search.ctp:4
+msgid "Search Attribute"
+msgstr ""
+
+#: View/Attributes/search.ctp:5
+msgid "You can search for attributes based on contained expression within the value, event ID, submitting organisation, category and type. <br />For the value, event ID and organisation, you can enter several search terms by entering each term as a new line. To exclude things from a result, use the NOT operator (!) in front of the term."
+msgstr ""
+
+#: View/Attributes/search.ctp:7
+msgid "For string searches (such as searching for an expression, tags, etc) - lookups are simple string matches. If you want a substring match encapsulate the lookup string between \"%\" characters."
+msgstr ""
+
+#: View/Attributes/search.ctp:10
+msgid "Containing the following expressions"
+msgstr ""
+
+#: View/Attributes/search.ctp:11
+msgid "Having tag or being an attribute of an event having the tag"
+msgstr ""
+
+#: View/Attributes/search.ctp:12
+msgid "Being attributes of the following event IDs, event UUIDs or attribute UUIDs"
+msgstr ""
+
+#: View/Attributes/search.ctp:15
+msgid "From the following organisation(s)"
+msgstr ""
+
+#: View/Attributes/search.ctp:29
+msgid "Only find IOCs flagged as to_ids"
+msgstr ""
+
+#: View/Attributes/search.ctp:33
+msgid "Alternate Search Result (Events)"
+msgstr ""
+
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:6
+msgid "Attribute Deletion"
+msgstr ""
+
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:9
+msgid "Are you sure you want to hard-delete Attribute #%s? The Attribute will be permanently deleted and unrecoverable. Also, this will prevent the deletion to be propagated to other instances."
+msgstr ""
+
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:10
+msgid "Are you sure you want to soft-delete Attribute #%s? The Attribute will only be soft deleted, meaning that it is not completely purged. Click on Include deleted attributes and delete the soft deleted attribute if you want to permanently remove it."
+msgstr ""
+
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:16
+#: View/Elements/eventdiscussion.ctp:90
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
+#: View/Elements/healthElements/files.ctp:73
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
+#: View/Events/view_graph.ctp:30
+#: View/Feeds/index.ctp:265
+#: View/ObjectReferences/ajax/delete.ctp:32
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:140
+#: View/Pages/doc/using_the_system.ctp:192
+#: View/Roles/admin_index.ctp:67
+#: View/Servers/index.ctp:138
+#: View/Tags/index.ctp:125
+msgid "Delete"
+msgstr ""
+
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:16
+#: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+#: View/Attributes/ajax/attributeRestorationForm.ctp:11
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
+#: View/Attributes/ajax/toggle_correlation.ctp:20
+#: View/Elements/Servers/View/row_attribute.ctp:142
+#: View/Elements/Users/userIndexTable.ctp:47;50;57;64;76;82
+#: View/Elements/templateElements/templateRowAttribute.ctp:63;74;86
+#: View/Elements/templateElements/templateRowFile.ctp:42;53;64
+#: View/EventDelegations/ajax/accept_delegation.ctp:10
+#: View/EventDelegations/ajax/delegate_event.ctp:35
+#: View/EventDelegations/ajax/delete_delegation.ctp:10
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
+#: View/Events/export.ctp:56
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Events/ajax/handleSelected.ctp:17
+#: View/Events/ajax/toggle_correlation.ctp:20
+#: View/Feeds/preview_event.ctp:56
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:16
+#: View/ObjectReferences/ajax/delete.ctp:32
+#: View/Objects/revise_object.ctp:67
+#: View/Objects/ajax/delete.ctp:19
+#: View/Organisations/index.ctp:127
+#: View/Servers/preview_event.ctp:79
+#: View/Servers/ajax/update.ctp:11
+#: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
+#: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
+#: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
+#: View/Taxonomies/view.ctp:26
+#: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+#: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
+#: View/Templates/view.ctp:41
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:27
+msgid "Yes"
+msgstr ""
+
+#: View/Attributes/ajax/attributeConfirmationForm.ctp:21
+#: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
+#: View/Attributes/ajax/attributeRestorationForm.ctp:16
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
+#: View/Attributes/ajax/toggle_correlation.ctp:25
+#: View/Elements/Servers/View/row_attribute.ctp:142
+#: View/Elements/Users/userIndexTable.ctp:47;50;57;64;76;82
+#: View/Elements/templateElements/templateRowAttribute.ctp:64;75;87
+#: View/Elements/templateElements/templateRowFile.ctp:43;54;65
+#: View/EventDelegations/ajax/accept_delegation.ctp:17
+#: View/EventDelegations/ajax/delegate_event.ctp:37
+#: View/EventDelegations/ajax/delete_delegation.ctp:17
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
+#: View/Events/export.ctp:58;176
+#: View/Events/filter_event_index.ctp:25;112;180;205;207
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:31
+#: View/Events/ajax/handleSelected.ctp:22
+#: View/Events/ajax/toggle_correlation.ctp:25
+#: View/Feeds/preview_event.ctp:61;66
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
+#: View/Noticelists/ajax/delete_confirmation.ctp:25
+#: View/ObjectReferences/ajax/delete.ctp:37
+#: View/Objects/revise_object.ctp:67
+#: View/Objects/ajax/delete.ctp:24
+#: View/Organisations/index.ctp:127
+#: View/Servers/preview_event.ctp:89
+#: View/Servers/ajax/update.ctp:16
+#: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
+#: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
+#: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
+#: View/Taxonomies/view.ctp:26
+#: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
+#: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
+#: View/Templates/view.ctp:42
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:32
+#: View/Warninglists/ajax/delete_confirmation.ctp:25
+msgid "No"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
+#: View/Attributes/ajax/attributeEditCommentForm.ctp:5
+#: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
+#: View/Attributes/ajax/attributeEditTypeForm.ctp:5
+#: View/Attributes/ajax/attributeEditValueForm.ctp:6
+msgid "Accept change"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
+#: View/Attributes/ajax/attributeEditCommentForm.ctp:6
+#: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
+#: View/Attributes/ajax/attributeEditTypeForm.ctp:6
+#: View/Attributes/ajax/attributeEditValueForm.ctp:7
+msgid "Discard change"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:6
+msgid "Mass Edit Attributes"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:12;31
+msgid "Do not alter current settings"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:15
+#: View/Elements/eventattributecreation.ctp:30
+#: View/Events/resolved_attributes.ctp:50
+#: View/Events/view.ctp:145
+#: View/Feeds/add.ctp:167
+#: View/Feeds/edit.ctp:164
+#: View/Feeds/freetext_index.ctp:36
+#: View/Objects/add.ctp:41;99
+#: View/Objects/revise_object.ctp:27;50
+#: View/Pages/doc/using_the_system.ctp:34;90;126;186;211;237
+#: View/Servers/preview_event.ctp:53
+#: View/Templates/populate_event_from_template_attributes.ctp:11
+#: View/Threads/index.ctp:27
+msgid "Distribution"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:33
+#: View/Pages/doc/using_the_system.ctp:96
+msgid "For Intrusion Detection System"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:43
+msgid "Leave this field empty to leave the comment field of the selected attributes unaltered."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:53
+msgid "Tags to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:58
+msgid "Tags to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:64
+msgid "Clusters to <b>remove</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditMassForm.ctp:69
+msgid "Clusters to <b>add</b>"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
+#: View/Attributes/ajax/attributeRestorationForm.ctp:5
+msgid "Attribute Restoration"
+msgstr ""
+
+#: View/Attributes/ajax/attributeRestorationForm.ctp:7
+msgid "Are you sure you want to undelete Attribute #%s?"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:2
+msgid "Choose the format that you wish to download the search results in"
+msgstr ""
+
+#: View/Attributes/ajax/exportSearch.ctp:10;23
+#: View/Events/ajax/exportChoice.ctp:17;18;27;28
+msgid "Export as %s"
+msgstr ""
+
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:6
+msgid "Remove Tag"
+msgstr ""
+
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:8
+msgid "Remove tag "
+msgstr ""
+
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:8
+msgid "from "
+msgstr ""
+
+#: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
+msgid "Remove"
+msgstr ""
+
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+msgid "Toggle Correlation %s "
+msgstr ""
+
+#: View/Attributes/ajax/toggle_correlation.ctp:11
+msgid "Re-enable the correlation for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/toggle_correlation.ctp:13
+msgid "This will remove all correlations that already exist for this attribute and prevents any attributes to be related as long as this setting is disabled. Make sure you understand the downsides of disabling correlations."
+msgstr ""
+
+#: View/Attributes/ajax/toggle_correlation.ctp:20
+msgid "Toggle correlation for attribute"
+msgstr ""
+
+#: View/Elements/ajaxAttributeTags.ctp:28
+#: View/Elements/ajaxTagCollectionTags.ctp:16
+#: View/Elements/ajaxTags.ctp:14
+#: View/Elements/ajaxTemplateTag.ctp:10
+#: View/Elements/serverRuleElements/ajaxTags.ctp:17
+msgid "Remove tag"
+msgstr ""
+
+#: View/Elements/ajaxAttributeTags.ctp:42
+#: View/Pages/doc/using_the_system.ctp:303
+#: View/Templates/add.ctp:17
+#: View/Templates/edit.ctp:17
+msgid "Add tag"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:17
+msgid "Remove tag %s"
+msgstr ""
+
+#: View/Elements/ajaxTags.ctp:27;30
+#: View/Templates/add.ctp:28
+#: View/Templates/edit.ctp:28
+msgid "Add a tag"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:71;240
+#: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
+#: View/Elements/Servers/eventattribute.ctp:28;31;94;97
+msgid "view all"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:134
+#: View/Elements/Events/eventIndexTable.ctp:5
+#: View/Feeds/index.ctp:89
+msgid "Select all"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:134
+msgid "Select all attributes/proposals on current page"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:209
+msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
+"a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
+"attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:213
+msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
+msgstr ""
+
+#: View/Elements/eventattributecreation.ctp:57
+msgid "Create multiple attributes one per line"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:34
+msgid "Date: "
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:52
+msgid "Deactivated user"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:89;97
+#: View/Elements/Events/eventIndexTable.ctp:226
+#: View/Elements/Events/View/row_attribute.ctp:380
+#: View/Elements/Users/userIndexTable.ctp:90
+#: View/Feeds/edit.ctp:193
+#: View/OrgBlacklists/edit.ctp:22
+#: View/Pages/doc/using_the_system.ctp:191
+#: View/Servers/index.ctp:137
+#: View/Tags/edit.ctp:36
+#: View/Templates/edit.ctp:49
+msgid "Edit"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:90;98
+msgid "Are you sure you want to delete this post?"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:93;100
+msgid "Reply"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:141
+#: View/Posts/add.ctp:32
+msgid "Insert a quote - just paste your quote between the [quote][/quote] tags."
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:141
+#: View/Posts/add.ctp:32
+msgid "Quote"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:142
+msgid "Insert a link to an event - just enter the event ID between the [event][/event] tags."
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:142
+#: View/Events/view.ctp:196;207
+#: View/Objects/orphaned_object_diagnostics.ctp:21
+#: View/Pages/doc/administration.ctp:167
+#: View/Pages/doc/using_the_system.ctp:200;279
+#: View/Posts/add.ctp:33
+#: View/ShadowAttributes/index.ctp:41
+msgid "Event"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:143
+#: View/Posts/add.ctp:34
+msgid "Insert a link to a discussion thread - enter the thread's ID between the [thread][/thread] tags."
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:143
+#: View/Posts/add.ctp:34
+msgid "Thread"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:144
+#: View/Posts/add.ctp:35
+msgid "Insert a link [link][/link] tags."
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:144
+#: View/Posts/add.ctp:35
+msgid "Link"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:145
+#: View/Posts/add.ctp:36
+msgid "Insert a code [code][/code] tags."
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:145
+#: View/Posts/add.ctp:36
+msgid "Code"
+msgstr ""
+
+#: View/Elements/eventdiscussion.ctp:156
+#: View/Users/ajax/emailConfirmTemplate.ctp:13
+msgid "Send"
+msgstr ""
+
+#: View/Elements/flashErrorMessage.ctp:2
+msgid "Errors"
+msgstr ""
+
+#: View/Elements/flashErrorMessage.ctp:5
+#: View/Jobs/ajax/error.ctp:34
+msgid "Close"
+msgstr ""
+
+#: View/Elements/footer.ctp:5
+msgid "Keyboard shortcuts for this page"
+msgstr ""
+
+#: View/Elements/footer.ctp:6
+msgid "none"
+msgstr ""
+
+#: View/Elements/footer.ctp:15
+#: View/Users/admin_add.ctp:70
+#: View/Users/admin_edit.ctp:64
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
+msgid "GnuPG key"
+msgstr ""
+
+#: View/Elements/footer.ctp:17
+msgid "Could not locate the GnuPG public key."
+msgstr ""
+
+#: View/Elements/footer.ctp:24
+msgid "Could not locate SMIME certificate."
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:8
+msgid "View details about this galaxy"
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:19
+#: View/Elements/galaxyQuickViewMini.ctp:69
+msgid "View details about this cluster"
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:20
+#: View/Elements/galaxyQuickViewMini.ctp:70
+msgid "View all events containing this cluster."
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "Are you sure you want to detach %s from this event?"
+msgstr ""
+
+#: View/Elements/galaxyQuickViewMini.ctp:74
+msgid "Are you sure you want to detach %s from this %s?"
+msgstr ""
+
+#: View/Elements/galaxyQuickViewMini.ctp:89
+msgid "Add new cluster"
+msgstr ""
+
+#: View/Elements/galaxyQuickViewMini.ctp:89
+#: View/EventBlacklists/add.ctp:35
+#: View/EventBlacklists/edit.ctp:29
+#: View/Events/add.ctp:68
+#: View/Events/filter_event_index.ctp:125
+#: View/Feeds/add.ctp:198
+#: View/Feeds/import_feeds.ctp:19
+#: View/OrgBlacklists/add.ctp:28
+#: View/Regexp/admin_add.ctp:32
+#: View/Regexp/admin_edit.ctp:42
+#: View/Roles/admin_add.ctp:44
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
+#: View/Sightings/ajax/add_sighting.ctp:33
+#: View/TagCollections/import.ctp:19
+#: View/Tags/add.ctp:35
+#: View/Users/admin_filter_user_index.ctp:62
+#: View/Whitelists/admin_add.ctp:13
+msgid "Add"
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:205
+msgid "Due to the large number of options, no contextual information is provided."
+msgstr ""
+
+#: View/Elements/generic_picker.ctp:273
+msgid "Nothing to pick"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:11
+#: View/Pages/doc/general.ctp:20
+msgid "Event Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
+#: View/Events/export_alternate.ctp:87
+#: View/Pages/doc/general.ctp:34
+msgid "List Events"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
+#: View/Events/add.ctp:4
+#: View/Events/export_alternate.ctp:89
+#: View/Pages/doc/general.ctp:35
+msgid "Add Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
+#: View/Events/export_alternate.ctp:92
+#: View/Pages/doc/general.ctp:36
+msgid "List Attributes"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
+#: View/Events/export_alternate.ctp:93
+#: View/Pages/doc/general.ctp:37
+msgid "Search Attributes"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
+#: View/Servers/rest.ctp:20
+msgid "REST client"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
+#: View/Pages/doc/general.ctp:38
+msgid "View Proposals"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
+#: View/Pages/doc/general.ctp:39
+msgid "Events with proposals"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
+#: View/Pages/doc/general.ctp:40
+msgid "List Tags"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
+msgid "List Tag Collections"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
+#: View/Pages/doc/general.ctp:41
+#: View/Tags/add.ctp:4
+#: View/Tags/edit.ctp:4
+msgid "Add Tag"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
+msgid "List Taxonomies"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
+#: View/Pages/doc/general.ctp:42
+msgid "List Templates"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
+#: View/Pages/doc/general.ctp:43
+msgid "Add Template"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:78
+#: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
+#: View/Events/export.ctp:2
+#: View/Events/export_alternate.ctp:2;95
+#: View/Pages/doc/general.ctp:44
+msgid "Export"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
+#: View/Events/automation.ctp:2
+#: View/Events/export_alternate.ctp:97
+#: View/Events/legacy_automation.ctp:2
+#: View/Pages/doc/general.ctp:45
+#: View/Pages/doc/using_the_system.ctp:15;361
+msgid "Automation"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
+msgid "List Galaxies"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:101
+#: View/Pages/doc/general.ctp:21
+msgid "Input Filters"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:104;109
+#: View/Pages/doc/administration.ctp:12;64
+#: View/Pages/doc/general.ctp:50
+#: View/Pages/doc/user_management.ctp:69
+#: View/Regexp/admin_index.ctp:2
+#: View/Regexp/index.ctp:2
+msgid "Import Regexp"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:114;119
+#: View/Pages/doc/administration.ctp:13
+#: View/Pages/doc/general.ctp:51
+#: View/Pages/doc/user_management.ctp:70
+#: View/Whitelists/admin_index.ctp:2
+#: View/Whitelists/index.ctp:2
+msgid "Signature Whitelist"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
+msgid "List Warninglists"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:128
+msgid "List Noticelists"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:135
+#: View/Pages/doc/general.ctp:22;54
+msgid "Global Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:139
+#: View/News/index.ctp:2
+#: View/Pages/doc/general.ctp:56
+#: View/Pages/doc/user_management.ctp:51
+msgid "News"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
+#: View/Pages/doc/general.ctp:57
+msgid "My Profile"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
+#: View/Users/dashboard.ctp:2
+msgid "Dashboard"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/view.ctp:39
+#: View/Users/statistics.ctp:27
+#: View/Users/statistics_data.ctp:34
+msgid "Organisations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
+#: View/Pages/doc/general.ctp:59
+msgid "Role Permissions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
+msgid "List Object Templates"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
+msgid "List Sharing Groups"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
+msgid "Add Sharing Group"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
+#: View/Events/legacy_automation.ctp:42
+#: View/Pages/doc/general.ctp:60
+#: View/Pages/doc/user_management.ctp:53
+msgid "User Guide"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:186
+msgid "Categories & Types"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
+#: View/Pages/doc/general.ctp:62
+#: View/Pages/doc/user_management.ctp:55
+#: View/Users/statistics.ctp:7
+#: View/Users/statistics_attackmatrix.ctp:2
+#: View/Users/statistics_data.ctp:7
+#: View/Users/statistics_orgs.ctp:7
+#: View/Users/statistics_sightings.ctp:2
+#: View/Users/statistics_tags.ctp:7
+#: View/Users/statistics_users.ctp:2
+msgid "Statistics"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:201
+#: View/Pages/doc/general.ctp:92
+msgid "List Discussions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:205
+#: View/Pages/doc/general.ctp:93
+msgid "Start Discussion"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:212
+#: View/Pages/doc/general.ctp:23;66
+msgid "Sync Actions"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
+#: View/Pages/doc/general.ctp:68
+msgid "List Servers"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
+msgid "List Feeds"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:229
+#: View/Pages/doc/administration.ctp:8
+#: View/Pages/doc/concepts.ctp:8
+#: View/Pages/doc/general.ctp:8;24;71
+#: View/Pages/doc/quickstart.ctp:8
+#: View/Pages/doc/user_management.ctp:14
+#: View/Pages/doc/using_the_system.ctp:21
+msgid "Administration"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
+#: View/Pages/doc/general.ctp:74
+msgid "List Users"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
+msgid "Add User"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
+#: View/Pages/doc/general.ctp:77
+msgid "Contact Users"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
+msgid "List Organisations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
+#: View/Pages/doc/general.ctp:76
+msgid "List Roles"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
+#: View/Jobs/index.ctp:2
+#: View/Pages/doc/general.ctp:80
+msgid "Jobs"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
+#: View/Pages/doc/concepts.ctp:36
+#: View/Pages/doc/general.ctp:81
+#: View/Tasks/index.ctp:3
+msgid "Scheduled Tasks"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:300
+msgid "Blacklist Event"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
+msgid "Manage Event Blacklists"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:314
+msgid "Blacklist Organisation"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
+msgid "Manage Org Blacklists"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:327
+#: View/Pages/doc/general.ctp:25;84
+msgid "Audit"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
+#: View/Pages/doc/general.ctp:86
+msgid "List Logs"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
+#: View/Logs/admin_search.ctp:4
+#: View/Pages/doc/general.ctp:87
+msgid "Search Logs"
+msgstr ""
+
+#: View/Elements/global_menu.ctp:362;367
+#: View/Pages/doc/general.ctp:28;63
+msgid "Log out"
+msgstr ""
+
+#: View/Elements/histogram.ctp:1
+msgid "Attribute Types Histogram"
+msgstr ""
+
+#: View/Elements/histogram.ctp:4
+msgid "you can also choose specific histogram items by clicking on attributes below"
+msgstr ""
+
+#: View/Elements/histogram.ctp:15
+msgid "Toggle histogram"
+msgstr ""
+
+#: View/Elements/histogram.ctp:31
+msgid "Attributes per organization"
+msgstr ""
+
+#: View/Elements/view_event_distribution_graph.ctp:9
+#: View/Layouts/default.ctp:87
+#: View/Layouts/graph.ctp:84
+msgid "Loading"
+msgstr ""
+
+#: View/Elements/view_event_distribution_graph.ctp:17
+msgid "Elements having lower distribution level than the event"
+msgstr ""
+
+#: View/Elements/view_event_distribution_graph.ctp:18
+msgid "Distribution of the event"
+msgstr ""
+
+#: View/Elements/view_event_distribution_graph.ctp:19
+msgid "Inconsistent distribution level, fallback on the event distribution"
+msgstr ""
+
+#: View/Elements/view_event_distribution_graph.ctp:23
+msgid "Sharing group"
+msgstr ""
+
+#: View/Elements/view_event_graph.ctp:9
+#: View/Noticelists/view.ctp:40
+msgid "Scope"
+msgstr ""
+
+#: View/Elements/view_event_graph.ctp:12
+msgid "Physics"
+msgstr ""
+
+#: View/Elements/view_event_graph.ctp:13
+msgid "Display"
+msgstr ""
+
+#: View/Elements/view_event_graph.ctp:14
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
+#: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
+msgid "Filters"
+msgstr ""
+
+#: View/Elements/view_event_graph.ctp:16
+msgid "History"
+msgstr ""
+
+#: View/Elements/view_event_graph.ctp:22
+#: View/Events/view_graph.ctp:16
+msgid "Toggle fullscreen"
+msgstr ""
+
+#: View/Elements/view_galaxy_matrix.ctp:91
+msgid "Show all"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:5
+#: View/Feeds/index.ctp:89
+msgid "Select all events on current page"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:35
+msgid "Clusters"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:41
+msgid "Correlation Count"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:41
+msgid "#Corr."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:44
+msgid "Sigthing Count"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:44
+msgid "#Sightings"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:47
+msgid "Proposal Count"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:47
+msgid "#Prop"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:50
+msgid "Post Count"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:50
+msgid "#Posts"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
+#: View/Elements/Users/userIndexTable.ctp:94
+#: View/Elements/dashboard/dashboard_events.ctp:4;5
+#: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
+#: View/Events/proposal_event_index.ctp:45;49
+#: View/Feeds/preview_index.ctp:73
+#: View/Noticelists/index.ctp:66
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
+#: View/Pages/doc/using_the_system.ctp:193
+#: View/Servers/preview_index.ctp:174
+#: View/Taxonomies/index.ctp:47
+#: View/Warninglists/index.ctp:60
+msgid "View"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
+msgid " proposal(s)"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:190
+msgid "NEW"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:16
+msgid "Are you sure this event is complete and everyone should be informed?"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:222
+msgid "Not published"
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr ""
+
+#: View/Elements/Events/View/attribute_correlations.ctp:7
+msgid "Show "
+msgstr ""
+
+#: View/Elements/Events/View/attribute_correlations.ctp:7
+msgid " more..."
+msgstr ""
+
+#: View/Elements/Events/View/attribute_correlations.ctp:43
+#: View/Events/view.ctp:346
+msgid "Collapse…"
+msgstr ""
+
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr ""
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:343
+msgid "Restore attribute"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:344;384
+msgid "Permanently delete attribute"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:351
+msgid "Query enrichment"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:351
+msgid "Propose enrichment"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:356
+msgid "Query Cortex"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:356
+msgid "Propose enrichment through Cortex"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:360
+msgid "Propose Edit"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:361
+msgid "Propose Deletion"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:371;376
+msgid "Add enrichment"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:376
+msgid "Add enrichment via Cortex"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:388
+msgid "Soft-delete attribute"
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:65
+#: View/Elements/Feeds/View/row_object.ctp:16
+msgid "Name: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:66
+#: View/Elements/Events/View/row_object_reference.ctp:21
+#: View/Elements/Events/View/row_object_referenced_by.ctp:7
+#: View/Elements/Feeds/View/row_object.ctp:17
+#: View/Elements/Feeds/View/row_object_reference.ctp:7
+#: View/Elements/Feeds/View/row_object_referenced_by.ctp:7
+#: View/Elements/Servers/View/row_object.ctp:17
+#: View/Elements/Servers/View/row_object_reference.ctp:7
+#: View/Elements/Servers/View/row_object_referenced_by.ctp:7
+msgid "Expand or Collapse"
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:69
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:70
+msgid "Meta-category: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Feeds/View/row_object.ctp:21
+msgid "Description: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:72
+#: View/Elements/Feeds/View/row_object.ctp:22
+msgid "Template: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:125
+msgid "Permanently delete object"
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:125
+msgid "Soft delete object"
+msgstr ""
+
+#: View/Elements/Events/View/row_object_reference.ctp:1
+#: View/Elements/Feeds/View/row_object_reference.ctp:1
+msgid "References: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object_reference.ctp:28
+#: View/Elements/Servers/View/row_object_reference.ctp:11
+msgid "Add reference"
+msgstr ""
+
+#: View/Elements/Events/View/row_object_reference.ctp:51
+msgid "Delete object reference"
+msgstr ""
+
+#: View/Elements/Events/View/row_object_referenced_by.ctp:1
+#: View/Elements/Feeds/View/row_object_referenced_by.ctp:1
+msgid "Referenced by: "
+msgstr ""
+
+#: View/Elements/Events/View/row_proposal.ctp:183
+#: View/Elements/Events/View/row_proposal_delete.ctp:77
+msgid "Accept Proposal"
+msgstr ""
+
+#: View/Elements/Events/View/row_proposal.ctp:183
+#: View/Elements/Events/View/row_proposal_delete.ctp:77
+msgid "Accept proposal"
+msgstr ""
+
+#: View/Elements/Events/View/row_proposal.ctp:188
+#: View/Elements/Events/View/row_proposal_delete.ctp:82
+msgid "Discard proposal"
+msgstr ""
+
+#: View/Elements/Events/View/sighting_field.ctp:12
+#: View/Sightings/ajax/add_sighting.ctp:33
+#: View/Sightings/ajax/advanced.ctp:10
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
+msgid "Add sighting"
+msgstr ""
+
+#: View/Elements/Events/View/sighting_field.ctp:13
+msgid "Mark as false-positive"
+msgstr ""
+
+#: View/Elements/Events/View/sighting_field.ctp:14
+msgid "Advanced sightings"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:46
+#: View/Elements/Servers/View/value_field.ctp:43
+msgid "Hexadecimal representation"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:46
+#: View/Elements/Feeds/View/value_field.ctp:43
+#: View/Elements/Servers/View/value_field.ctp:43
+msgid "Switch to binary representation"
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:51
+#: View/Elements/Feeds/View/value_field.ctp:48
+msgid "Warning, this doesn't seem to be a legitimate "
+msgstr ""
+
+#: View/Elements/Events/View/value_field.ctp:51
+#: View/Elements/Feeds/View/value_field.ctp:48
+#: View/Elements/Servers/View/value_field.ctp:48
+msgid " value"
+msgstr ""
+
+#: View/Elements/Feeds/View/row_object.ctp:20
+#: View/Elements/Servers/View/row_object.ctp:20
+#: View/ObjectTemplates/view.ctp:8
+#: View/Objects/revise_object.ctp:23
+msgid "Meta-category"
+msgstr ""
+
+#: View/Elements/Feeds/View/value_field.ctp:32
+#: View/Elements/Servers/View/value_field.ctp:32
+msgid "Cortex object"
+msgstr ""
+
+#: View/Elements/Servers/eventattribute.ctp:31;97
+msgid "all"
+msgstr ""
+
+#: View/Elements/Servers/eventattribute.ctp:41
+#: View/Events/view.ctp:131
+#: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
+#: View/Servers/preview_event.ctp:36
+#: View/Sightings/ajax/list_sightings.ctp:5
+msgid "Date"
+msgstr ""
+
+#: View/Elements/Servers/eventattribute.ctp:49
+#: View/Elements/templateElements/templateRowAttribute.ctp:82
+#: View/Events/resolved_attributes.ctp:49
+#: View/Feeds/freetext_index.ctp:34
+#: View/Objects/add.ctp:97
+#: View/Pages/doc/using_the_system.ctp:236;285
+#: View/Templates/populate_event_from_template_attributes.ctp:10
+msgid "IDS"
+msgstr ""
+
+#: View/Elements/Servers/Module/type.ctp:11
+#: View/Elements/healthElements/diagnostics.ctp:276
+#: View/Pages/doc/administration.ctp:56;228
+msgid "Status"
+msgstr ""
+
+#: View/Elements/Servers/View/row_attribute.ctp:93
+#: View/Elements/Users/userIndexTable.ctp:66;67;70
+#: View/Elements/healthElements/files.ctp:61
+#: View/Elements/healthElements/workers.ctp:66;67;68
+#: View/Events/automation.ctp:234;241;248;269;276
+#: View/Events/export.ctp:68;88
+#: View/Events/legacy_automation.ctp:403;410;417;438;445
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
+msgid "N/A"
+msgstr ""
+
+#: View/Elements/Servers/View/row_object.ctp:16
+#: View/Elements/templateElements/templateRowAttribute.ctp:12
+#: View/Elements/templateElements/templateRowFile.ctp:12
+#: View/Elements/templateElements/templateRowText.ctp:12
+#: View/Galaxies/view.ctp:14
+#: View/ObjectTemplates/view.ctp:4
+#: View/Objects/revise_object.ctp:19
+#: View/Organisations/ajax/merge.ctp:57;64
+#: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
+#: View/SharingGroups/view.ctp:42;67
+#: View/Templates/view.ctp:9
+#: View/Users/statistics_orgs.ctp:31
+#: View/Warninglists/view.ctp:10
+msgid "Name"
+msgstr ""
+
+#: View/Elements/Servers/View/row_object.ctp:21
+#: View/Elements/healthElements/files.ctp:8
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:10
+#: View/Elements/templateElements/populateTemplateDescription.ctp:12
+#: View/Elements/templateElements/populateTemplateFile.ctp:10
+#: View/Elements/templateElements/templateRowAttribute.ctp:21
+#: View/Elements/templateElements/templateRowFile.ctp:21
+#: View/Events/export.ctp:27
+#: View/Galaxies/view.ctp:20
+#: View/ObjectTemplates/view.ctp:9
+#: View/Objects/add.ctp:16;94
+#: View/Organisations/view.ctp:15;58;59
+#: View/Pages/doc/administration.ctp:48;241
+#: View/Pages/doc/categories_and_types.ctp:44;61
+#: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
+#: View/Servers/preview_event.ctp:65
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
+#: View/Taxonomies/view.ctp:14
+#: View/Templates/view.ctp:14
+#: View/Warninglists/view.ctp:11
+msgid "Description"
+msgstr ""
+
+#: View/Elements/Servers/View/row_object.ctp:22
+#: View/Templates/view.ctp:2
+msgid "Template"
+msgstr ""
+
+#: View/Elements/Servers/View/row_object_reference.ctp:1
+#: View/Objects/orphaned_object_diagnostics.ctp:53
+msgid "References"
+msgstr ""
+
+#: View/Elements/Servers/View/row_object_referenced_by.ctp:1
+#: View/Objects/orphaned_object_diagnostics.ctp:62
+msgid "Referenced by"
+msgstr ""
+
+#: View/Elements/TagCollections/index_row.ctp:44
+#: View/Tags/index.ctp:125
+#: View/Whitelists/admin_index.ctp:32
+msgid "Are you sure you want to delete \"%s\"?"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:5
+#: View/Roles/view.ctp:24
+#: View/Users/admin_add.ctp:55
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
+msgid "Role"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:16
+msgid "Last login"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:17
+#: View/Pages/doc/administration.ctp:183
+#: View/Pages/doc/using_the_system.ctp:272
+#: View/ShadowAttributes/index.ctp:64
+msgid "Created"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:88
+msgid "Initiate password refresh"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:88
+msgid "Create new credentials and inform user"
+msgstr ""
+
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_events.ctp:2
+msgid "Changes since last visit"
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_events.ctp:4
+msgid "Events updated: "
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_events.ctp:5
+msgid "Events published: "
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_notifications.ctp:2
+msgid "Notifications"
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_notifications.ctp:4
+msgid "Proposals: "
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_notifications.ctp:5
+msgid "Events with proposals: "
+msgstr ""
+
+#: View/Elements/dashboard/dashboard_notifications.ctp:9
+msgid "Delegation requests: "
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:5
+msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:9
+msgid "MISP version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:10
+msgid "Every version of MISP includes a json file with the current version. This is checked against the latest tag on github, if there is a version mismatch the tool will warn you about it. Make sure that you update MISP regularly."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:12
+msgid "Currently installed version…"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:18
+msgid "Upcoming development version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:22
+msgid "Outdated version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
+#: View/Elements/healthElements/workers.ctp:23;76
+#: View/Events/add_misp_export_result.ctp:23
+#: View/Servers/ajax/zeromqstatus.ctp:11
+msgid "OK"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:30
+msgid "Could not retrieve version from github"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:39
+msgid "Latest available version…"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:46
+msgid "Status…"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:53
+msgid "Current branch…"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:62
+msgid "Pull the latest MISP version from github"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:62
+msgid "Update MISP"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:64
+msgid "Writeable Directories and files"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:65
+msgid "The following directories and files have to be writeable for MISP to function properly. Make sure that the apache user has write privileges for the directories below."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:66
+msgid "Directories"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:73
+msgid "Directory "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:81
+msgid "Writeable Files"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:88;102
+msgid "File "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:95
+msgid "Readable Files"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:110
+msgid "PHP Settings"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:113;125
+msgid "Up to date"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:119
+#: View/Elements/healthElements/workers.ctp:83;85
+#: View/Organisations/view.ctp:26
+msgid "Unknown"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:121
+msgid "Issues determining version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:128;137
+msgid "Update highly recommended"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:131;140
+msgid "Version unsupported, update ASAP"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:144
+msgid "PHP ini path"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:145
+msgid "PHP Version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:145;146
+msgid "recommended"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:146
+msgid "PHP CLI Version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
+msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:155
+#: View/Events/filter_event_index.ctp:32;190
+#: View/Pages/doc/using_the_system.ctp:66;171
+msgid "Low"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:159
+msgid "PHP Extensions"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:169
+msgid "Not loaded"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:174
+msgid "Issues reading PHP settings. This could be due to the test script not being readable."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:182
+msgid "Advanced attachment handler"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:183
+msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:188
+msgid "PyMISP"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:188
+msgid "Not installed or version outdated."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:200
+msgid "STIX and Cybox libraries"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:201
+msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:202
+msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:209
+msgid "Other versions might work but are not tested / recommended."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:218
+msgid "STIX and CyBox"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:218
+msgid "Could not read test script (stixtest.py)."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:232
+msgid " library version"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:249
+msgid "GnuPG"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:250
+msgid "This tool tests whether your GnuPG is set up correctly or not."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:258
+msgid "GnuPG installation and settings"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:261
+msgid "ZeroMQ"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:262
+msgid "This tool tests whether the ZeroMQ extension is installed and functional."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:270
+msgid "ZeroMQ settings"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:274
+msgid "Start ZMQ service"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:274
+msgid "Start ZeroMQ service"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:274
+msgid "Start"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:275
+msgid "Stop ZeroMQ service"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:275
+msgid "Stop"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:276
+msgid "Check ZeroMQ service status"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:278
+msgid "Proxy"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:279
+msgid "This tool tests whether your HTTP proxy settings are correct."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:287
+#: View/Pages/doc/administration.ctp:35
+msgid "Proxy settings"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:290
+msgid "Module System"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:291
+msgid "This tool tests the various module systems and whether they are reachable based on the module settings."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:306
+msgid " module system"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:312
+msgid "Session table"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:313
+msgid "This tool checks how large your database's session table is. <br />Sessions in CakePHP rely on PHP's garbage collection for clean-up and in certain distributions this can be disabled by default resulting in an ever growing cake session table. <br />If you are affected by this, just click the clean session table button below."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:320
+msgid "Expired sessions"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:326
+msgid "Purge sessions"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:330
+msgid "Clean model cache"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:331
+msgid "If you ever run into issues with missing database fields / tables, please run the following script to clean the model cache."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:332
+msgid "Clean cache"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:333
+msgid "Overwritten objects"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:334
+msgid "Prior to 2.4.89, due to a bug a situation could occur where objects got overwritten on a sync pull. This tool allows you to inspect whether you are affected and if yes, remedy the issue."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:336;339
+msgid "Orphaned attributes"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:337
+msgid "In some rare cases attributes can remain in the database after an event is deleted becoming orphaned attributes. This means that they do not belong to any event, which can cause issues with the correlation engine (known cases include event deletion directly in the database without cleaning up the attributes and situations involving a race condition with an event deletion happening before all attributes are synchronised over)."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:339;355
+msgid "Run the test below"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:341
+msgid "Check for orphaned attribute"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:341
+msgid "Check for orphaned attributes"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:342
+msgid "Remove orphaned attributes"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:343;345
+#: View/Pages/administration.ctp:17
+msgid "Verify GnuPG keys"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:344
+msgid "Run a full validation of all GnuPG keys within this instance's userbase. The script will try to identify possible issues with each key and report back on the results."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:345
+#: View/Pages/administration.ctp:17
+msgid "Check whether every user's GnuPG key is usable"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:346
+msgid "Database cleanup scripts"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:347
+msgid "If you run into an issue with an infinite upgrade loop (when upgrading from version ~2.4.50) that ends up filling your database with upgrade script log messages, run the following script."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:348
+msgid "Prune upgrade logs"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:349;351
+msgid "Legacy Administrative Tools"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:350
+msgid "Click the following button to go to the legacy administrative tools page. There should in general be no need to do this unless you are upgrading a very old MISP instance (<2.4), all updates are done automatically with more current versions."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:352
+msgid "Verify bad link on attachments"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:353
+msgid "Verify each attachment referenced in database is accessible on filesystem."
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:355
+msgid "Non existing attachments referenced in Database"
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:357
+msgid "Check bad link on attachments"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:2
+msgid "Below you will find a list of the uploaded files based on type."
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:9
+msgid "Expected Format"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:10
+msgid "Path"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:14
+msgid "Files set for each relevant setting"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:29
+msgid "Filename"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:30
+msgid "Used by"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:31
+msgid "Size"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:32
+#: View/Roles/admin_edit.ctp:15
+msgid "Permissions"
+msgstr ""
+
+#: View/Elements/healthElements/files.ctp:73
+#: View/Organisations/index.ctp:140
+#: View/Regexp/admin_index.ctp:35
+#: View/Roles/admin_index.ctp:67
+#: View/SharingGroups/index.ctp:87
+msgid "Are you sure you want to delete %s?"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:3
+msgid "Critical, your MISP instance requires immediate attention."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:4
+msgid "Issues found, it is recommended that you resolve them."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:5
+msgid "Good, but there are some optional settings that are incorrect / not set."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:6
+msgid "In perfect health."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:15
+msgid "Test"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
+#: View/Events/filter_event_index.ctp:134
+#: View/Events/resolved_attributes.ctp:45
+#: View/Events/show_i_o_c_results.ctp:13
+#: View/Feeds/freetext_index.ctp:33
+#: View/Noticelists/view.ctp:42
+#: View/Objects/add.ctp:96
+#: View/Objects/revise_object.ctp:46
+#: View/Pages/doc/administration.ctp:47
+#: View/Pages/doc/using_the_system.ctp:94;145;233;283
+#: View/Templates/populate_event_from_template_attributes.ctp:8
+#: View/Users/admin_filter_user_index.ctp:71
+msgid "Value"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:7
+#: View/Pages/doc/administration.ctp:49
+msgid "Error Message"
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:7
+#: View/Pages/doc/administration.ctp:32
+msgid "Overview"
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:34
+#: View/Pages/doc/administration.ctp:38
+msgid "Diagnostics"
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:45
+msgid "Manage files"
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:50;65
+#: View/Pages/doc/administration.ctp:40
+msgid "Download report"
+msgstr ""
+
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:5
+msgid "MISP cannot access your /proc directory to check the status of the worker processes, which means that dead workers will not be detected by the diagnostic tool. If you would like to regain this functionality, make sure that the open_basedir directive is not set, or that /proc is included in it."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "Note:"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:10
+msgid "You have set the \"manage_workers\" variable to \"false\", therefore worker controls have been disabled."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:15
+msgid "Issues prevent jobs from being processed. Please resolve them below."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:20
+msgid "Worker started with the correct user, but the current status is unknown."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:29
+msgid "There are issues with the worker(s), but at least one healthy worker is monitoring the queue."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:35
+msgid "Worker type: "
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:37
+msgid "Jobs in the queue: "
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:45
+msgid "Queue status: "
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:56
+msgid "Worker PID"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:57
+#: View/Pages/doc/administration.ctp:166
+#: View/Pages/doc/using_the_system.ctp:255
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
+msgid "User"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:58
+msgid "Worker process"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:59
+msgid "Information"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:69
+msgid "Worker not running!"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:77
+msgid "The worker appears to be healthy."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:80
+msgid "The worker was started with a user other than the apache user. MISP cannot check whether the worker is alive or not."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:86
+msgid "Cannot check whether the worker is alive or dead."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:90
+msgid "Dead"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:91
+msgid "The Worker appears to be dead."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:106
+msgid "Stop (if still running) and remove this worker. This will immediately terminate any jobs that are being executed by it."
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:119
+msgid "Start a worker"
+msgstr ""
+
+#: View/Elements/healthElements/workers.ctp:130
+msgid "Restart all workers"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:3
+msgid "Set pull rules"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:9
+#: View/Elements/serverRuleElements/push.ctp:9
+msgid "Allowed Tags (OR)"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:14
+#: View/Elements/serverRuleElements/push.ctp:14
+msgid "Move tag to the list of tags to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:15
+#: View/Elements/serverRuleElements/push.ctp:15
+msgid "Remove tag from the list of tags to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:21
+#: View/Elements/serverRuleElements/push.ctp:23
+msgid "Remove tag from the list of tags to block"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:22
+#: View/Elements/serverRuleElements/push.ctp:24
+msgid "Move tag to the list of tags to block"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:25
+#: View/Elements/serverRuleElements/push.ctp:27
+msgid "Blocked Tags (AND NOT)"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:30
+#: View/Elements/serverRuleElements/push.ctp:32
+msgid "AND"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:34
+#: View/Elements/serverRuleElements/push.ctp:36
+msgid "AND NOT"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:43
+msgid "Move organisation to the list of tags to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:43
+#: View/Elements/serverRuleElements/push.ctp:45
+msgid "Move organisation to the list of organisations to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:44
+msgid "Remove organisation to the list of tags to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:44
+msgid "Remove organisation form the list of organisations to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:50
+msgid "Remove organisation from the list of tags to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:50
+#: View/Elements/serverRuleElements/push.ctp:54
+msgid "Remove organisation from the list of organisations to block"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:51
+msgid "Move organisation to the list of tags to block"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:51
+#: View/Elements/serverRuleElements/push.ctp:55
+msgid "Move organisation to the list of organisations to block"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:54
+#: View/Elements/serverRuleElements/push.ctp:58
+msgid "Blocked Orgs (AND NOT)"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:65
+msgid "Accept changes"
+msgstr ""
+
+#: View/Elements/serverRuleElements/pull.ctp:65
+#: View/Elements/serverRuleElements/push.ctp:67
+msgid "Update"
+msgstr ""
+
+#: View/Elements/serverRuleElements/push.ctp:3
+msgid "Set push rules"
+msgstr ""
+
+#: View/Elements/serverRuleElements/push.ctp:18
+msgid "Available Tags"
+msgstr ""
+
+#: View/Elements/serverRuleElements/push.ctp:40
+msgid "Allowed Orgs (OR)"
+msgstr ""
+
+#: View/Elements/serverRuleElements/push.ctp:46
+msgid "Remove organisation from the list of organisations to allow"
+msgstr ""
+
+#: View/Elements/serverRuleElements/push.ctp:49
+msgid "Available  Organisations"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:3
+#: View/Noticelists/view.ctp:41
+#: View/Pages/doc/using_the_system.ctp:107
+msgid "Field"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:13
+#: View/Events/export.ctp:25
+#: View/Events/resolved_attributes.ctp:48
+#: View/Events/show_i_o_c_results.ctp:12
+#: View/Feeds/freetext_index.ctp:32
+#: View/Objects/revise_object.ctp:45
+#: View/Organisations/ajax/merge.ctp:59;66
+#: View/Pages/doc/administration.ctp:237
+#: View/Pages/doc/categories_and_types.ctp:60
+#: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
+#: View/Sightings/ajax/list_sightings.ctp:7
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
+#: View/Templates/populate_event_from_template_attributes.ctp:7
+#: View/Users/statistics_orgs.ctp:35
+#: View/Warninglists/view.ctp:13
+msgid "Type"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:38
+msgid "Describe the %s using one or several (separated by a line-break) of the following types: %s"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:40
+msgid "Describe the %s using one or several %s\\s (separated by a line-break) "
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:52
+msgid "Describe the %s using one of the following types: %s"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:54
+msgid "Describe the %s using a %s"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateAttribute.ctp:68
+msgid "Error: %s"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateDescription.ctp:3
+#: View/Templates/add.ctp:37
+#: View/Templates/edit.ctp:37
+msgid "Template Description"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateDescription.ctp:6
+msgid "Template ID"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateDescription.ctp:8
+msgid "Template Name"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateDescription.ctp:10
+#: View/Organisations/view.ctp:26
+#: View/SharingGroups/view.ctp:23
+msgid "Created by"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateDescription.ctp:14
+msgid "Tags automatically assigned"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateFile.ctp:13
+#: View/Elements/templateElements/templateRowFile.ctp:4
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:4
+msgid "File"
+msgstr ""
+
+#: View/Elements/templateElements/populateTemplateFile.ctp:13
+msgid "s"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:4
+#: View/ObjectReferences/ajax/add.ctp:86
+#: View/Objects/revise_object.ctp:43
+#: View/Pages/doc/administration.ctp:168
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:3
+msgid "Attribute"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:30
+#: View/Elements/templateElements/templateRowFile.ctp:30
+#: View/Events/resolved_attributes.ctp:47
+#: View/Events/show_i_o_c_results.ctp:11
+#: View/Feeds/freetext_index.ctp:31
+#: View/Objects/add.ctp:95
+#: View/Objects/revise_object.ctp:44
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
+#: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
+#: View/ShadowAttributes/index.ctp:58
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
+#: View/TemplateElements/ajax/template_element_add_file.ctp:28
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:28
+#: View/Templates/populate_event_from_template_attributes.ctp:6
+msgid "Category"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:39
+#: View/Pages/doc/categories_and_types.ctp:57
+#: View/Pages/doc/using_the_system.ctp:109
+#: View/Pages/doc/md/categories_and_types.ctp:33
+msgid "Types"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:59
+msgid "Mandatory"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:70
+#: View/Elements/templateElements/templateRowFile.ctp:60
+msgid "Batch"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:101
+#: View/Elements/templateElements/templateRowFile.ctp:78
+#: View/Elements/templateElements/templateRowText.ctp:35
+msgid "Delete template element"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowAttribute.ctp:105
+#: View/Elements/templateElements/templateRowFile.ctp:82
+#: View/Elements/templateElements/templateRowText.ctp:39
+msgid "Edit template element"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowFile.ctp:38
+#: View/Pages/doc/using_the_system.ctp:130;343
+#: View/TemplateElements/ajax/template_element_add_file.ctp:38
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:38
+msgid "Malware"
+msgstr ""
+
+#: View/Elements/templateElements/templateRowFile.ctp:49
+msgid "Req."
+msgstr ""
+
+#: View/Elements/templateElements/templateRowText.ctp:4;20
+#: View/Pages/doc/using_the_system.ctp:352
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:5
+msgid "Text"
+msgstr ""
+
+#: View/Errors/error400.ctp:33
+msgid "You have tripped the cross-site request forgery protection of MISP"
+msgstr ""
+
+#: View/Errors/error400.ctp:35
+msgid "CSRF error"
+msgstr ""
+
+#: View/Errors/error400.ctp:36
+msgid "This happens usually when you try to resubmit the same form with invalidated CSRF tokens or you had a form open too long and the CSRF tokens simply expired. Just go back to the previous page and refresh the form (by reloading the same url) so that the tokens get refreshed."
+msgstr ""
+
+#: View/Errors/error400.ctp:39
+msgid "Alternatively, click <a href=\"%s\">here</a> to continue to the start page."
+msgstr ""
+
+#: View/Errors/error403.ctp:4
+msgid "%s"
+msgstr ""
+
+#: View/Errors/missing_connection.ctp:1
+#: View/Errors/missing_datasource_config.ctp:1
+msgid "Missing Database Connection"
+msgstr ""
+
+#: View/Errors/pdo_error.ctp:1
+msgid "PDO error"
+msgstr ""
+
+#: View/EventBlacklists/add.ctp:4
+#: View/EventBlacklists/edit.ctp:4
+#: View/OrgBlacklists/edit.ctp:4
+msgid "Add Event Blacklist Entries"
+msgstr ""
+
+#: View/EventBlacklists/add.ctp:5
+#: View/EventBlacklists/edit.ctp:5
+#: View/OrgBlacklists/edit.ctp:5
+msgid "Simply paste a list of all the event UUIDs that you wish to block from being entered."
+msgstr ""
+
+#: View/EventBlacklists/add.ctp:11
+#: View/OrgBlacklists/add.ctp:11
+msgid "Enter a single or a list of UUIDs"
+msgstr ""
+
+#: View/EventBlacklists/add.ctp:17
+msgid "(Optional) The organisation that the event is associated with"
+msgstr ""
+
+#: View/EventBlacklists/add.ctp:24
+msgid "(Optional) the event info of the event that you would like to block. It's best to leave this empty if you are adding a list of UUIDs."
+msgstr ""
+
+#: View/EventBlacklists/add.ctp:30
+#: View/OrgBlacklists/add.ctp:23
+msgid "(Optional) Any comments you would like to add regarding this (or these) entries."
+msgstr ""
+
+#: View/EventBlacklists/edit.ctp:10
+#: View/OrgBlacklists/edit.ctp:10
+msgid "Creating organisation"
+msgstr ""
+
+#: View/EventBlacklists/index.ctp:2
+msgid "Event Blacklists"
+msgstr ""
+
+#: View/EventBlacklists/index.ctp:39
+msgid "Are you sure you want to delete the blacklist entry for the event UUID %s?"
+msgstr ""
+
+#: View/EventDelegations/ajax/accept_delegation.ctp:4
+msgid "Are you sure you would like to accept the request by %s to take ownership of Event #%s"
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:2
+msgid "Delegate the publishing of the Event to another organisation"
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:3
+msgid "Warning: You are about to request another organisation to take ownership of this event."
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:8
+msgid "Target Organisation"
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:10
+msgid "Select organisation"
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:15
+msgid "Desired Distribution"
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:22
+msgid "Desired Sharing Group"
+msgstr ""
+
+#: View/EventDelegations/ajax/delegate_event.ctp:33
+msgid "Message to the recipient organisation"
+msgstr ""
+
+#: View/EventDelegations/ajax/delete_delegation.ctp:2
+msgid "Delete Delegation Request"
+msgstr ""
+
+#: View/EventDelegations/ajax/delete_delegation.ctp:4
+msgid "Are you sure you would like to discard the request by %s to take ownership of Event #%s"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:2
+msgid "Event Delegation"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:5
+msgid "your organisation"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:6
+msgid "Your organisation"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:9
+msgid "Request details</b><br /><span class=\"red bold\">%s</span> is requesting <span class=\"red bold\">%s</span> to take over this event."
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:12
+msgid "The desired distribution level is"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:14
+msgid "The desired sharing group to distribute the event to is"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:18
+msgid "Message from requester"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:21
+msgid "Accept delegation request"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:21
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
+#: View/Events/ajax/quick_edit.ctp:5
+#: View/Servers/ajax/server_settings_edit.ctp:5
+#: View/ShadowAttributes/ajax/attributeEditCategoryForm.ctp:5
+#: View/ShadowAttributes/ajax/attributeEditCommentForm.ctp:5
+#: View/ShadowAttributes/ajax/attributeEditTo_idsForm.ctp:5
+#: View/ShadowAttributes/ajax/attributeEditTypeForm.ctp:5
+#: View/ShadowAttributes/ajax/attributeEditValueForm.ctp:5
+msgid "Accept"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:23
+msgid "Decline and remove delegation request"
+msgstr ""
+
+#: View/EventDelegations/ajax/view.ctp:23
+#: View/ShadowAttributes/ajax/attributeEditCategoryForm.ctp:6
+#: View/ShadowAttributes/ajax/attributeEditCommentForm.ctp:6
+#: View/ShadowAttributes/ajax/attributeEditTo_idsForm.ctp:6
+#: View/ShadowAttributes/ajax/attributeEditTypeForm.ctp:6
+#: View/ShadowAttributes/ajax/attributeEditValueForm.ctp:6
+msgid "Discard"
+msgstr ""
+
+#: View/EventGraph/ajax/eventGraph_add_form.ctp:6
+msgid "Add EventGraph"
+msgstr ""
+
+#: View/EventGraph/ajax/eventGraph_add_form.ctp:6
+msgid "Edit EventGraph"
+msgstr ""
+
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:5
+msgid "EventGraph Deletion"
+msgstr ""
+
+#: View/EventGraph/ajax/eventGraph_delete_form.ctp:8
+msgid "Are you sure you want to delete eventGraph #%s? The eventGraph will be permanently deleted and unrecoverable."
+msgstr ""
+
+#: View/Events/add.ctp:44
+#: View/Events/edit.ctp:35
+msgid "Threat Level "
+msgstr ""
+
+#: View/Events/add.ctp:48
+#: View/Events/edit.ctp:38
+msgid "Analysis "
+msgstr ""
+
+#: View/Events/add.ctp:52
+#: View/Events/edit.ctp:43
+#: View/ShadowAttributes/index.ctp:52
+msgid "Event Info"
+msgstr ""
+
+#: View/Events/add.ctp:56
+#: View/Events/edit.ctp:47
+msgid "Quick Event Description or Tracking Info"
+msgstr ""
+
+#: View/Events/add.ctp:59
+#: View/Events/edit.ctp:50
+msgid "Extends event"
+msgstr ""
+
+#: View/Events/add.ctp:62
+#: View/Events/edit.ctp:53
+msgid "Event UUID or ID. Leave blank if not applicable."
+msgstr ""
+
+#: View/Events/add_i_o_c.ctp:4
+msgid "Import OpenIOC"
+msgstr ""
+
+#: View/Events/add_i_o_c.ctp:13
+#: View/Events/add_misp_export.ctp:27
+#: View/Events/upload_analysis_file.ctp:22
+#: View/Events/upload_stix.ctp:29
+msgid "Upload"
+msgstr ""
+
+#: View/Events/add_misp_export.ctp:4
+msgid "Import from MISP Export File"
+msgstr ""
+
+#: View/Events/add_misp_export.ctp:7
+msgid "MISP XML or JSON file"
+msgstr ""
+
+#: View/Events/add_misp_export.ctp:16
+msgid "Take ownership of the event"
+msgstr ""
+
+#: View/Events/add_misp_export.ctp:17
+msgid "Warning: This will change the creator organisation of the event, tampering with the event's ownership and releasability and can lead to unexpected behaviour when synchronising the event with instances that have another creator for the same event.)"
+msgstr ""
+
+#: View/Events/add_misp_export.ctp:22
+#: View/Events/upload_stix.ctp:17
+msgid "Publish imported events"
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:2
+msgid "Add From MISP Export Result"
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:6
+msgid "Result"
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:7
+msgid "Details"
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:15
+#: View/Jobs/index.ctp:124
+msgid "Failed"
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:24
+msgid "Event created."
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:26
+msgid "Event with this UUID already exists."
+msgstr ""
+
+#: View/Events/add_misp_export_result.ctp:38
+#: View/Servers/preview_index.ctp:112
+msgid "Event "
+msgstr ""
+
+#: View/Events/automation.ctp:3
+msgid "Automation functionality is designed to automatically feed other tools and systems with the data in your MISP repository.\n"
+"    To to make this functionality available for automated tools an authentication key is used."
+msgstr ""
+
+#: View/Events/automation.ctp:6
+msgid "Make sure you keep your API key secret as it gives access to the all of the data that you normally have access to in MISP."
+msgstr ""
+
+#: View/Events/automation.ctp:9
+#: View/Events/legacy_automation.ctp:7
+msgid "Your current key is: <code>%s</code>.\n"
+"    You can %s this key."
+msgstr ""
+
+#: View/Events/automation.ctp:10
+#: View/Events/legacy_automation.ctp:8
+msgid "reset"
+msgstr ""
+
+#: View/Events/automation.ctp:14
+#: View/Logs/admin_index.ctp:20;21
+msgid "Search"
+msgstr ""
+
+#: View/Events/automation.ctp:16
+#: View/Events/legacy_automation.ctp:264
+msgid "It is possible to search the database for attributes based on a list of criteria."
+msgstr ""
+
+#: View/Events/automation.ctp:17
+#: View/Events/legacy_automation.ctp:265
+msgid "To return an event or a list of events in a desired format, use the following syntax"
+msgstr ""
+
+#: View/Events/automation.ctp:18
+msgid "Whilst a list of parameters is provided below, it isn't necessarily exhaustive, specific export formats could have additional parameters."
+msgstr ""
+
+#: View/Events/automation.ctp:21
+msgid "Set the return format of the search (Currently supported: json, xml, openioc, suricata, snort - more formats are being moved to restSearch with the goal being that all searches happen through this API). Can be passed as the first parameter after restSearch or via the JSON payload."
+msgstr ""
+
+#: View/Events/automation.ctp:22
+msgid "Limit the number of results returned, depending on the scope (for example 10 attributes or 10 full events)."
+msgstr ""
+
+#: View/Events/automation.ctp:23
+msgid "If a limit is set, sets the page to be returned. page 3, limit 100 will return records 201->300)."
+msgstr ""
+
+#: View/Events/automation.ctp:24
+#: View/Events/legacy_automation.ctp:268;297
+msgid "Search for the given value in the attributes' value field."
+msgstr ""
+
+#: View/Events/automation.ctp:25
+#: View/Events/legacy_automation.ctp:62;199;269;298
+msgid "The attribute type, any valid MISP attribute type is accepted."
+msgstr ""
+
+#: View/Events/automation.ctp:26
+#: View/Events/legacy_automation.ctp:61;270;299
+msgid "The attribute category, any valid MISP attribute category is accepted."
+msgstr ""
+
+#: View/Events/automation.ctp:27
+#: View/Events/legacy_automation.ctp:271;300
+msgid "Search by the creator organisation by supplying the organisation identifier."
+msgstr ""
+
+#: View/Events/automation.ctp:28
+#: View/Events/legacy_automation.ctp:200
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'."
+msgstr ""
+
+#: View/Events/automation.ctp:29
+#: View/Events/legacy_automation.ctp:278
+msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
+msgstr ""
+
+#: View/Events/automation.ctp:30;151
+#: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:31;152
+#: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:32
+#: View/Events/legacy_automation.ctp:282;307
+msgid "The events that should be included / excluded from the search"
+msgstr ""
+
+#: View/Events/automation.ctp:33
+#: View/Events/legacy_automation.ctp:283;308
+msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
+msgstr ""
+
+#: View/Events/automation.ctp:34
+#: View/Events/legacy_automation.ctp:284
+msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
+msgstr ""
+
+#: View/Events/automation.ctp:35
+#: View/Events/legacy_automation.ctp:285;309
+msgid "Restrict the results by uuid."
+msgstr ""
+
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:37
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:38
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:39
+#: View/Events/legacy_automation.ctp:288;311
+msgid "Set whether published or unpublished events should be returned. Do not set the parameter if you want both."
+msgstr ""
+
+#: View/Events/automation.ctp:40
+#: View/Events/legacy_automation.ctp:289;313
+msgid "Remove any attributes from the result that would cause a hit on a warninglist entry."
+msgstr ""
+
+#: View/Events/automation.ctp:41
+#: View/Events/legacy_automation.ctp:314
+msgid "By default (0) all attributes are returned that match the other filter parameters, irregardless of their to_ids setting. To restrict the returned data set to to_ids only attributes set this parameter to 1. You can only use the special \"exclude\" setting to only return attributes that have the to_ids flag disabled."
+msgstr ""
+
+#: View/Events/automation.ctp:42
+#: View/Events/legacy_automation.ctp:315
+msgid "If this parameter is set to 1, it will return soft-deleted attributes along with active ones. By using \"only\" as a parameter it will limit the returned data set to soft-deleted data only."
+msgstr ""
+
+#: View/Events/automation.ctp:43
+#: View/Events/legacy_automation.ctp:316
+msgid "Instead of just including the event ID, also include the event UUID in each of the attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:44
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
+#: View/Events/automation.ctp:45
+msgid "If this flag is set, sharing group objects will not be included, instead only the sharing group ID is set."
+msgstr ""
+
+#: View/Events/automation.ctp:46
+msgid "Filter on the event's info field."
+msgstr ""
+
+#: View/Events/automation.ctp:47
+msgid "Search for a full or a substring (delimited by % for substrings) in the event info, event tags, attribute tags, attribute values or attribute comment fields."
+msgstr ""
+
+#: View/Events/automation.ctp:48
+msgid "CSV only, select the fields that you wish to include in the CSV export. By setting event level fields additionally, includeContext is not required to get event metadata."
+msgstr ""
+
+#: View/Events/automation.ctp:49
+msgid "CSV only, add additional event level data to the export. The additional fields can be added via requested_attributes too with more granularity."
+msgstr ""
+
+#: View/Events/automation.ctp:79
+msgid "CSV specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:81
+msgid "Limit the list of fields to be returned in the CSV."
+msgstr ""
+
+#: View/Events/automation.ctp:82
+msgid "Include the event level meta-data with each attribute."
+msgstr ""
+
+#: View/Events/automation.ctp:83
+msgid "The CSV created when this setting is set to true will not contain the header row."
+msgstr ""
+
+#: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
+msgid "RPZ specific parameters for the restSearch APIs"
+msgstr ""
+
+#: View/Events/automation.ctp:95
+#: View/Events/legacy_automation.ctp:164
+msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
+msgstr ""
+
+#: View/Events/automation.ctp:98
+#: View/Events/legacy_automation.ctp:176
+msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
+msgstr ""
+
+#: View/Events/automation.ctp:102
+#: View/Events/legacy_automation.ctp:180
+msgid "To override the above values, either use the url parameters as described below"
+msgstr ""
+
+#: View/Events/automation.ctp:104
+#: View/Events/legacy_automation.ctp:182
+msgid "or POST an XML or JSON object with the above listed options"
+msgstr ""
+
+#: View/Events/automation.ctp:108
+#: View/Events/legacy_automation.ctp:211
+msgid "Bro IDS export"
+msgstr ""
+
+#: View/Events/automation.ctp:109
+#: View/Events/legacy_automation.ctp:212
+msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
+msgstr ""
+
+#: View/Events/automation.ctp:110
+#: View/Events/legacy_automation.ctp:213
+msgid "You can configure your tools to automatically download a file one of the Bro types."
+msgstr ""
+
+#: View/Events/automation.ctp:116
+#: View/Events/legacy_automation.ctp:219
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
+msgstr ""
+
+#: View/Events/automation.ctp:119
+#: View/Events/legacy_automation.ctp:222
+msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
+msgstr ""
+
+#: View/Events/automation.ctp:137
+#: View/Events/legacy_automation.ctp:240
+msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
+msgstr ""
+
+#: View/Events/automation.ctp:139
+#: View/Events/legacy_automation.ctp:242
+msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
+msgstr ""
+
+#: View/Events/automation.ctp:146
+#: View/Events/legacy_automation.ctp:249;301
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead)."
+msgstr ""
+
+#: View/Events/automation.ctp:149
+#: View/Events/legacy_automation.ctp:252
+msgid "Restrict the results to the given event IDs."
+msgstr ""
+
+#: View/Events/automation.ctp:150
+#: View/Events/legacy_automation.ctp:253
+msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
+msgstr ""
+
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:154
+#: View/Events/legacy_automation.ctp:95;120;174;206;257
+msgid "All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/automation.ctp:156
+#: View/Events/legacy_automation.ctp:41;70;97;122;259;290
+msgid "The keywords false or null should be used for optional empty parameters in the URL."
+msgstr ""
+
+#: View/Events/automation.ctp:157
+#: View/Events/legacy_automation.ctp:260
+msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
+msgstr ""
+
+#: View/Events/automation.ctp:160
+#: View/Events/legacy_automation.ctp:329
+msgid "Export attributes of event with specified type as XML"
+msgstr ""
+
+#: View/Events/automation.ctp:161
+#: View/Events/legacy_automation.ctp:330
+msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
+msgstr ""
+
+#: View/Events/automation.ctp:163
+#: View/Events/legacy_automation.ctp:332
+msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
+"    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
+"    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
+msgstr ""
+
+#: View/Events/automation.ctp:168
+#: View/Events/legacy_automation.ctp:337
+msgid "Download attachment or malware sample"
+msgstr ""
+
+#: View/Events/automation.ctp:169
+#: View/Events/legacy_automation.ctp:338
+msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
+msgstr ""
+
+#: View/Events/automation.ctp:171
+#: View/Events/legacy_automation.ctp:340
+msgid "Download malware sample by hash"
+msgstr ""
+
+#: View/Events/automation.ctp:172
+#: View/Events/legacy_automation.ctp:341
+msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
+msgstr ""
+
+#: View/Events/automation.ctp:173
+#: View/Events/legacy_automation.ctp:342
+msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
+msgstr ""
+
+#: View/Events/automation.ctp:174
+#: View/Events/legacy_automation.ctp:343
+msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
+msgstr ""
+
+#: View/Events/automation.ctp:176
+#: View/Events/legacy_automation.ctp:345
+msgid "POST message payload (XML)"
+msgstr ""
+
+#: View/Events/automation.ctp:180
+#: View/Events/legacy_automation.ctp:294;320;349
+msgid "POST message payload (json)"
+msgstr ""
+
+#: View/Events/automation.ctp:184
+#: View/Events/legacy_automation.ctp:353
+msgid "A quick description of all the parameters in the passed object"
+msgstr ""
+
+#: View/Events/automation.ctp:185
+#: View/Events/legacy_automation.ctp:354
+msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
+msgstr ""
+
+#: View/Events/automation.ctp:186
+#: View/Events/legacy_automation.ctp:355
+msgid "If set, it will return all samples from events that have a match for the hash provided above."
+msgstr ""
+
+#: View/Events/automation.ctp:187
+#: View/Events/legacy_automation.ctp:356
+msgid "If set, it will only fetch data from the given event ID."
+msgstr ""
+
+#: View/Events/automation.ctp:188
+#: View/Events/legacy_automation.ctp:357
+msgid "Upload malware samples using the \"Upload Sample\" API"
+msgstr ""
+
+#: View/Events/automation.ctp:190
+#: View/Events/legacy_automation.ctp:359
+msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
+msgstr ""
+
+#: View/Events/automation.ctp:191
+#: View/Events/legacy_automation.ctp:360
+msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:192
+#: View/Events/legacy_automation.ctp:361
+msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
+msgstr ""
+
+#: View/Events/automation.ctp:193
+#: View/Events/legacy_automation.ctp:362
+msgid "The general structure of the expected objects is as follows"
+msgstr ""
+
+#: View/Events/automation.ctp:202
+#: View/Events/legacy_automation.ctp:371
+msgid "The following optional parameters are expected"
+msgstr ""
+
+#: View/Events/automation.ctp:203
+#: View/Events/legacy_automation.ctp:372
+msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
+msgstr ""
+
+#: View/Events/automation.ctp:204
+#: View/Events/legacy_automation.ctp:373
+msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
+msgstr ""
+
+#: View/Events/automation.ctp:205
+#: View/Events/legacy_automation.ctp:374
+msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
+msgstr ""
+
+#: View/Events/automation.ctp:206
+#: View/Events/legacy_automation.ctp:375
+msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
+msgstr ""
+
+#: View/Events/automation.ctp:207
+#: View/Events/legacy_automation.ctp:376
+msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
+msgstr ""
+
+#: View/Events/automation.ctp:208
+#: View/Events/legacy_automation.ctp:377
+msgid "The analysis level of the newly created event, if applicable. [0-2]"
+msgstr ""
+
+#: View/Events/automation.ctp:209
+#: View/Events/legacy_automation.ctp:378
+msgid "The threat level ID of the newly created event, if applicable. [0-3]"
+msgstr ""
+
+#: View/Events/automation.ctp:210
+#: View/Events/legacy_automation.ctp:379
+msgid "This will populate the comment field of any attribute created using this API."
+msgstr ""
+
+#: View/Events/automation.ctp:211
+#: View/Events/legacy_automation.ctp:380
+msgid "Add or remove tags from events"
+msgstr ""
+
+#: View/Events/automation.ctp:212
+#: View/Events/legacy_automation.ctp:381
+msgid "You can add or remove an existing tag from an event in the following way"
+msgstr ""
+
+#: View/Events/automation.ctp:215
+#: View/Events/legacy_automation.ctp:384
+msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
+msgstr ""
+
+#: View/Events/automation.ctp:217
+#: View/Events/legacy_automation.ctp:386
+msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
+msgstr ""
+
+#: View/Events/automation.ctp:219
+#: View/Events/legacy_automation.ctp:388
+msgid "Proposals and the API"
+msgstr ""
+
+#: View/Events/automation.ctp:220
+#: View/Events/legacy_automation.ctp:389
+msgid "You can interact with the proposals via the API directly since version 2.3.148"
+msgstr ""
+
+#: View/Events/automation.ctp:224
+#: View/Events/legacy_automation.ctp:393
+msgid "HTTP"
+msgstr ""
+
+#: View/Events/automation.ctp:225
+#: View/Events/legacy_automation.ctp:394
+#: View/Pages/doc/using_the_system.ctp:445
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
+msgid "URL"
+msgstr ""
+
+#: View/Events/automation.ctp:226
+#: View/Events/legacy_automation.ctp:395
+msgid "Explanation"
+msgstr ""
+
+#: View/Events/automation.ctp:227
+#: View/Events/legacy_automation.ctp:396
+msgid "Expected Payload"
+msgstr ""
+
+#: View/Events/automation.ctp:228
+#: View/Events/legacy_automation.ctp:397
+#: View/Servers/rest.ctp:115
+msgid "Response"
+msgstr ""
+
+#: View/Events/automation.ctp:233
+#: View/Events/legacy_automation.ctp:402
+msgid "View a proposal"
+msgstr ""
+
+#: View/Events/automation.ctp:235;255;256;262;263
+#: View/Events/legacy_automation.ctp:404;424;425;431;432
+msgid "ShadowAttribute object"
+msgstr ""
+
+#: View/Events/automation.ctp:240
+#: View/Events/legacy_automation.ctp:409
+msgid "View all proposal of my org's events"
+msgstr ""
+
+#: View/Events/automation.ctp:242;249
+#: View/Events/legacy_automation.ctp:411;418
+msgid "ShadowAttribute objects"
+msgstr ""
+
+#: View/Events/automation.ctp:247
+#: View/Events/legacy_automation.ctp:416
+msgid "View all proposals of an event"
+msgstr ""
+
+#: View/Events/automation.ctp:254
+#: View/Events/legacy_automation.ctp:423
+msgid "Propose a new attribute to an event"
+msgstr ""
+
+#: View/Events/automation.ctp:261
+#: View/Events/legacy_automation.ctp:430
+msgid "Propose an edit to an attribute"
+msgstr ""
+
+#: View/Events/automation.ctp:268
+#: View/Events/legacy_automation.ctp:437
+msgid "Accept a proposal"
+msgstr ""
+
+#: View/Events/automation.ctp:270;277
+#: View/Events/legacy_automation.ctp:439;446
+#: View/Noticelists/view.ctp:44
+#: View/Pages/doc/administration.ctp:226;242
+#: View/Pages/doc/using_the_system.ctp:254
+msgid "Message"
+msgstr ""
+
+#: View/Events/automation.ctp:275
+#: View/Events/legacy_automation.ctp:444
+msgid "Discard a proposal"
+msgstr ""
+
+#: View/Events/automation.ctp:280
+#: View/Events/legacy_automation.ctp:449
+msgid "When posting a shadow attribute object, use the following formats"
+msgstr ""
+
+#: View/Events/automation.ctp:285
+#: View/Events/legacy_automation.ctp:454
+msgid "None of the above fields are mandatory, but at least one of them has to be provided."
+msgstr ""
+
+#: View/Events/automation.ctp:287
+#: View/Events/legacy_automation.ctp:456
+msgid "Filtering event metadata"
+msgstr ""
+
+#: View/Events/automation.ctp:288
+#: View/Events/legacy_automation.ctp:457
+msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
+msgstr ""
+
+#: View/Events/automation.ctp:292
+#: View/Events/legacy_automation.ctp:461
+msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
+"    An example for a valid lookup"
+msgstr ""
+
+#: View/Events/automation.ctp:303
+#: View/Events/legacy_automation.ctp:472
+msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
+msgstr ""
+
+#: View/Events/automation.ctp:304
+#: View/Events/legacy_automation.ctp:473
+msgid "The list of valid parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:305
+#: View/Events/legacy_automation.ctp:474
+msgid "Filters on published or unpublished events [0,1] - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:306
+#: View/Events/legacy_automation.ctp:475
+msgid "Filters on strings found in the event info - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:307
+#: View/Events/legacy_automation.ctp:476
+msgid "Filters on attached tag names - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:308
+#: View/Events/legacy_automation.ctp:477
+msgid "Filters on specific event IDs - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:309
+#: View/Events/legacy_automation.ctp:478
+msgid "Filters on a given event threat level [1,2,3,4] - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:310
+#: View/Events/legacy_automation.ctp:479
+msgid "Filters on the distribution level [0,1,2,3] - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:311
+#: View/Events/legacy_automation.ctp:480
+msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:312
+#: View/Events/legacy_automation.ctp:481
+msgid "Filters on a contained attribute value - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:313
+#: View/Events/legacy_automation.ctp:482
+msgid "Filters on the creator organisation - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:314
+#: View/Events/legacy_automation.ctp:483
+msgid "Filters on the creator user's email address (admin only) - negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:315
+#: View/Events/legacy_automation.ctp:484
+msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:316
+#: View/Events/legacy_automation.ctp:485
+msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
+msgstr ""
+
+#: View/Events/automation.ctp:319
+msgid "Freetext Import API"
+msgstr ""
+
+#: View/Events/automation.ctp:321
+msgid "The freetext import tool is also exposed to the API."
+msgstr ""
+
+#: View/Events/automation.ctp:322
+msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
+msgstr ""
+
+#: View/Events/automation.ctp:323
+msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
+msgstr ""
+
+#: View/Events/automation.ctp:324
+msgid "The contents of the POST body should be the text to be parsed."
+msgstr ""
+
+#: View/Events/contact.ctp:8
+msgid "Contact organization reporting event "
+msgstr ""
+
+#: View/Events/contact.ctp:9
+msgid "You are about to contact the organization that reported event %s.<br/>\n"
+"                Feel free to add a custom message that will be sent to the reporting organization. <br/>\n"
+"                Your email address and details about the event will be added automagically to the message."
+msgstr ""
+
+#: View/Events/contact.ctp:21
+msgid "Submit only to the person that created the event"
+msgstr ""
+
+#: View/Events/export.ctp:3
+#: View/Events/export_alternate.ctp:3
+msgid "Export functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"        Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artifacts. Support for more attribute types is planned."
+msgstr ""
+
+#: View/Events/export.ctp:6
+#: View/Events/export_alternate.ctp:6
+msgid "Simply click on any of the following buttons to download the appropriate data."
+msgstr ""
+
+#: View/Events/export.ctp:26
+#: View/Pages/doc/using_the_system.ctp:378
+msgid "Last Update"
+msgstr ""
+
+#: View/Events/export.ctp:28
+#: View/Pages/doc/using_the_system.ctp:380
+msgid "Outdated"
+msgstr ""
+
+#: View/Events/export.ctp:29
+msgid "Filesize"
+msgstr ""
+
+#: View/Events/export.ctp:30
+#: View/Pages/doc/administration.ctp:230
+#: View/Pages/doc/using_the_system.ctp:381
+msgid "Progress"
+msgstr ""
+
+#: View/Events/export.ctp:43
+msgid "Attachments are enabled on this instance"
+msgstr ""
+
+#: View/Events/export.ctp:47
+msgid "Attachments are disabled on this instance"
+msgstr ""
+
+#: View/Events/export.ctp:81
+msgid "Loading…"
+msgstr ""
+
+#: View/Events/export.ctp:100;104
+msgid "Generate"
+msgstr ""
+
+#: View/Events/export.ctp:158
+msgid "Warning, the background worker is not responding!"
+msgstr ""
+
+#: View/Events/export.ctp:172
+msgid "0 seconds ago"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:10
+msgid "Download all as XML"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:12
+msgid "Click this to download all events and attributes that you have access to <small>(except file attachments)</small> in a custom XML format."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:17
+msgid "Download all signatures as CSV"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:19
+msgid "Click this to download all attributes that are indicators and that you have access to <small>(except file attachments)</small> in CSV format."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:24
+msgid "Download all as CSV"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:26
+msgid "Click this to download all attributes that you have access to <small>(except file attachments)</small> in CSV format."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:31
+msgid "Download Suricata signatures"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:32
+msgid "Download Snort signatures"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:34
+msgid "Click these to download all network related attributes that you\n"
+"                        have access to under the Suricata or Snort rule format. Only <em>published</em>\n"
+"                        events and attributes marked as <em>IDS Signature</em> are exported.\n"
+"                        Administration is able to maintain a whitelist containing host,\n"
+"                        domain name and IP numbers to exclude from the NIDS export."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:43
+msgid "Download Bro signatures"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:45
+msgid "Click these to download all network related attributes that you\n"
+"                have access to under the Bro rule format. Only <em>published</em>\n"
+"                events and attributes marked as <em>IDS Signature</em> are exported.\n"
+"                Administration is able to maintain a whitelist containing host,\n"
+"                domain name and IP numbers to exclude from the NIDS export."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:54
+msgid "Download RPZ Zone File"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:56
+msgid "Click this to download an RPZ Zone file generated from all ip-src/ip-dst, hostname, domain attributes. This can be useful for DNS level firewalling. Only published events and attributes marked as IDS Signature are exported."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:61
+msgid "Download all MD5 hashes"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:62
+msgid "Download all SHA1 hashes"
+msgstr ""
+
+#: View/Events/export_alternate.ctp:64
+msgid "Click on one of these two buttons to download all MD5 or SHA1\n"
+"                        checksums contained in file-related attributes. This list can be\n"
+"                        used to feed forensic software when searching for susipicious files.\n"
+"                        Only <em>published</em> events and attributes marked as <em>IDS\n"
+"                            Signature</em> are exported."
+msgstr ""
+
+#: View/Events/export_alternate.ctp:72
+msgid "Click on one of these buttons to download all the attributes with the matching type. This list can be used to feed forensic software when searching for susipicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:4
+#: View/Servers/filter_event_index.ctp:4
+msgid "Filter Event Index"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:17;211
+msgid "OR"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:17;211
+msgid "NOT"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:25;112;179;180;205;207
+msgid "Any"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:32;188
+#: View/Pages/doc/using_the_system.ctp:68;173
+msgid "High"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:32;189
+#: View/Pages/doc/using_the_system.ctp:67;172
+msgid "Medium"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:32;191
+#: View/Pages/doc/using_the_system.ctp:174
+#: View/Users/statistics_sightings.ctp:21
+msgid "Undefined"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:39;194
+#: View/Pages/doc/using_the_system.ctp:72;180
+msgid "Initial"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:39;195
+#: View/Pages/doc/using_the_system.ctp:73;181
+msgid "Ongoing"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:39;196
+#: View/Jobs/index.ctp:9;136
+#: View/Pages/doc/using_the_system.ctp:74;182
+msgid "Completed"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:46;182
+msgid "Your organisation only"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:46;183
+msgid "This community only"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:46;184
+#: View/Pages/doc/using_the_system.ctp:51
+msgid "Connected communities"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:46;185
+#: View/Pages/doc/using_the_system.ctp:58
+msgid "All communities"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:133
+#: View/Feeds/index.ctp:103
+#: View/Users/admin_filter_user_index.ctp:70
+msgid "Target"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:145
+msgid "Delete filter"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:153
+#: View/Users/admin_filter_user_index.ctp:89
+msgid "No filters set - add filter terms above."
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:168
+#: View/Users/admin_filter_user_index.ctp:104
+msgid "Save this URL if you would like to use the same filter settings again"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:170
+#: View/Servers/filter_event_index.ctp:21
+#: View/Users/admin_filter_user_index.ctp:106
+msgid "Apply"
+msgstr ""
+
+#: View/Events/filter_event_index.ctp:179
+msgid "\"No\""
+msgstr ""
+
+#: View/Events/free_text_import.ctp:6
+#: View/Pages/doc/using_the_system.ctp:112
+msgid "Freetext Import Tool"
+msgstr ""
+
+#: View/Events/free_text_import.ctp:8
+msgid "Paste a list of IOCs into the field below for automatic detection."
+msgstr ""
+
+#: View/Events/get_event_info_by_id.ctp:5
+msgid "No matching events found."
+msgstr ""
+
+#: View/Events/get_event_info_by_id.ctp:6
+msgid "This will still allow you to store the UUID. It will extend the assigned event as soon as it is created / becomes visible."
+msgstr ""
+
+#: View/Events/import_module.ctp:89
+msgid "Input File"
+msgstr ""
+
+#: View/Events/index.ctp:2
+#: View/Events/ajax/index.ctp:3
+#: View/Organisations/view.ctp:66;67
+#: View/Users/statistics.ctp:11
+#: View/Users/statistics_data.ctp:14
+#: View/Users/statistics_orgs.ctp:33
+msgid "Events"
+msgstr ""
+
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
+msgstr ""
+
+#: View/Events/index.ctp:45
+msgid "Delete selected Events"
+msgstr ""
+
+#: View/Events/index.ctp:73
+msgid "My events only"
+msgstr ""
+
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr ""
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr ""
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr ""
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
+#: View/Tags/index.ctp:56
+#: View/Taxonomies/view.ctp:65
+msgid "Filter"
+msgstr ""
+
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:3
+msgid "Automation functionality is designed to automatically generate signatures for intrusion detection systems. To enable signature generation for a given attribute, Signature field of this attribute must be set to Yes.\n"
+"    Note that not all attribute types are applicable for signature generation, currently we only support NIDS signature generation for IP, domains, host names, user agents etc., and hash list generation for MD5/SHA1 values of file artefacts. Support for more attribute types is planned.\n"
+"    To to make this functionality available for automated tools an authentication key is used. This makes it easier for your tools to access the data without further form-based-authentication."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:6
+msgid "Make sure you keep that key secret as it gives access to the entire database !"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:10
+msgid "Since version 2.2 the usage of the authentication key in the URL is deprecated. Instead, pass the auth key in an Authorization header in the request. The legacy option of having the auth key in the URL is temporarily still supported but not recommended."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:11
+msgid "Please use the use the following header"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:12
+msgid "Authorization"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:13
+msgid "XML Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:14
+msgid "An automatic export of all events and attributes <small>(except file attachments)</small> is available under a custom XML format."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:15;47;76
+msgid "You can configure your tools to automatically download the following file"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:17
+msgid "If you only want to fetch a specific event append the eventid number"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:19;144
+msgid "You can post an XML or JSON object containing additional parameters in the following formats"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:26
+msgid "The xml download also accepts two additional the following optional parameters in the URL"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:29;52;85
+msgid "Restrict the download to a single event"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:30
+msgid "A boolean field that determines whether attachments should be encoded and a second parameter that controls the eligible tags."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:31;54;87;112;134
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:43
+msgid "Also check out the %s to read about the REST API."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:45
+msgid "CSV Export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:46
+msgid "An automatic export of attributes is available as CSV. Only attributes that are flagged \"to_ids\" will get exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:49
+msgid "You can specify additional flags for CSV exports as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:53
+msgid "Setting this flag to true will include attributes that are not marked \"to_ids\"."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:58
+msgid "For example, to only download a csv generated of the \"domain\" type and the \"Network activity\" category attributes all events except for the one and further restricting it to events that are tagged \"tag1\" or \"tag2\" but not \"tag3\", only allowing attributes that are IDS flagged use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:63
+msgid "Include the event data with each attribute."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:66
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m).This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:67
+msgid "The CSV created when this setting is set to true will not contain the header row.\n"
+"    <b>enforceWarninglist</b>: All attributes that have a hit on a warninglist will be excluded."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:71
+msgid "To export the attributes of all events that are of the type \"domain\", use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:74
+msgid "NIDS rules export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:75
+msgid "Automatic export of all network related attributes is available under the Snort rule format. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:81
+msgid "The full API syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:84
+msgid "The export format, can be \"suricata\" or \"snort\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:86
+msgid "Some commented out explanation framing the data. The reason to disable this would be if you would like to concatenate a list of exports from various select events in order to avoid unnecessary duplication of the comments."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:93
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 6d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:94
+msgid "Restrict the export to only use the given types."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:96
+msgid "All tags will be included even if not exportable."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:98
+msgid "An example for a suricata export for all events excluding those tagged tag1, without all of the commented information at the start of the file would look like this:"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:100
+msgid "Administration is able to maintain a white-list containing host, domain name and IP numbers to exclude from the NIDS export."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:102
+msgid "Hash database export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:103
+msgid "Automatic export of MD5/SHA1 checksums contained in file-related attributes. This list can be used to feed forensic software when searching for suspicious files. Only <em>published</em> events and attributes marked as <em>IDS Signature</em> are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:104;188
+msgid "You can configure your tools to automatically download the following files"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:109
+msgid "The API's full format is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:111
+msgid "The export format, can be \"md5\" or \"sha1\""
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:123
+msgid "For example, to only show sha1 values from events tagged tag1, use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:126
+msgid "STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:127
+msgid "You can export MISP events in Mitre's STIX format (to read more about STIX, click <a href=\"https://stix.mitre.org/\">here</a>). The STIX XML export is currently very slow and can lead to timeouts with larger events or collections of events. The JSON return format does not suffer from this issue. Usage"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:129
+msgid "Search parameters can be passed to the function via URL parameters or by POSTing an XML or JSON object (depending on the return type). The following parameters can be passed to the STIX export tool: <code>id</code>, <code>withAttachments</code>, <code>tags</code>. Both <code>id</code> and <code>tags</code> can use the <code>&amp;&amp;</code> (and) and <code>!</code> (not) operators to build queries. Using the URL parameters, the syntax is as follows"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:132;171
+msgid "The event's ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:133
+msgid "Encode attachments where applicable"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:151
+msgid "Various ways to narrow down the search results of the STIX export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:152
+msgid "For example, to retrieve all events tagged \"APT1\" but excluding events tagged \"OSINT\" and excluding events #51 and #62 without any attachments"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:154
+msgid "To export the same events using a POST request use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:156
+msgid "Together with this JSON object in the POST message"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:158
+msgid "XML is automagically assumed when using the stix export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:160
+msgid "The same search could be accomplished using the following POSTed XML object (note that ampersands need to be escaped, or alternatively separate id and tag elements can be used)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:163
+msgid "RPZ export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:165
+msgid "It is possible to further restrict the exported values using the following filters"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:167
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"            You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search when passed through the url.\n"
+"        "
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:170
+msgid "Use semicolons instead (the search will automatically search for colons instead)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:172
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:173
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-03)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:186
+msgid "Text export"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:187
+msgid ">An export of all attributes of a specific type to a plain text file. By default only published and IDS flagged attributes are exported."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:194
+msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip-src values from events tagged tag1 but not tag2 use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:197
+msgid "As of version 2.3.38, it is possible to restrict the text exports on two additional flags. The first allows the user to restrict based on event ID, whilst the second is a boolean switch allowing non IDS flagged attributes to be exported. Additionally, choosing \"all\" in the type field will return all eligible attributes."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:201
+msgid "Only export the attributes of the given event ID"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:202
+msgid "Include attributes that are not marked to_ids, even if they would normally be excluded. Also overrides the whitelist functionality."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:207
+msgid "Include not published Events."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:208;275
+msgid "You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
+"    Use semicolons instead (the search will automatically search for colons instead). For example, to include tag1 and tag2 but exclude tag3 you would use"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:263
+msgid "Searches with JSON/XML/OpenIOC results"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:267
+msgid "Set the return format of the search (Currently supported: json, xml, openioc - more formats coming soon)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:272
+msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
+"    To filter on several values for the same parameter, simply use arrays, such as in the following example"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:291
+msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:296
+msgid "To just return a list of attributes, use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:304
+msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:305
+msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15)"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:312
+msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:322
+msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:324
+msgid "value, type, category and org are optional. It is possible to search for several terms in each category by joining them with the '&amp;&amp;' operator. It is also possible to negate a term with the '!' operator. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead).\n"
+"    For example, in order to search for all attributes created by your organisation that contain 192.168 or 127.0 but not 0.1 and are of the type ip-src, excluding the events that were tagged tag1 use the following syntax"
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:327
+msgid "You can also use search for IP addresses using CIDR. Make sure that you use '|' (pipe) instead of '/' (slashes). Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). See below for an example"
+msgstr ""
+
+#: View/Events/merge.ctp:4
+msgid "Merge events"
+msgstr ""
+
+#: View/Events/merge.ctp:9
+msgid "Event id to copy the attributes from"
+msgstr ""
+
+#: View/Events/merge.ctp:20
+msgid "copy only IDS attributes"
+msgstr ""
+
+#: View/Events/proposal_event_index.ctp:2
+msgid "Event with proposals"
+msgstr ""
+
+#: View/Events/proposal_event_index.ctp:24
+#: View/Pages/doc/concepts.ctp:28
+#: View/ShadowAttributes/index.ctp:2
+msgid "Proposals"
+msgstr ""
+
+#: View/Events/proposal_event_index.ctp:25
+#: View/Events/view.ctp:106
+#: View/Pages/doc/using_the_system.ctp:206
+msgid "Contributors"
+msgstr ""
+
+#: View/Events/proposal_event_index.ctp:27
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
+#: View/Logs/admin_search.ctp:6
+#: View/Pages/doc/administration.ctp:87;104;116;181;195
+#: View/Pages/doc/using_the_system.ctp:166
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
+msgid "Email"
+msgstr ""
+
+#: View/Events/report_validation_issues_events.ctp:2
+msgid "Listing invalid event validations"
+msgstr ""
+
+#: View/Events/report_validation_issues_events.ctp:3
+msgid "Events analysed: %s"
+msgstr ""
+
+#: View/Events/report_validation_issues_events.ctp:7
+msgid "Validation errors for event: %s"
+msgstr ""
+
+#: View/Events/report_validation_issues_events.ctp:9
+msgid "Attribute details"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:4
+msgid "Below you can see the %s that are to be created. Make sure that the categories and the types are correct, often several options will be offered based on an inconclusive automatic resolution."
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:8
+msgid "Warning: You are missing warninglist(s) that are used to recognise TLDs. Make sure your MISP has the warninglist submodule enabled and updated or else this tool might end up missing valid domains/hostnames/urls. The missing lists are: %s"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:26
+msgid "Proposals instead of attributes"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:46
+msgid "Similar Attributes"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:51
+#: View/ObjectReferences/ajax/add.ctp:30
+#: View/Objects/add.ctp:61;100
+#: View/Objects/revise_object.ctp:37;48
+#: View/Pages/doc/using_the_system.ctp:234;284
+#: View/Templates/populate_event_from_template_attributes.ctp:9
+msgid "Comment"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:191
+msgid "Remove resolved attribute"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:208
+msgid "Submit %s"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:233
+msgid "Apply changes to all applicable resolved attributes"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:233;236
+msgid "Change all"
+msgstr ""
+
+#: View/Events/resolved_attributes.ctp:235
+msgid "Update all comment fields"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:2
+msgid ">Results of the import"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:3
+msgid "%s attributes created successfully, %s  indicators could not be mapped and saved."
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:7
+msgid "Successfully added attributes"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:10;32
+#: View/Feeds/preview_event.ctp:11
+#: View/Galaxies/view.ctp:18
+#: View/Organisations/ajax/merge.ctp:58
+#: View/Pages/doc/using_the_system.ctp:204
+#: View/Servers/preview_event.ctp:17
+msgid "Uuid"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:29
+msgid "Failed indicators"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:33
+msgid "Search term"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:34
+msgid "Content"
+msgstr ""
+
+#: View/Events/show_i_o_c_results.ctp:45
+msgid "Visualisation"
+msgstr ""
+
+#: View/Events/upload_analysis_file.ctp:6
+msgid "Import analysis file"
+msgstr ""
+
+#: View/Events/upload_analysis_file.ctp:61
+msgid "Create Objects"
+msgstr ""
+
+#: View/Events/upload_stix.ctp:6
+msgid "Import %s file"
+msgstr ""
+
+#: View/Events/upload_stix.ctp:9
+msgid "%s file"
+msgstr ""
+
+#: View/Events/upload_stix.ctp:24
+msgid "Include the original imported file as attachment"
+msgstr ""
+
+#: View/Events/view.ctp:53
+#: View/Servers/preview_event.ctp:12
+#: View/Sightings/ajax/list_sightings.ctp:9
+msgid "Event ID"
+msgstr ""
+
+#: View/Events/view.ctp:57
+msgid "Source Organisation"
+msgstr ""
+
+#: View/Events/view.ctp:66
+msgid "Member Organisation"
+msgstr ""
+
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
+msgid "Owner org"
+msgstr ""
+
+#: View/Events/view.ctp:135
+#: View/Feeds/preview_event.ctp:30
+#: View/Pages/doc/using_the_system.ctp:64;168;209
+#: View/Servers/preview_event.ctp:41
+msgid "Threat Level"
+msgstr ""
+
+#: View/Events/view.ctp:140
+#: View/Feeds/preview_event.ctp:37
+#: View/Pages/doc/using_the_system.ctp:70;177;210
+#: View/Servers/preview_event.ctp:48
+msgid "Analysis"
+msgstr ""
+
+#: View/Events/view.ctp:161
+#: View/Feeds/preview_event.ctp:42
+#: View/Pages/doc/using_the_system.ctp:185;212
+msgid "Info"
+msgstr ""
+
+#: View/Events/view.ctp:165
+#: View/Feeds/preview_event.ctp:55;60;65
+#: View/Pages/doc/using_the_system.ctp:160;213
+#: View/Servers/preview_event.ctp:78;88
+#: View/Servers/preview_index.ctp:112
+msgid "Published"
+msgstr ""
+
+#: View/Events/view.ctp:173
+msgid "#Attributes"
+msgstr ""
+
+#: View/Events/view.ctp:177
+msgid "First recorded change"
+msgstr ""
+
+#: View/Events/view.ctp:181
+msgid "Last change"
+msgstr ""
+
+#: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
+msgid "Extends"
+msgstr ""
+
+#: View/Events/view.ctp:210
+msgid "Extended by"
+msgstr ""
+
+#: View/Events/view.ctp:217
+msgid "extended"
+msgstr ""
+
+#: View/Events/view.ctp:217
+msgid "atomic"
+msgstr ""
+
+#: View/Events/view.ctp:265
+msgid "Delegation request"
+msgstr ""
+
+#: View/Events/view.ctp:277
+msgid "View request details"
+msgstr ""
+
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
+msgid "Disabled"
+msgstr ""
+
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
+#: View/Taxonomies/view.ctp:24
+msgid "Enabled"
+msgstr ""
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr ""
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "disable"
+msgstr ""
+
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr ""
+
+#: View/Events/view.ctp:328
+msgid "Show (%s more)"
+msgstr ""
+
+#: View/Events/view.ctp:386;415
+msgid "This event has "
+msgstr ""
+
+#: View/Events/view.ctp:387;416
+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:424
+msgid "Warning: Potential false positives"
+msgstr ""
+
+#: View/Events/view.ctp:440
+msgid "Toggle pivot graph"
+msgstr ""
+
+#: View/Events/view.ctp:440
+msgid "Pivots"
+msgstr ""
+
+#: View/Events/view.ctp:443
+msgid "Toggle galaxies"
+msgstr ""
+
+#: View/Events/view.ctp:443
+msgid "Galaxy"
+msgstr ""
+
+#: View/Events/view.ctp:446
+msgid "Toggle Event graph"
+msgstr ""
+
+#: View/Events/view.ctp:449
+msgid "Toggle Correlation graph"
+msgstr ""
+
+#: View/Events/view.ctp:449
+msgid "Correlation graph"
+msgstr ""
+
+#: View/Events/view.ctp:452
+msgid "Toggle ATT&CK matrix"
+msgstr ""
+
+#: View/Events/view.ctp:452
+msgid "ATT&CK matrix"
+msgstr ""
+
+#: View/Events/view.ctp:455
+msgid "Toggle attributes"
+msgstr ""
+
+#: View/Events/view.ctp:458
+msgid "Toggle discussions"
+msgstr ""
+
+#: View/Events/view.ctp:458
+msgid "Discussion"
+msgstr ""
+
+#: View/Events/view_graph.ctp:19
+msgid "Hover target"
+msgstr ""
+
+#: View/Events/view_graph.ctp:24
+msgid "Selected"
+msgstr ""
+
+#: View/Events/view_graph.ctp:29
+msgid "Expand"
+msgstr ""
+
+#: View/Events/ajax/enrich_event.ctp:4
+msgid "Select the enrichments you wish to run"
+msgstr ""
+
+#: View/Events/ajax/enrichmentChoice.ctp:7
+msgid "Choose the enrichment module that you wish to use for the expansion"
+msgstr ""
+
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:6
+msgid "Event Deletion"
+msgstr ""
+
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:9
+msgid "Are you sure you want to delete "
+msgstr ""
+
+#: View/Events/ajax/eventDeleteConfirmationForm.ctp:13
+msgid " Event #"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:6
+msgid "Publish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:8
+msgid "Unpublish Event%s"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:18
+msgid "Are you sure you wish to unpublish the event?"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:20
+msgid "Publish but do NOT send alert email? Only for minor changes!"
+msgstr ""
+
+#: View/Events/ajax/eventPublishConfirmationForm.ctp:26
+#: View/Feeds/index.ctp:104
+#: View/Pages/doc/using_the_system.ctp:190
+#: View/Servers/ajax/update.ctp:11
+msgid "Publish"
+msgstr ""
+
+#: View/Events/ajax/exportChoice.ctp:2
+msgid "Choose the format that you wish to download the event in"
+msgstr ""
+
+#: View/Events/ajax/importChoice.ctp:2
+msgid "Choose the format that you would like to use for the import"
+msgstr ""
+
+#: View/Events/ajax/importChoice.ctp:7
+msgid "Import %s"
+msgstr ""
+
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "Toggle Correlation %s"
+msgstr ""
+
+#: View/Events/ajax/toggle_correlation.ctp:11
+msgid "Re-enable the correlation for this event. This will automatically re-correlate all contained attributes."
+msgstr ""
+
+#: View/Events/ajax/toggle_correlation.ctp:13
+msgid "This will remove all correlations that already exist for the event and prevent any events to be related via correlations as long as this setting is disabled. Make sure you understand the downsides of disabling correlations."
+msgstr ""
+
+#: View/Events/ajax/toggle_correlation.ctp:20
+msgid "Toggle correlation"
+msgstr ""
+
+#: View/Feeds/add.ctp:4
+msgid "Add MISP Feed"
+msgstr ""
+
+#: View/Feeds/add.ctp:5
+msgid "Add a new MISP feed source."
+msgstr ""
+
+#: View/Feeds/add.ctp:15
+#: View/Feeds/edit.ctp:15
+msgid "Feed name"
+msgstr ""
+
+#: View/Feeds/add.ctp:20
+#: View/Feeds/edit.ctp:20
+msgid "Name of the content provider"
+msgstr ""
+
+#: View/Feeds/add.ctp:24
+msgid "Input Source"
+msgstr ""
+
+#: View/Feeds/add.ctp:34
+#: View/Feeds/edit.ctp:60
+msgid "Remove input after ingestion"
+msgstr ""
+
+#: View/Feeds/add.ctp:42
+#: View/Feeds/edit.ctp:68
+msgid "URL of the feed"
+msgstr ""
+
+#: View/Feeds/add.ctp:46
+#: View/Feeds/edit.ctp:72
+msgid "Source Format"
+msgstr ""
+
+#: View/Feeds/add.ctp:55
+#: View/Feeds/edit.ctp:32
+msgid "Any headers to be passed with requests (for example: Authorization)"
+msgstr ""
+
+#: View/Feeds/add.ctp:59
+#: View/Feeds/edit.ctp:36
+msgid "Line break separated list of headers in the \"headername: value\" format"
+msgstr ""
+
+#: View/Feeds/add.ctp:63
+#: View/Feeds/edit.ctp:40
+msgid "Add Basic Auth"
+msgstr ""
+
+#: View/Feeds/add.ctp:67
+#: View/Feeds/edit.ctp:44
+msgid "Username"
+msgstr ""
+
+#: View/Feeds/add.ctp:71
+#: View/Feeds/edit.ctp:48
+#: View/Pages/doc/administration.ctp:88;117
+#: View/Users/admin_add.ctp:40
+#: View/Users/admin_edit.ctp:40
+#: View/Users/change_pw.ctp:9
+msgid "Password"
+msgstr ""
+
+#: View/Feeds/add.ctp:75
+#: View/Feeds/edit.ctp:52
+msgid "Add basic auth header"
+msgstr ""
+
+#: View/Feeds/add.ctp:82
+#: View/Feeds/edit.ctp:81
+msgid "Target Event"
+msgstr ""
+
+#: View/Feeds/add.ctp:92
+#: View/Feeds/edit.ctp:91
+msgid "Target Event ID"
+msgstr ""
+
+#: View/Feeds/add.ctp:94
+#: View/Feeds/edit.ctp:93
+msgid "Leave blank unless you want to reuse an existing event."
+msgstr ""
+
+#: View/Feeds/add.ctp:102
+#: View/Feeds/edit.ctp:101
+msgid "Value field(s) in the CSV"
+msgstr ""
+
+#: View/Feeds/add.ctp:103
+#: View/Feeds/edit.ctp:102
+msgid "Select one or several fields that should be parsed by the CSV parser and converted into MISP attributes"
+msgstr ""
+
+#: View/Feeds/add.ctp:105
+#: View/Feeds/edit.ctp:104
+msgid "2,3,4 (column position separated by commas)"
+msgstr ""
+
+#: View/Feeds/add.ctp:113
+#: View/Feeds/edit.ctp:112
+msgid "Delimiter"
+msgstr ""
+
+#: View/Feeds/add.ctp:114
+#: View/Feeds/edit.ctp:113
+msgid "Set the default CSV delimiter (default = \",\")"
+msgstr ""
+
+#: View/Feeds/add.ctp:125
+#: View/Feeds/edit.ctp:123
+msgid "Exclusion Regex"
+msgstr ""
+
+#: View/Feeds/add.ctp:126
+#: View/Feeds/edit.ctp:124
+msgid "Add a regex pattern for detecting iocs that should be skipped (this can be useful to exclude any references to the actual report / feed for example)"
+msgstr ""
+
+#: View/Feeds/add.ctp:128
+msgid "Regex pattern, for example: \"/^https://myfeedurl/i"
+msgstr ""
+
+#: View/Feeds/add.ctp:136
+#: View/Feeds/edit.ctp:134
+msgid "Auto Publish"
+msgstr ""
+
+#: View/Feeds/add.ctp:137
+msgid "Publish events directly after pulling the feed - if you would like to review the event before publishing uncheck this"
+msgstr ""
+
+#: View/Feeds/add.ctp:146
+#: View/Feeds/edit.ctp:143
+msgid "Override IDS Flag"
+msgstr ""
+
+#: View/Feeds/add.ctp:147
+#: View/Feeds/edit.ctp:144
+msgid "If checked, the IDS flags will always be set to off when pulling from this feed"
+msgstr ""
+
+#: View/Feeds/add.ctp:156
+#: View/Feeds/edit.ctp:153
+#: View/Feeds/index.ctp:105
+msgid "Delta Merge"
+msgstr ""
+
+#: View/Feeds/add.ctp:157
+#: View/Feeds/edit.ctp:154
+msgid "Merge attributes (only add new attributes, remove revoked attributes)"
+msgstr ""
+
+#: View/Feeds/add.ctp:185
+#: View/Feeds/edit.ctp:181
+msgid "Default Tag"
+msgstr ""
+
+#: View/Feeds/add.ctp:191
+#: View/Feeds/edit.ctp:186
+msgid "Filter rules"
+msgstr ""
+
+#: View/Feeds/add.ctp:192
+#: View/Feeds/edit.ctp:187
+msgid "Events with the following tags allowed"
+msgstr ""
+
+#: View/Feeds/add.ctp:193
+#: View/Feeds/edit.ctp:188
+msgid "Events with the following tags blocked"
+msgstr ""
+
+#: View/Feeds/add.ctp:194
+#: View/Feeds/edit.ctp:189
+msgid "Events with the following organisations allowed"
+msgstr ""
+
+#: View/Feeds/add.ctp:195
+#: View/Feeds/edit.ctp:190
+msgid "Events with the following organisations blocked"
+msgstr ""
+
+#: View/Feeds/add.ctp:196
+#: View/Feeds/edit.ctp:191
+#: View/Servers/add.ctp:102
+#: View/Servers/edit.ctp:147;153
+msgid "Modify"
+msgstr ""
+
+#: View/Feeds/compare_feeds.ctp:66
+msgid "None or less than 1% of the data of %s is contained in %s (%s matching values)"
+msgstr ""
+
+#: View/Feeds/compare_feeds.ctp:67
+msgid "%s\\% of the data of %s is contained in %s (%s matching values)"
+msgstr ""
+
+#: View/Feeds/edit.ctp:4
+msgid "Edit MISP Feed"
+msgstr ""
+
+#: View/Feeds/edit.ctp:5
+msgid "Edit a new MISP feed source."
+msgstr ""
+
+#: View/Feeds/edit.ctp:126
+msgid "Regex pattern, for example: \"/^https://myfeedurl/i\""
+msgstr ""
+
+#: View/Feeds/edit.ctp:206
+msgid "The base-url to the external server you want to sync with. Example: https://misppriv.circl.lu"
+msgstr ""
+
+#: View/Feeds/edit.ctp:207
+#: View/Servers/add.ctp:132
+#: View/Servers/edit.ctp:181
+msgid "A name that will make it clear to your users what this instance is. For example: Organisation A's instance"
+msgstr ""
+
+#: View/Feeds/edit.ctp:208
+#: View/Servers/add.ctp:133
+#: View/Servers/edit.ctp:180
+msgid "The organization having the external server you want to sync with. Example: BE"
+msgstr ""
+
+#: View/Feeds/edit.ctp:209
+#: View/Servers/add.ctp:134
+#: View/Servers/edit.ctp:182
+msgid "You can find the authentication key on your profile on the external server."
+msgstr ""
+
+#: View/Feeds/edit.ctp:210
+#: View/Servers/add.ctp:135
+#: View/Servers/edit.ctp:183
+msgid "Allow the upload of events and their attributes."
+msgstr ""
+
+#: View/Feeds/edit.ctp:211
+#: View/Servers/add.ctp:136
+#: View/Servers/edit.ctp:184
+msgid "Allow the download of events and their attributes from the server."
+msgstr ""
+
+#: View/Feeds/edit.ctp:212
+#: View/Servers/edit.ctp:185
+msgid "Unpublish new event (working with Push event)."
+msgstr ""
+
+#: View/Feeds/edit.ctp:213
+#: View/Servers/edit.ctp:186
+msgid "Publish new event without email (working with Pull event)."
+msgstr ""
+
+#: View/Feeds/edit.ctp:214
+#: View/Servers/edit.ctp:187
+msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority."
+msgstr ""
+
+#: View/Feeds/edit.ctp:215
+#: View/Servers/add.ctp:140
+#: View/Servers/edit.ctp:189
+msgid "Click this, if you would like to allow a connection despite the other instance using a self-signed certificate (not recommended)."
+msgstr ""
+
+#: View/Feeds/freetext_index.ctp:2
+msgid "Parsed attributes from feed "
+msgstr ""
+
+#: View/Feeds/freetext_index.ctp:7
+msgid "Fetch selected"
+msgstr ""
+
+#: View/Feeds/freetext_index.ctp:35
+msgid "Correlations"
+msgstr ""
+
+#: View/Feeds/import_feeds.ctp:4
+msgid "Paste feed data"
+msgstr ""
+
+#: View/Feeds/import_feeds.ctp:5
+msgid "Paste a MISP feed metadata JSON below to add feeds."
+msgstr ""
+
+#: View/Feeds/import_feeds.ctp:10
+msgid "Feed metadata JSON"
+msgstr ""
+
+#: View/Feeds/index.ctp:2
+msgid "Feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:3
+msgid "Generate feed lookup caches or fetch feed data (enabled feeds only)"
+msgstr ""
+
+#: View/Feeds/index.ctp:5
+msgid "Cache all feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:6
+msgid "Cache freetext/CSV feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:7
+msgid "Cache MISP feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:8
+msgid "Fetch and store all feed data"
+msgstr ""
+
+#: View/Feeds/index.ctp:33
+msgid "Enable selected"
+msgstr ""
+
+#: View/Feeds/index.ctp:39
+msgid "Disable selected"
+msgstr ""
+
+#: View/Feeds/index.ctp:45
+msgid "Enable caching for selected"
+msgstr ""
+
+#: View/Feeds/index.ctp:51
+msgid "Disable caching for selected"
+msgstr ""
+
+#: View/Feeds/index.ctp:61
+msgid "Default feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:66
+msgid "Custom feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:71
+msgid "All feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:76
+msgid "Enabled feeds"
+msgstr ""
+
+#: View/Feeds/index.ctp:95
+msgid "Enable pulling the feed into your MISP as events/attributes."
+msgstr ""
+
+#: View/Feeds/index.ctp:96
+msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
+msgstr ""
+
+#: View/Feeds/index.ctp:98
+msgid "Feed Format"
+msgstr ""
+
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
+#: View/Pages/doc/administration.ctp:225
+msgid "Input"
+msgstr ""
+
+#: View/Feeds/index.ctp:106
+msgid "Override IDS"
+msgstr ""
+
+#: View/Feeds/index.ctp:110
+msgid "Caching"
+msgstr ""
+
+#: View/Feeds/index.ctp:158
+#: View/Servers/index.ctp:74;75
+msgid "Rules"
+msgstr ""
+
+#: View/Feeds/index.ctp:185
+msgid "Error: Invalid event!"
+msgstr ""
+
+#: View/Feeds/index.ctp:190
+msgid "Fixed event %s"
+msgstr ""
+
+#: View/Feeds/index.ctp:193
+msgid "New fixed event"
+msgstr ""
+
+#: View/Feeds/index.ctp:245
+#: View/Servers/index.ctp:94
+msgid "Age: "
+msgstr ""
+
+#: View/Feeds/index.ctp:247
+#: View/Servers/index.ctp:102
+msgid "Not cached"
+msgstr ""
+
+#: View/Feeds/index.ctp:258
+msgid "Explore the events remotely"
+msgstr ""
+
+#: View/Feeds/index.ctp:260
+msgid "Fetch all events"
+msgstr ""
+
+#: View/Feeds/index.ctp:265
+msgid "Are you sure you want to permanently remove the feed (%s)?"
+msgstr ""
+
+#: View/Feeds/index.ctp:267
+msgid "Download feed metadata as JSON"
+msgstr ""
+
+#: View/Feeds/preview_event.ctp:6
+msgid "You are currently viewing an event from a feed (%s by %s)"
+msgstr ""
+
+#: View/Feeds/preview_index.ctp:2
+msgid "You are currently viewing the event index of a feed (%s by %s)."
+msgstr ""
+
+#: View/Galaxies/view.ctp:12
+msgid "Galaxy ID"
+msgstr ""
+
+#: View/Galaxies/view.ctp:16
+#: View/Taxonomies/view.ctp:9
+msgid "Namespace"
+msgstr ""
+
+#: View/Galaxies/view.ctp:22
+#: View/ObjectTemplates/view.ctp:7
+#: View/Taxonomies/view.ctp:19
+#: View/Warninglists/view.ctp:12
+msgid "Version"
+msgstr ""
+
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
+msgid "Galaxy Cluster Deletion"
+msgstr ""
+
+#: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies."
+msgstr ""
+
+#: View/GalaxyClusters/ajax/index.ctp:82
+msgid "Delete galaxy cluster"
+msgstr ""
+
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
+msgstr ""
+
+#: View/Jobs/index.ctp:12
+msgid "Are you sure you want to purge all completed job entries? Job entries are considered as log entries and have no impact on actual job execution."
+msgstr ""
+
+#: View/Jobs/index.ctp:18
+msgid "Are you sure you want to purge all job entries? Job entries are considered as log entries and have no impact on actual job execution."
+msgstr ""
+
+#: View/Jobs/index.ctp:52
+msgid "Completed."
+msgstr ""
+
+#: View/Jobs/index.ctp:68;98
+msgid "Show all queues"
+msgstr ""
+
+#: View/Jobs/index.ctp:74;99
+msgid "Show default queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:99
+#: View/Roles/admin_index.ctp:22
+#: View/Roles/index.ctp:22
+msgid "Default"
+msgstr ""
+
+#: View/Jobs/index.ctp:101
+msgid "Cache"
+msgstr ""
+
+#: View/Jobs/index.ctp:127
+msgid "No worker active"
+msgstr ""
+
+#: View/Jobs/index.ctp:159
+msgid "View stacktrace"
+msgstr ""
+
+#: View/Jobs/ajax/error.ctp:2
+msgid "Background Job Error Browser"
+msgstr ""
+
+#: View/Jobs/ajax/error.ctp:21
+msgid "Click to show stack trace"
+msgstr ""
+
+#: View/Jobs/ajax/error.ctp:22
+msgid "Click to hide stack trace"
+msgstr ""
+
+#: View/Jobs/ajax/error.ctp:29
+msgid "No error data found. Generally job error data is purged from Redis after 24 hours, however, you can still view the errors in the log files in \"/app/tmp/logs\"."
+msgstr ""
+
+#: View/Logs/admin_index.ctp:2
+#: View/Logs/event_index.ctp:6
+msgid "Logs"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:5
+msgid "Results for all log entries"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:8
+msgid "for user"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:9
+msgid "of organisation"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:10
+msgid "for model"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:11
+msgid "for model ID"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:12
+msgid "of type"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:13
+msgid "with the title"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:14
+msgid "including the change"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:15
+msgid "from IP"
+msgstr ""
+
+#: View/Logs/admin_index.ctp:75
+#: View/Logs/admin_search.ctp:14
+msgid "Model ID"
+msgstr ""
+
+#: View/Logs/admin_search.ctp:8
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
+#: View/Sightings/ajax/list_sightings.ctp:6
+#: View/Templates/view.ctp:33
+#: View/Users/admin_add.ctp:51
+#: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
+msgid "Organisation"
+msgstr ""
+
+#: View/Logs/admin_search.ctp:19
+#: View/Pages/doc/administration.ctp:185;198
+#: View/Pages/doc/using_the_system.ctp:271
+#: View/Threads/index.ctp:22
+msgid "Title"
+msgstr ""
+
+#: View/Logs/admin_search.ctp:21
+#: View/Pages/doc/administration.ctp:186;199
+msgid "Change"
+msgstr ""
+
+#: View/Logs/test_for_stolen_attributes.ctp:2
+msgid "Stolen attribute validation"
+msgstr ""
+
+#: View/Logs/test_for_stolen_attributes.ctp:6
+msgid "Nothing to see here, move along."
+msgstr ""
+
+#: View/Logs/test_for_stolen_attributes.ctp:9
+msgid "Attribute (%s) associated to events: %s"
+msgstr ""
+
+#: View/News/add.ctp:28
+#: View/News/edit.ctp:29
+msgid "Create anonymously"
+msgstr ""
+
+#: View/News/index.ctp:22
+msgid "Edit news message"
+msgstr ""
+
+#: View/News/index.ctp:24
+msgid "Are you sure you want to delete news item # %s?"
+msgstr ""
+
+#: View/News/index.ctp:47
+msgid "There are currently no news messages."
+msgstr ""
+
+#: View/Noticelists/index.ctp:2
+msgid "Noticelists"
+msgstr ""
+
+#: View/Noticelists/index.ctp:33
+msgid "ref"
+msgstr ""
+
+#: View/Noticelists/index.ctp:34
+msgid "geographical_area"
+msgstr ""
+
+#: View/Noticelists/index.ctp:35
+msgid "version"
+msgstr ""
+
+#: View/Noticelists/index.ctp:36
+#: View/Pages/doc/using_the_system.ctp:371
+msgid "enabled"
+msgstr ""
+
+#: View/Noticelists/ajax/delete_confirmation.ctp:9
+msgid "Noticelist Deletion"
+msgstr ""
+
+#: View/Noticelists/ajax/delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Noticelist #%s?"
+msgstr ""
+
+#: View/ObjectReferences/ajax/add.ctp:4
+msgid "Add Object Reference"
+msgstr ""
+
+#: View/ObjectReferences/ajax/add.ctp:10;17
+msgid "Relationship type"
+msgstr ""
+
+#: View/ObjectReferences/ajax/add.ctp:42
+msgid "Target UUID"
+msgstr ""
+
+#: View/ObjectReferences/ajax/add.ctp:54
+#: View/Objects/orphaned_object_diagnostics.ctp:38
+msgid "Object"
+msgstr ""
+
+#: View/ObjectReferences/ajax/add.ctp:120
+msgid "Target Details"
+msgstr ""
+
+#: View/ObjectReferences/ajax/delete.ctp:10
+msgid "Object reference Deletion"
+msgstr ""
+
+#: View/ObjectReferences/ajax/delete.ctp:14
+msgid "Are you sure you want to soft delete Object reference #%s?%s"
+msgstr ""
+
+#: View/ObjectReferences/ajax/delete.ctp:17
+msgid "Are you sure you want to hard delete Object reference #%s?%s"
+msgstr ""
+
+#: View/ObjectReferences/ajax/delete.ctp:25
+msgid " The Attribute will be permanently deleted and unrecoverable. Also, this will prevent the deletion to be propagated to other instances."
+msgstr ""
+
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:24
+#: View/Pages/doc/categories_and_types.ctp:40
+#: View/Pages/doc/md/categories_and_types.ctp:23
+msgid "Categories"
+msgstr ""
+
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:25
+msgid "Sane defaults"
+msgstr ""
+
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:26
+msgid "List of valid Values"
+msgstr ""
+
+#: View/ObjectTemplateElements/ajax/view_elements.ctp:27
+msgid "Disable correlation"
+msgstr ""
+
+#: View/ObjectTemplates/index.ctp:2
+msgid "Object Template index"
+msgstr ""
+
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
+msgid "Requirements"
+msgstr ""
+
+#: View/ObjectTemplates/index.ctp:118
+msgid "Are you sure you want to force an update for template # %s?"
+msgstr ""
+
+#: View/ObjectTemplates/index.ctp:119
+msgid "Are you sure you want to delete template # %s?"
+msgstr ""
+
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
+msgstr ""
+
+#: View/ObjectTemplates/view.ctp:33
+msgid " Object Template"
+msgstr ""
+
+#: View/Objects/add.ctp:6
+msgid " Object"
+msgstr ""
+
+#: View/Objects/add.ctp:9
+msgid "Object Template"
+msgstr ""
+
+#: View/Objects/add.ctp:37
+msgid "Meta category"
+msgstr ""
+
+#: View/Objects/add.ctp:79
+msgid "Warning, issues found with the template"
+msgstr ""
+
+#: View/Objects/add.ctp:92
+msgid "Save"
+msgstr ""
+
+#: View/Objects/add.ctp:93
+msgid "Name :: type"
+msgstr ""
+
+#: View/Objects/add.ctp:98
+msgid "Disable Correlation"
+msgstr ""
+
+#: View/Objects/add.ctp:150;161
+msgid "Warning: You are about to share data that is of a classified nature. Make sure that you are authorised to share this."
+msgstr ""
+
+#: View/Objects/add.ctp:178;188
+msgid "Enter value manually"
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:3
+msgid "Object reconstruction"
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:5
+msgid "Due to a bug prior to version 2.4.89, a condition could cause objects to be overwritten on a pull, leading to orphaned object attributes. This script reconstructs the missing objects if any exist."
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:6
+msgid " Please create a backup of your mysql database before executing the script."
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:9
+msgid "No unmapped data found, everything is working as expected."
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:16
+msgid "Unmapped Attributes"
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:17
+msgid "Keep in mind that some of the unmapped attributes can get reconstructed on a second pass of this script."
+msgstr ""
+
+#: View/Objects/orphaned_object_diagnostics.ctp:30
+msgid "Reconstructable objects"
+msgstr ""
+
+#: View/Objects/revise_object.ctp:2
+msgid "Object pre-save review"
+msgstr ""
+
+#: View/Objects/revise_object.ctp:3
+msgid "Make sure that the below Object reflects your expectation before submiting it."
+msgstr ""
+
+#: View/Objects/revise_object.ctp:47
+msgid "To IDS"
+msgstr ""
+
+#: View/Objects/ajax/delete.ctp:6
+msgid "Object Deletion"
+msgstr ""
+
+#: View/Objects/ajax/delete.ctp:12
+msgid "The Object will be permanently deleted and unrecoverable. Also, this will prevent the deletion to be propagated to other instances."
+msgstr ""
+
+#: View/Objects/ajax/delete.ctp:15
+msgid "Are you sure you want to %sdelete Object #%s? %s"
+msgstr ""
+
+#: View/OrgBlacklists/add.ctp:4
+msgid "Add Organisation Blacklist Entries"
+msgstr ""
+
+#: View/OrgBlacklists/add.ctp:5
+msgid "Simply paste a list of all the organisation UUIDs that you wish to block from being entered."
+msgstr ""
+
+#: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
+msgid "Organisation name"
+msgstr ""
+
+#: View/OrgBlacklists/add.ctp:17
+msgid "(Optional) The organisation name that the organisation is associated with"
+msgstr ""
+
+#: View/OrgBlacklists/index.ctp:2
+msgid "Organisation Blacklists"
+msgstr ""
+
+#: View/OrgBlacklists/index.ctp:37
+msgid "Are you sure you want to delete the blacklist entry for the organisation UUID %s?"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:4
+msgid "New Organisation"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:5
+#: View/Organisations/admin_edit.ctp:5
+msgid "If the organisation should have access to this instance, make sure that the Local organisation setting is checked. <br />If you would only like to add a known external organisation for inclusion in sharing groups, uncheck the Local organisation setting."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:7
+msgid "Local organisation"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:11
+msgid "Mandatory fields."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:15
+#: View/Organisations/admin_edit.ctp:14
+msgid "Organisation Identifier"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:15
+#: View/Organisations/admin_edit.ctp:14
+msgid "Brief organisation identifier"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:18
+#: View/Organisations/admin_edit.ctp:17
+msgid "No image uploaded for this identifier"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+msgid "Paste UUID or click generate"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:25
+#: View/Organisations/admin_edit.ctp:24
+msgid "Generate UUID"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:25
+#: View/Organisations/admin_edit.ctp:24
+msgid "Generate a new UUID for the organisation"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:27
+#: View/Organisations/admin_edit.ctp:38
+msgid "A brief description of the organisation"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:27
+#: View/Organisations/admin_edit.ctp:38
+msgid "A description of the organisation that is purely informational."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:30
+#: View/Organisations/admin_edit.ctp:41
+msgid "Bind user accounts to domains (line separated)"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:30
+#: View/Organisations/admin_edit.ctp:41
+msgid "Enter a (list of) domain name(s) to enforce when creating users."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:33
+#: View/Organisations/admin_edit.ctp:44
+msgid "The following fields are all optional."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:38
+#: View/Organisations/admin_edit.ctp:49
+msgid "Logo (48x48 png)"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:44
+#: View/Organisations/admin_edit.ctp:55
+msgid "For example \"financial\"."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:45
+#: View/Organisations/admin_edit.ctp:56
+msgid "Type of organisation"
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:45
+#: View/Organisations/admin_edit.ctp:56
+msgid "Freetext description of the org."
+msgstr ""
+
+#: View/Organisations/admin_add.ctp:46
+#: View/Organisations/admin_edit.ctp:57
+msgid "You can add some contact details for the organisation here, if applicable."
+msgstr ""
+
+#: View/Organisations/admin_edit.ctp:11
+msgid "Mandatory fields. Leave the UUID field empty if the organisation doesn't have a UUID from another instance."
+msgstr ""
+
+#: View/Organisations/admin_edit.ctp:30
+msgid "An organisation with the above uuid already exists. Would you like to merge this organisation into the existing one?"
+msgstr ""
+
+#: View/Organisations/admin_edit.ctp:32
+msgid "Click here"
+msgstr ""
+
+#: View/Organisations/index.ctp:5;67
+#: View/Users/statistics.ctp:46
+#: View/Users/statistics_data.ctp:57
+#: View/Users/statistics_orgs.ctp:13
+msgid "All organisations"
+msgstr ""
+
+#: View/Organisations/index.ctp:6
+msgid ", both local and remote"
+msgstr ""
+
+#: View/Organisations/index.ctp:9;62
+#: View/Users/statistics_orgs.ctp:12
+msgid "Known remote organisations"
+msgstr ""
+
+#: View/Organisations/index.ctp:10
+msgid " on other instances"
+msgstr ""
+
+#: View/Organisations/index.ctp:13;57
+#: View/Users/statistics_orgs.ctp:11
+msgid "Local organisations"
+msgstr ""
+
+#: View/Organisations/index.ctp:14
+msgid " having a presence on this instance"
+msgstr ""
+
+#: View/Organisations/index.ctp:25
+msgid "Paginate"
+msgstr ""
+
+#: View/Organisations/index.ctp:27
+msgid "View all"
+msgstr ""
+
+#: View/Organisations/index.ctp:86
+#: View/Users/login.ctp:8
+#: View/Users/statistics_orgs.ctp:30
+msgid "Logo"
+msgstr ""
+
+#: View/Organisations/index.ctp:97
+msgid "Added by"
+msgstr ""
+
+#: View/Organisations/index.ctp:138
+#: View/Posts/add.ctp:33
+msgid ""
+msgstr ""
+""
+
+#: View/Organisations/view.ctp:8
+msgid "Local or remote"
+msgstr ""
+
+#: View/Organisations/view.ctp:12
+#: View/SharingGroups/view.ctp:43
+msgid "Local"
+msgstr ""
+
+#: View/Organisations/view.ctp:12
+msgid "Remote"
+msgstr ""
+
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
+msgstr ""
+
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr ""
+
+#: View/Organisations/view.ctp:62;63
+msgid "Members"
+msgstr ""
+
+#: View/Organisations/ajax/fetch_orgs_for_sg.ctp:2
+msgid "Select organisations to add"
+msgstr ""
+
+#: View/Organisations/ajax/fetch_orgs_for_sg.ctp:7
+msgid "Available Organisations"
+msgstr ""
+
+#: View/Organisations/ajax/fetch_orgs_for_sg.ctp:21
+msgid "Added Organisations"
+msgstr ""
+
+#: View/Organisations/ajax/fetch_orgs_for_sg.ctp:26
+msgid "Submit organisations"
+msgstr ""
+
+#: View/Organisations/ajax/landingpage.ctp:2
+msgid "Landing page for %s"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:3
+msgid "This will remove the selected organisation and hand over all objects belonging to it to the target organisation. This process is irreversible. Are you sure you want to proceed?"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:6
+msgid "Warning: Merging an organisation into another will be transfer all users and data belonging to the organisation to another."
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:19
+msgid "Organisation type"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:33
+msgid "Target Local Organisation"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:45
+msgid "Target External Organisation"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:55
+msgid "Organisation to be merged"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:56;63
+#: View/Pages/doc/using_the_system.ctp:163;203
+msgid "ID"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:62
+msgid "Organisation to be merged into"
+msgstr ""
+
+#: View/Organisations/ajax/merge.ctp:70
+msgid "Merge"
+msgstr ""
+
+#: View/Organisations/ajax/sg_org_row_empty.ctp:10
+msgid "Mark organisation as sharing group extender"
+msgstr ""
+
+#: View/Pages/administration.ctp:10
+msgid "Administrative actions"
+msgstr ""
+
+#: View/Pages/administration.ctp:14
+msgid "Reset the attribute counts"
+msgstr ""
+
+#: View/Pages/administration.ctp:14
+msgid "Events need to have no validation issues"
+msgstr ""
+
+#: View/Pages/administration.ctp:15
+msgid "Recorrelate attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:16
+msgid "Recorrelate proposals"
+msgstr ""
+
+#: View/Pages/administration.ctp:18
+msgid "Verify Certificates"
+msgstr ""
+
+#: View/Pages/administration.ctp:18
+msgid "Check whether every user's certificate is usable"
+msgstr ""
+
+#: View/Pages/administration.ctp:19
+msgid "Extend Organization length"
+msgstr ""
+
+#: View/Pages/administration.ctp:19
+msgid "Hotfix 2.3.57: Increase the max length of the organization field when adding a new server connection."
+msgstr ""
+
+#: View/Pages/administration.ctp:20
+msgid "Convert log fields to text"
+msgstr ""
+
+#: View/Pages/administration.ctp:20
+msgid "Hotfix 2.3.78: Some of the log fields that were varchar(255) ended up truncating the data. This function will change them to \"text\""
+msgstr ""
+
+#: View/Pages/administration.ctp:21
+msgid "Fix duplicate UUIDs"
+msgstr ""
+
+#: View/Pages/administration.ctp:21
+msgid "Hotfix 2.3.107: it was previously possible to get duplicate attribute UUIDs in the database, this script will remove all duplicates and ensure that duplicates will not be entered into the database in the future."
+msgstr ""
+
+#: View/Pages/administration.ctp:22
+msgid "Remove duplicate events (with the same UUID)"
+msgstr ""
+
+#: View/Pages/administration.ctp:22
+msgid "Hotfix 2.3.115: In some rare situations it could occur that a duplicate of an event was created on an instance, with the exact same uuid. This action will remove any such duplicates and make sure that this cannot happen again."
+msgstr ""
+
+#: View/Pages/administration.ctp:23
+msgid "Prune orphaned attributes"
+msgstr ""
+
+#: View/Pages/administration.ctp:23
+msgid "In some rare occasions it can happen that you end up with some attributes in your database that do not belong to an event - for example during a race condition between an event insert and a delete. This tool will collect and delete any such orphaned attributes. If you ever run into an issue where you cannot add an attribute with a specific valid value, this is probably the reason."
+msgstr ""
+
+#: View/Pages/administration.ctp:24
+msgid "Clean regex table of potentially malicious entries"
+msgstr ""
+
+#: View/Pages/administration.ctp:24
+msgid "Hotfix 2.3.160: Prior to this version it was possible for a user/admin with Regex permission to create a malicious regular expression that could be used to execute arbitrary code. Since this version it is no longer possible to input such expressions, but already existing malicious entries still have to be cleaned using this tool."
+msgstr ""
+
+#: View/Pages/administration.ctp:25
+msgid "Remove URL type attribute sanitisation"
+msgstr ""
+
+#: View/Pages/administration.ctp:25
+msgid "Hotfix 2.3.173: Sanitised URLs can cause issues with the NIDS exports and as of this version attributes will be modified on entry to correct this. To correct existing entries, run this script."
+msgstr ""
+
+#: View/Pages/administration.ctp:26
+msgid "Index tables"
+msgstr ""
+
+#: View/Pages/administration.ctp:26
+msgid "This script will create indeces for all of the tables in MISP (other than primary keys)"
+msgstr ""
+
+#: View/Pages/administration.ctp:27
+msgid "Fix non-empty sharing group IDs"
+msgstr ""
+
+#: View/Pages/administration.ctp:27
+msgid "This script will change the sharing_group_id to 0 in all non sharing group setting events and attributes)"
+msgstr ""
+
+#: View/Pages/administration.ctp:29
+msgid "Upgrading a 2.3 instance to 2.4"
+msgstr ""
+
+#: View/Pages/administration.ctp:30
+msgid "Warning: Running this scripts below can result in the loss of data. Make sure that you back your database up before running them."
+msgstr ""
+
+#: View/Pages/administration.ctp:31
+msgid "The order for the 2.4 upgrade procedure is"
+msgstr ""
+
+#: View/Pages/administration.ctp:33
+msgid "%s - run this to migrate the 2.3 data to the 2.4 format"
+msgstr ""
+
+#: View/Pages/administration.ctp:33
+msgid "Upgrade to 2.4"
+msgstr ""
+
+#: View/Pages/administration.ctp:34
+msgid "If it completes successful, run the %s to remove the fields that are specific to 2.3. Make sure that the migration of the data to the 2.4 format was successful (you can check the result in the audit logs). If you have run the 2.4 upgrade script previously but are running into SQL errors on the column 'org', run this script."
+msgstr ""
+
+#: View/Pages/administration.ctp:34
+msgid "2.3->2.4 clean-up script"
+msgstr ""
+
+#: View/Pages/administration.ctp:34
+msgid "If the migration of your data from 2.4 is not complete this will lead to the loss of data. Backing your DB up is highly recommended. Are you ready to start removing the obsolete fields?"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:3
+#: View/Pages/doc/concepts.ctp:3
+#: View/Pages/doc/general.ctp:3
+#: View/Pages/doc/quickstart.ctp:3;14
+#: View/Pages/doc/user_management.ctp:3
+#: View/Pages/doc/using_the_system.ctp:3
+msgid "Quick Start"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:4
+#: View/Pages/doc/concepts.ctp:4
+#: View/Pages/doc/general.ctp:4;14
+#: View/Pages/doc/quickstart.ctp:4
+#: View/Pages/doc/user_management.ctp:4
+#: View/Pages/doc/using_the_system.ctp:4
+msgid "General Layout"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:5
+#: View/Pages/doc/concepts.ctp:5;14
+#: View/Pages/doc/general.ctp:5
+#: View/Pages/doc/quickstart.ctp:5
+#: View/Pages/doc/user_management.ctp:5
+#: View/Pages/doc/using_the_system.ctp:5
+msgid "General Concepts"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:6
+#: View/Pages/doc/concepts.ctp:6
+#: View/Pages/doc/general.ctp:6
+#: View/Pages/doc/quickstart.ctp:6
+#: View/Pages/doc/user_management.ctp:6
+#: View/Pages/doc/using_the_system.ctp:6
+msgid "User Management and Global actions"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:7
+#: View/Pages/doc/concepts.ctp:7
+#: View/Pages/doc/general.ctp:7
+#: View/Pages/doc/quickstart.ctp:7
+#: View/Pages/doc/user_management.ctp:13
+#: View/Pages/doc/using_the_system.ctp:7;26
+msgid "Using the system"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:10
+msgid "Settings and Diagnostics"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:11;171
+msgid "Blacklist"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:14
+msgid "User Management"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:15
+msgid "Role Management"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:16
+msgid "Logging"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:17;202
+#: View/Pages/doc/general.ctp:78
+msgid "Administrative Tools"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:18;205
+msgid "Background Processing"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:19
+msgid "FAQ"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:22
+#: View/Pages/doc/categories_and_types.ctp:3
+#: View/Pages/doc/concepts.ctp:9
+#: View/Pages/doc/general.ctp:9
+#: View/Pages/doc/quickstart.ctp:9
+#: View/Pages/doc/user_management.ctp:15
+#: View/Pages/doc/using_the_system.ctp:22
+msgid "Categories and Types"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:27
+msgid "Server settings and diagnostics"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:28
+msgid "Since version 2.3, MISP has a settings and diagnostics tool that allows site-admins to manage and diagnose their MISP installation. You can access this by navigating to Administration - Server settings"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:29
+msgid "Server settings overview with all of the tabs explained."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:30
+msgid "The settings and diagnostics tool is split up into several aspects, all accessible via the tabs on top of the tool. For any unset or incorrectly set setting, or failed diagnostic a number next to the tab name will indicate the number and severity of the issues. If the number is written with a red font, it means that the issue is critical. First, let's look at the various tabs"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:32
+msgid "General overview of the current state of your MISP installation"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:33
+msgid "MISP settings"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:33
+msgid "Basic MISP settings. This includes the way MISP handles the default settings for distribution settings, whether background jobs are enabled, etc"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:34
+msgid "GnuPG settings"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:34
+msgid "GnuPG related settings."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:35
+msgid "HTTP proxy related settings."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:36
+msgid "Security settings"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:36
+msgid "Settings controlling the brute-force protection and the application's salt key."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:37
+#: View/Servers/edit.ctp:82
+msgid "Misc settings"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:37
+msgid "You change the debug options here, but make sure that debug is always disabled on a production system."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:38
+msgid "The diagnostics tool checks if all directories that MISP uses to store data are writeable by the apache user. Also, the tool checks whether the STIX libraries and GnuPG are working as intended."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:39
+msgid "Shows the background workers (if enabled) and shows a warning if they are not running. Admins can also restart the workers here."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:40
+msgid "Download a report in JSON format, compiled of all of the settings visible in the tool."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:42
+msgid "The settings tabs explained."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:43
+msgid "Each of the setting pages is a table with each row representing a setting. Coloured rows indicate that the setting is incorrect / not set and the colour determines the severity (red = critical, yellow = recommended, green = optional). The columns are as follows"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:45
+msgid "The severity of the setting."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:46
+msgid "The setting name."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:47
+msgid "The current value of the setting."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:48
+msgid "A description of what the setting does."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:49
+msgid "If the setting is incorrect / not set, then this field will let the user know what is wrong."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:51
+msgid "The workers tab."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:52
+msgid "The workers tab shows a list of the workers that MISP can use. You can restart the workers using the restart all workers, If the button doesn't work, make sure that the workers were started using the apache user. This can however only be done using the command line, refer to the INSTALL.txt documentation on how to let the workers automatically start on each boot."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:54
+msgid "Worker Type"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:54
+msgid "The worker type is determined by the queue it monitors. MISP currently has 5 queues (cache, default, prio, email and a special _schdlr_ queue)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:55
+msgid "Worker Id"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:55
+msgid "The ID is made up of the machine name, the PID of the worker and the queue it monitors."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:56
+msgid "Displays OK if the worker is running. If the _schdlr_ worker is the only one not running make sure that you copy the config file into the cakeresque directory as described in the INSTALL.txt documentation."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:59
+msgid "Import Blacklist"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:60
+msgid "It is possible to ban certain values from ever being entered into the system via an event info field or an attribute value. This is done by blacklisting the value in this section."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:61;69
+msgid "Adding and modifying entries"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:62
+msgid "Administrators can add, edit or delete blacklisted items by using the appropriate functions in the list's action menu and the menu on the left."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:65
+msgid "The system allows administrators to set up rules for regular expressions that will automatically alter newly entered or imported events."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:66
+msgid "The purpose of Import Regexp entries"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:67
+msgid "They can be used for several things, such as unifying the capitalisation of file paths for more accurate event correlation or to automatically censor the usernames and use system path variable names (changing C:\\Users\\UserName\\Appdata\\Roaming\\file.exe to %APPDATA%\\file.exe).<br />\n"
+"        The second use is blocking, if a regular expression is entered with a blank replacement, any event info or attribute value containing the expression will not be added. Please make sure the entered regexp expression follows the preg_replace pattern rules as described <a href=\"http://php.net/manual/en/function.preg-replace.php\">here</a>."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:70
+msgid "Administrators can add, edit or delete regular expression rules, which are made up of a regex pattern that the system searches for and a replacement for the detected pattern."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:71
+msgid "Add, edit or remove Regexp entries that will affect all newly created attributes here."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:73
+msgid "Managing the Signature whitelist"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:74
+msgid "The signature whitelist view, accessible through the administration menu on the left, allows administrators to create and maintain a list of addresses that are whitelisted from ever being added to the NIDS signatures. Addresses listed here will be commented out when exporting the NIDS list."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:75
+msgid "Whitelisting an address"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:76
+msgid "While in the whitelist view, click on New Whitelist on the left to bring up the add whitelist view to add a new address."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:77
+msgid "Managing the list"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:78
+msgid "When viewing the list of whitelisted addresses, the following pieces of information are shown: The ID of the whitelist entry (assigned automatically when a new address is added), the address itself that is being whitelisted and a set of controls allowing you to delete the entry or edit the address."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:79
+msgid "You can edit or delete currently white-listed addresses using the action buttons on this list."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:81
+msgid "Managing the users"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:82
+msgid "As an admin, you can set up new accounts for users, edit the profiles of users, delete them, or just have a look at all the viewers' profiles. Organisation admins are restricted to executing the same actions on their organisation's users only."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:83
+msgid "Adding a new user"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:84;114
+msgid "To add a new user, click on the New User button in the administration menu to the left and fill out the following fields in the view that is loaded"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:85
+msgid "Add user"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:85
+msgid "Fill this form out to add a new user. Keep in mind that the drop-down menu titled Role controls the privileges the user will have."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:87;116
+msgid "The user's e-mail address, this will be used as his/her login name and as an address to send all the automatic e-mails and e-mails sent by contacting the user as the reporter of an event."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:88
+msgid "A temporary password for the user that he/she should change after the first login. Make sure that it is at least 6 characters long, includes a digit or a special character and contains at least one upper-case and at least one lower-case character."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:89;118
+msgid "Confirm Password"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:89;118
+msgid "This should be an exact copy of the Password field."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:90;119
+msgid "The organisation of the user. Entering ADMIN into this field will give administrator privileges to the user. If you are an organisation admin, then this field will be unchangeable and be set to your own organisation."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:91;120;170
+#: View/Roles/admin_index.ctp:2
+#: View/Roles/index.ctp:2
+msgid "Roles"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:91;120
+msgid "A drop-down list allows you to choose a role-group that the user should belong to. Roles define the privileges of the user. To learn more about roles, <a href=#roles>click here</a>."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:92;121
+#: View/Users/admin_add.ctp:76
+#: View/Users/admin_edit.ctp:71
+#: View/Users/edit.ctp:28
+msgid "Receive alerts when events are published"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:92
+msgid "This option will subscribe the new user to automatically generated e-mails whenever an event is published."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:93;122
+#: View/Users/admin_add.ctp:81
+#: View/Users/admin_edit.ctp:72
+#: View/Users/edit.ctp:29
+msgid "Receive alerts from \"contact reporter\" requests"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:93
+msgid "This option will subscribe the new user to e-mails that are generated when another user tries to get in touch with an event's reporting organisation that matches that of the new user."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:94;123
+#: View/Pages/doc/using_the_system.ctp:399
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
+msgid "Authkey"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:94
+msgid "This is assigned automatically and is the unique authentication key of the user (he/she will be able to reset this and receive a new key). It is used for exports and for connecting one server to another, but it requires the user to be assigned to a role that has auth permission enabled."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:95;124
+msgid "NIDS Sid"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:95;124
+msgid "Nids ID, not yet implemented."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:96;127
+msgid "GnuPGkey"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:96;127
+msgid "The key used for encrypting e-mails sent through the system."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:98
+msgid "Listing all users"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:99
+msgid "To list all current users of the system, just click on List Users under the administration menu to the left. A view will be loaded with a list of all users and the following columns of information"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:100
+msgid "List users"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:100
+msgid "View, Edit or Delete a user using the action buttons to the right."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:102
+msgid "The user's automatically assigned ID number."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:103
+msgid "The organisation that the user belongs to."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:104
+msgid "The e-mail address (and login name) of the user."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:105
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
+msgid "Autoalert"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:105
+msgid "Shows whether the user has subscribed to auto-alerts and is always receiving the mass-emails regarding newly published events that he/she is eligible for."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:106
+msgid "Shows whether the user has the subscription to contact reporter e-mails directed at his/her organisation turned on or off."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:107
+msgid "Shows whether the user has entered a GnuPGkey yet."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:108
+msgid "Shows the currently assigned NIDS ID."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:109;125
+msgid "Termsaccepted"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:109
+msgid "This flag indicates whether the user has accepted the terms of use or not."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:110
+#: View/Users/admin_view.ctp:84
+msgid "Newsread"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:110
+msgid "The last point in time when the user has looked at the news section of the system."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:111
+msgid "Action Buttons"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:111
+msgid "Here you can view a detailed view of a user, edit the basic details of a user (same view as the one used for creating a new user, but all the fields come filled out by default) or remove a user completely."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:113
+msgid "Editing a user"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:117
+msgid "It is possible to assign a new password manually for a user. For example, in case that he/she forgot the old one a new temporary one can be assigned. Make sure to check the \"Change password\" field if you do give out a temporary password, so that the user will be forced to change it after login."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:121
+msgid "This option will subscribe the user to automatically generated e-mails whenever an event is published."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:122
+msgid "This option will subscribe the user to e-mails that are generated when another user tries to get in touch with an event's reporting organisation that matches that of the user."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:123
+msgid "It is possible to request a new authentication key for the user."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:125
+msgid "Indicates whether the user has accepted the terms of use already or not."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:126
+msgid "Setting this flag will require the user to change password after the next login."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:129
+msgid "Contacting a user"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:130
+msgid "Site admins can use the \"Contact users\" feature to send all or an individual user an e-mail. Users that have a GnuPG key set will receive their e-mails encrypted. When clicking this button on the left, you'll be presented with a form that allows you to specify the type of the e-mail, who it should reach and what the content is using the following options"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:131
+msgid "Contact"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:131
+msgid "Contact your users here."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:133;184;197
+#: View/Pages/doc/using_the_system.ctp:269
+#: View/Taxonomies/view.ctp:89
+msgid "Action"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:133
+msgid "This defines the type of the e-mail, which can be a custom message or a password reset. Password resets automatically include a new temporary password at the bottom of the message and will automatically change the user's password accordingly."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:134
+msgid "Recipient"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:134
+msgid "The recipient toggle lets you contact all your users, a single user (which creates a second drop-down list with all the e-mail addresses of the users) and potential future users (which opens up a text field for the e-mail address and a text area field for a GnuPG public key)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:135;136
+#: View/Users/admin_email.ctp:24
+#: View/Users/admin_quick_email.ctp:15
+msgid "Subject"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:135;136
+msgid "In the case of a custom e-mail, you can enter a subject line here."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:137
+msgid "Custom message checkbox"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:137
+msgid "This is available for password resets, you can either write your own message (which will be appended with a temporary key and the signature), or let the system generate one automatically."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:139
+msgid "Keep in mind that all e-mails sent through this system will, in addition to your own message, will be signed in the name of the instance's host organisation's support team, will include the e-mail address of the instance's support (if the contact field is set in the bootstrap file), and will include the instance's GnuPG signature for users that have a GnuPG key set (and thus are eligible for an encrypted e-mail)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:141
+msgid "Managing the roles"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:142
+msgid "Privileges are assigned to users by assigning them to rule groups, which use one of four options determining what they can do with events and four additional privilege elevating settings. The four options for event manipulation are: Read Only, Manage My Own Events, Manage Organisation Events, Manage &amp; Publish Organisation Events. The extra privileges are admin, sync, authentication key usage and audit permission"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:144
+msgid "Read Only"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:144
+msgid "This allows the user to browse events that his organisation has access to, but doesn't allow any changes to be made to the database."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:145
+msgid "Manage My Own Events"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:145
+msgid "The second option, gives its users rights to create, modify or delete their own events, but they cannot publish them."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:146
+msgid "Manage Organization Events"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:146
+msgid "Allows users to create events or modify and delete events created by a member of their organisation."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:147
+msgid "Manage &amp; Publish Organisation Events"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:147
+msgid "This last setting, gives users the right to do all of the above and also to publish the events of their organisation."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:148
+msgid "Perm sync"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:148
+msgid "This setting allows the users of the role to be used as a synchronisation user. The authentication key of this user can be handed out to the administrator of a remote MISP instance to allow the synchronisation features to work."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:149
+msgid "Perm auth"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:149
+msgid "This setting enables the authentication key of the role's users to be used for rest requests."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:150
+msgid "Perm admin"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:150
+msgid "Gives the user limited administrator privileges, this setting is used for the organisation admins"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:151
+msgid "Perm site admin"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:151
+msgid "Gives the user full administrator privileges, this setting is used for the site admins."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:152
+msgid "Perm audit"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:152
+msgid "Grants access to the logs. With the exception of site admins, only logs generated by the user's own org are visible."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:153
+msgid "Perm regexp access"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:153
+msgid "Allows the users with this permission enabled to edit the regular expression table. Be careful when giving out this permission, incorrect regular expressions can be very harmful (infinite loops, loss of data, etc.)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:154
+msgid "Perm tagger"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:154
+msgid "Allows the user with this permission to create custom tags and assign them to events."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:156
+msgid "Creating roles"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:157
+msgid "When creating a new role, you will have to enter a name for the role to be created and set up the permissions (as described above) using the radio toggle and the four check-boxes."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:158
+msgid "Listing roles"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:159
+msgid "By clicking on the List Roles button, you can view a list of all the currently registered roles and a list of the permission flags turned on for each. In addition, you can find buttons that allow you to edit and delete the roles. Keep in mind that you will need to first remove every member from a role before you can delete it."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:160
+msgid "List roles"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:160
+msgid "You can View, Edit or Delete roles using the action buttons to the right in each row. Keep in mind that a role has to be devoid of members before it can be deleted."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:162
+msgid "Using the logs of MISP"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:163
+msgid "Users with audit permissions are able to browse or search the logs that MISP automatically appends each time certain actions are taken (actions that modify data or if a user logs in and out)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:164
+msgid "Generally, the following actions are logged"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:166
+msgid "Creation, deletion, modification, Login / Logout"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:167
+msgid "Creation, deletion, modification, publishing"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:168;170;171;172;173
+msgid "Creation, deletion, modification"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:169
+msgid "ShadowAttribute"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:169
+msgid "Creation, deletion, Accept, Discard"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:172
+msgid "Whitelist"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:173
+msgid "Regexp"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:176
+msgid "Browsing the logs"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:177
+msgid "Listing all the log entries will show the following columns generated by the users of your organisation (or all organisations in the case of site admins)"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:178
+msgid "List logs"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:178
+msgid "Here you can view a list of all logged actions."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:180
+msgid "The automatically assigned ID number of the entry."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:181
+msgid "The e-mail address of the user whose actions triggered the entry."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:182
+msgid "The organisation of the above mentioned user."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:183
+msgid "The date and time when the entry originated."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:184
+msgid "The action's type. This can include: login/logout for users, add, edit, delete for events, attributes, users and servers."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:185
+msgid "The title of an event always includes the target type (Event, User, Attribute, Server), the target's ID and the target's name (for example: e-mail address for users, event description for events)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:186
+msgid "This field is only filled out for entries with the action being add or edit. The changes are detailed in the following format"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:188
+msgid "When the entry is about the creation of a new item (such as adding a new event) then the change will look like this for example"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:191
+msgid "Search log"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:191
+msgid "You can search the logs using this form, narrow down your search by filling out several fields."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:192
+msgid "Searching the Logs"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:193
+msgid "Another way to browse the logs is to search it by filtering the results according to the following fields (the search is a sub-string search, the sub-string has to be an exact match for the entry in the field that is being searched for)"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:195
+msgid "By searching by Email, it is possible to view the log entries of a single user."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:196
+msgid "Searching for an organisation allows you to see all actions taken by any member of the organisation."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:197
+msgid "With the help of this drop down menu, you can search for various types of actions taken (such as logins, deletions, etc)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:198
+msgid "There are several ways in which to use this field, since the title fields contain several bits of information and the search searches for any substrings contained within the field, it is possible to just search for the ID number of a logged event, the username / server's name / event's name / attribute's name of the event target."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:199
+msgid "With the help of this field, you can search for various specific changes or changes to certain variables (such as published will find all the log entries where an event has gotten published, ip-src will find all attributes where a source IP address has been entered / edited, etc)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:203
+msgid "MISP has a couple of administrative tools that help administrators keep their instance up to date and healthy. The list of these small tools can change rapidly with each new version, but they should be self-explanatory. Make sure to check this section after upgrading to a new version, just in case there is a new upgrade script in there - though if this is the case it will be mentioned in the upgrade instructions."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:206
+msgid "If enabled, MISP can delegate a lot of the time intensive tasks to the background workers. These will then be executed in order, allowing the users of the instance to keep using the system without a hiccup and without having to wait for the process to finish. It also allows for certain tasks to be scheduled and automated."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:207
+msgid "Command Line Tools for the Background Workers"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:208
+msgid "The background workers are powered by <a href=\"https://github.com/kamisama/Cake-Resque\">CakeResque</a>, so all of the CakeResque commands work.\n"
+"        To start all of the workers needed by MISP go to your <code>/var/www/MISP/app/Console/worker</code> (assuming a standard installation path) and execute start.sh.\n"
+"        To interact with the workers, here is a list of useful commands. Go to your <code>/var/www/MISP/app/Console</code> (assuming a standard installation path) and execute one of the following commands as a parameter to <code>./cake CakeResque.CakeResque</code> (for example: <code>./cake CakeResque.CakeResque tail</code>)"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:212
+msgid "tail"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:212
+msgid "tail the various log files that CakeResque creates, just choose the one from the list that you are interested in."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:213
+msgid "cleanup"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:213
+msgid "terminate the job that a worker is working on immediately. You will be presented with a choice of workers to choose from when executing this command."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:214
+msgid "clear"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:214
+msgid "Clear the queue of a worker immediately."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:215
+msgid "stats"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:215
+msgid "shows some statistics about your workers including the count of successful and failed jobs."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:217
+msgid "The other commands should not be needed, instead of starting / stopping or restarting workers use the supplied start.sh (it stops all workers and starts them all up again). For further instructions on how to use the console commands for the workers, visit the <a href=\"http://cakeresque.kamisama.me/commands#cleanup\">CakeResque list of commands</a>."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:218
+msgid "Monitoring the Background Processes"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:219
+msgid "The \"Jobs\" menu item within the Administration menu allows site admins to get an overview of all of the currently and in the past scheduled jobs. Admins can see the status of each job, and what the queued job is trying to do. If a job fails, it will try to set an error message here too. The following columns are shown in the jobs table"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:221
+msgid "The job's ID (this is the ID of the job's meta-data stored in the default data-store, not to be confused with the process ID stored in the redis database and used by the workers.)"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:222
+msgid "Process"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:222
+msgid "The process's ID."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:223
+msgid "Worker"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:223
+msgid "The name of the worker queue. There are 3+1 workers running if background jobs are enabled: default, cache, email, and a special Scheduler (this should never show up in the jobs table)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:224
+msgid "Job Type"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:224
+msgid "The name of the queued job."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:225
+msgid "Shows a basic input handled by the job - such as \"Event:50\" for a publish email alert job for event 50."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:226
+msgid "This will show what the job is currently doing or alternatively an error message describing why a job failed."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:227
+msgid "The string identifier of the organisation that has scheduled the job."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:228
+msgid "The status reported by the worker."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:229
+msgid "Retries"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:229
+msgid "Currently unused, it is planned to introduced automatic delayed retries for the background processing to add resilience."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:230
+msgid "A progress bar showing how the job is coming along."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:233
+msgid "Scheduling Jobs and Recurring Jobs"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:234
+msgid "Apart from off-loading long-lasting jobs to the background workers, there is a second major benefit of enabling the background workers: Site-administrators can schedule recurring tasks for the jobs that generally take the longest to execute. At the moment this includes pushing / pulling other instances and generating a full export cache for every organisation and export type. MISP comes with these 3 tasks pre-defined, but further tasks are planned. The following fields make up the scheduled tasks table"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:236
+msgid "The ID of the task."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:237
+msgid "The type of the task."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:238
+msgid "Frequency"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:238
+msgid "This number sets how often the job should be executed in hours. Setting this to 168 and picking the next execution on Sunday at 01:00 would execute the task every Sunday at 1 AM. Setting this value to 0 will make the task only run once on the scheduled date / time without rescheduling it afterwards."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:239
+msgid "Scheduled Time"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:239
+msgid "The time (in 24h format) when the task should be executed the next time it runs (and all consecutive times if a multiple of 24 is chosen for frequency)."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:240
+#: View/Tasks/index.ctp:38
+msgid "Next Run"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:240
+msgid "The date on which the task should be executed."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:241
+msgid "A brief description of the task."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:242
+msgid "This field shows when the job was queued by the scheduler for execution."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:244
+msgid "Site administrators can schedule reccuring tasks on this page."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:245
+msgid "Frequently asked questions"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:246
+msgid "Losing access to the platform and resetting the password"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:247
+msgid "If you ever lock yourself out of MISP as a site admin, there is a command line tool to reset your password. This can also be handy if you have changed the salt key and invalidated all of the passwords."
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:248
+msgid "Simply run the command"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:249
+msgid "my_new_password"
+msgstr ""
+
+#: View/Pages/doc/administration.ctp:250
+msgid "This will create a new password hash using the currently set salt."
+msgstr ""
+
+#: View/Pages/doc/categories_and_types.ctp:7
+msgid "Attribute Categories and Types"
+msgstr ""
+
+#: View/Pages/doc/categories_and_types.ctp:8
+#: View/Pages/doc/md/categories_and_types.ctp:1
+msgid "Attribute Categories vs. Types"
+msgstr ""
+
+#: View/Pages/doc/categories_and_types.ctp:74
+msgid "Click here to get the .md version for gitbook generation."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:15
+msgid "Admins and Site Admins"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:16
+msgid "There are two types of admins in MISP: Admins (also referred to as org admins) and Site Admins. Whilst the former can only do some limited administration of users of his/her own organisation, site admins have access to all of the features and data of the system. They are in charge of making sure that the system runs correctly and the maintenance of MISP."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:17
+msgid "Background Jobs"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:18
+msgid "A lot of the heavier tasks are a burden to users, in that their actions can cause long delays (and in some cases timeouts) while the application logic is executing. To alleviate this, long processes have been (if enabled) moved to background jobs, meaning that their execution happens asynchronously in the background, allowing the user to freely interact with the platform whilst the request is being processed."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:19
+msgid "MISP Instance"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:20
+msgid "A MISP instance is an installation of the MISP software and the connected database. All the data visible to the users is stored locally in the database and data that is shareable (based on the distribution settings) can be synchronised with other instances via the Sync actions. The instance that you are reading this manual on will be refered to as \"this instance\" or \"your instance\". The instances that your instance synchronises with will be refered to as \"remote instances\"."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:21
+msgid "Organisation administrators and Site administrators"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:22
+msgid "We have two types of administrators, site and organisation admins. The former has access to every administrator feature for all the data located on the system including global features such as the creation and modification of user roles and instance links, whilst organisation admins can administer users, events and logs of their own respective organisations."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:23
+msgid "Pivot path"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:24
+msgid "The (branching) path taken by a user from event to event while following correlation links. This is represented by the branching graph in the event view."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:25
+msgid "Pivoting"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:26
+msgid "The act of navigating from event to event through correlation links.\n"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:29
+msgid "Each event can only be directly edited by users of the original creator organisation (and site admins). However, if another organisation would like to amend an event with extra information on an event, or if they'd like to correct a mistake in an attribute, they can create a Proposal. These proposals could then be accepted by the original creator organisation. These proposals can be pulled to another server, allowing users on connected instances to propose changes which then could be accepted by the original creators on another instance (and subsequently pushed back)."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:30
+msgid "Publishing"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:31
+msgid "When an event is first created by a user, it is visible to everyone on the instance based on the access rights (\"Your organisation only\" events will not be visible to users of other organisations), but they will not be synchronised and they won't be exportable. For this, a user with publishing permission of the organisation that created the event has to publish the event. The system will then inform all the users of the instance that are subscribing to e-mail notifications and who have access to view the published event via an e-mail."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:32
+#: View/Pages/doc/using_the_system.ctp:401
+msgid "Pull"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:33
+msgid "Pulling is the process of using the configured sync user on a remote instance to REST GET all of the accessible data (based on the distribution rights) to your instance and store it."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:34
+#: View/Pages/doc/using_the_system.ctp:400
+msgid "Push"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:35
+msgid "Pushing is the process of using a configured instance link to send an event or all accessible events (limited by the distribution rights) through the REST interface to a remote instance."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:37
+msgid "Certain common tasks can be scheduled for a later execution or for regular recurring executions. These tasks currently include caching all of the export formats, pulling from all eligible instances and pushing to all eligible instances."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:38
+msgid "Sync User"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:39
+msgid "A user of a role that grants sync permissions, these users (and their authentication keys) are used to serve as the points of connection between instances. Events pushed to an instance are pushed to a sync user, who then creates the events on the remote instance. Events pulled are added by the sync user that is used to connect the remote instance to your instance. As an administrator, keep in mind that a sync user needs auth key and publish permissions, has to have undergone the mandatory password change and has to have accepted the Terms of Use in order for the sync to work. Please make sure that all of these steps are taken before attempting to push or pull."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:40
+msgid "Synchronisation"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:41
+msgid "What we call synchronisation is an exchange of data between two (or more) MISP instances through our pull and push mechanisms."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:42
+#: View/Pages/doc/using_the_system.ctp:13;301
+msgid "Tagging"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:43
+msgid "Users with tagging rights can assigned various dynamically created tags to events, allowing an arbitrary link between events to be created. It is possible to filter events based on these tags and they can also be used to filter events for the automation."
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:44
+#: View/Pages/doc/using_the_system.ctp:14;310
+msgid "Templating"
+msgstr ""
+
+#: View/Pages/doc/concepts.ctp:45
+msgid "Users with templating rights can create easy to fill forms that help with the event creation process."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:15
+msgid "The top bar"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:16
+msgid "This is the main menu that will be accessible from all of the views. In some instances, some additional buttons that will appear on top of these when a view provides it."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:17
+msgid "This menu contains all of the main functions of the site as a series of dropdown menus. These contains all (from the current user's perspective) accessible functions sorted into several groups."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:19
+msgid "Home button"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:19
+msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:20
+msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:21
+msgid "Input filters alter what and how data can be entered into this instance. Apart from the basic validation of attribute entry by type, it is possible for the site administrators to define regular expression replacements and blacklists for certain values in addition to blocking certain values from being exportable. Users can view these replacement and blacklist rules here whilst administrator can alter them."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:22
+msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:23
+msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:24
+msgid "Administrators can add, edit or remove user accounts and user roles. Roles define the access rights to certain features such as publishing of events, usage of the REST interface or synchronisation of any user belonging to the given role. Site administrators can also access a contact form, through which it is possible to reset the passwords of users, or to just get in touch with them via encrypted e-mails."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:25
+msgid "If you have audit permissions, you can view the logs for your organisation (or for site admins for the entire system) here or even search the logs if you are interested in something specific."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:26;90
+#: View/Threads/index.ctp:2
+msgid "Discussions"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:26
+msgid "Link to the discussion threads."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:27
+msgid "Proposal Notifications"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:27
+msgid "This shows how many proposals your organisation has received and across how many events they are spread out. Clicking this will take you to the list of proposals."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:28
+msgid "Logs you out of the system."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:31
+msgid "A list of the contents of each of the above drop-down menus"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:32
+msgid "Event actions"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:34
+msgid "Lists all the events in the system that are not private or belong to your organisation. You can add, modify, delete, publish or view individual events from this view."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:35
+msgid "Allows you to fill out an event creation form and create the event object, which you can start populating with attributes."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:36
+msgid "Lists all the attributes in the system that are not private or belong to your organisation. You can modify, delete or view each individual attribute from this view."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:37
+msgid "You can set search terms for a filtered attribute index view here."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:38
+msgid "Shows a list of all proposals that you are eligible to see."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:39
+msgid "Shows all of the events created by your organsiation that has pending proposals."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:40
+msgid "List all the tags that have been created by users with tag creation rights on this instance."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:41
+msgid "Create a new tag."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:42
+msgid "List all of the templates created by users with template creation rights on this instance."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:43
+msgid "Create a new template."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:44
+msgid "Export the data accessible to you in various formats."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:45
+msgid "If you have authentication key access, you can view how to use your key to use the REST interface for automation here."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:48
+msgid "Input filters"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:50
+msgid "You can view the Regular Expression rules, which modify the data that can be entered into the system. This can and should be used to help filter out personal information from automatic imports (such as removing the username from windows file paths), having unified representation for certain common values for easier correlation or simply standardising certain input. It is also possible to block certain values from being inserted. As a site administrator or a user with regex permission, you can also edit these rules."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:51
+msgid "You can view the whitelist rules, which contain the values that are blocked from being used for exports and automation on this instance. Site administrators have access to editing this list."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:56
+msgid "Read about the latest news regarding the MISP system."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:57
+msgid "Manage your user account."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:58
+msgid "Attribute Histogram"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:58
+msgid "View some statistics about the currently stored attributes."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:59
+msgid "You can view the role permissions here."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:60
+msgid "A link to this user guide."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:61
+msgid "View the terms &amp; conditions again."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:62
+msgid "View a series of statistics about the users and the data on this instance."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:63
+msgid "Logs the current user out."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:68
+msgid "Connect your MISP instance to other instances, or view and modify the currently established connections."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:73
+msgid "New User"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:73
+msgid "Create an account for a new user for your organisation. Site administrators can create users for any organisation."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:74
+msgid "View, modify or delete the currently registered users."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:75
+msgid "New Role"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:75
+msgid "Create a new role group for the users of this instance, controlling their privileges to create, modify, delete and to publish events and to access certain features such as the logs or automation."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:76
+msgid "List, modify or delete currently existing roles."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:77
+msgid "You can use this view to send messages to your current or future users or send them a new temporary password."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:78
+msgid "Various tools, upgrade scripts that can help a site-admin run the instance."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:79
+msgid "Server Settings"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:79
+msgid "Set up and diagnose your MISP installation."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:80
+msgid "View the background jobs and their progress."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:81
+msgid "Schedule the pre-defined tasks for your instance (this currently includes export caching, server pull and server push)."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:86
+msgid "View the logs of the instance."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:87
+msgid "Search the logs by various attributes."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:92
+msgid "List all of the discussion threads."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:93
+msgid "Create a new discussion thread."
+msgstr ""
+
+#: View/Pages/doc/general.ctp:95
+msgid "The left bar"
+msgstr ""
+
+#: View/Pages/doc/general.ctp:96
+msgid "This bar changes based on each page-group. The blue selection shows you what page you are on."
+msgstr ""
+
+#: View/Pages/doc/quickstart.ctp:15
+msgid "The Malware Information Sharing Platform (MISP) is the tool which will be used to facilitate the exchange of Indicator of Compromise (IOC) about\n"
+"targeted malware and attacks within your community of trusted members. It is a central Indicator of Compromise (IOC) database with technical and\n"
+"non-technical information. Exchanging this information should result in faster detection of targeted attacks and improve the detection ratio,\n"
+"while also reducing the number of false positives."
+msgstr ""
+
+#: View/Pages/doc/quickstart.ctp:19
+msgid "Create an Event"
+msgstr ""
+
+#: View/Pages/doc/quickstart.ctp:21
+msgid "Browsing past Events"
+msgstr ""
+
+#: View/Pages/doc/quickstart.ctp:23
+msgid "Export Events for logsearches"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:8;21
+msgid "First run of the system"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:9;34
+msgid "Managing your account"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:10;48
+msgid "Staying up to date"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:19
+msgid "User Management and Global Actions"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:22
+msgid "When first logging into MISP with the username and password provided by your administrator, there are a number of things that need to be done, before you can start using the system."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:24
+msgid "Accepting the Terms of use"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:24
+msgid "The terms of use are shown immediately after logging in for the first time, make sure to read through this page before clicking \"Accept Terms\" at the bottom of the page."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:25;26;41
+msgid "Changing the password"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:25
+msgid "After accepting the ToU, you'll be prompted to change your password, but keep in mind that it has to be at least 6 characters long, it has to include at least one upper-case and one lower-case character in addition to a digit or a special character. Enter the same password into the confirm password field, before clicking submit to finalise the change."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:27;44
+msgid "Setting up the GnuPG Key"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:27
+msgid "In order for the system to be able to encrypt the messages that you send through it, it needs to know your GnuPG key. Navigate to the Edit profile view (My Profile on the left -&gt; Edit profile in the top right corner). Paste the key into the GnuPG field and click submit."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:28;42
+msgid "Subscribing to Auto-alerts"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:28;42
+msgid "Turning auto-alerts on will allow the system to send you e-mail notifications about any new public events entered into the system by other users and private events added by members of your organisation. To turn this on, navigate to the Edit profile view (My profile on the left navigation menu -&gt; Edit profile in the top right corner). Tick the auto-alert checkbox and click submit to enable this feature."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:29
+msgid "Use these checkboxes to subscribe to auto-alerts and contact reporter e-mails."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:30;43
+msgid "Subscribing to e-mails sent via the \"Contact Reporter\" functionality"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:30
+msgid "This feature is turned on right below the autoalerts and will allow you to receive e-mails addressed to your organisation whenever a user tries to ask about an event that was posted by a user of your organisation. Keep in mind that you can still be addressed by such a request even when this setting is turned off, if someone tries to contact you as the event creator directly or your organisation for an event that you personally have created then you will be notified."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:31
+msgid "Reviewing the Terms &amp; Conditions"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:31
+msgid "o review the Terms &amp; Conditions or to read the User Guide, use the appropriate button on the left navigation menu."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:32
+msgid "Making sure that compatibility mode is turned off (IE9&amp;IE10)"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:32
+msgid "Compatibility mode can cause some elements to appear differently than intended or not appear at all. Make sure you have this option turned off."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:35
+msgid "To alter any details regarding your profile, use the \"My Profile\" menu button to bring up the profile overview and then click on \"Edit Profile\" in the right upper corner."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:38
+msgid "Change any of your profile settings here."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:40
+msgid "Changing your e-mail address"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:40
+msgid "Your e-mail address serves as both a login name and as a means of communication with other users of the MISP system via the contact reporter feature. To change your e-mail address, just enter the edit profile menu (My profile on the left navigation menu -&gt; Edit profile in the top right corner) and change the field titled Email."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:41
+msgid "As a next step, change the password provided by your administrator to something of your own choosing. Click on My profile on the left navigation menu, under Global Actions, which will bring up the User view. Click on Edit User on the left navigation menu or Edit Profile in the top right corner. This next screen, allows you to edit your details, including your password, by filling out the password field. Keep in mind that the password has to be at least 6 characters long, has to include at least one upper-case and one lower-case character in addition to a digit or a special character. Enter the same password into the confirm password field, before clicking submit to finalise the change."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:43
+msgid "Turning this feature on will allow you to receive e-mails addressed to your organisation whenever a user tries to ask about an event that was posted by a user of your organisation. Keep in mind that you can still be addressed by such a request even when this setting is turned off, if someone tries to contact the person that reported an event that you yourself have created."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:44
+msgid "In order for the system to be able to encrypt the messages that you send through it, it needs to know your GnuPG key. You can acquire this by clicking on the GnuPG key link at the bottom left of the screen. Copy the entirety of the key and navigate to the Edit profile view (My Profile on the left -&gt; Edit profile in the top right corner). Paste the key into the GnuPG field and click submit."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:45
+msgid "Requesting a new authentication key"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:45
+msgid "It is possible to make the system generate a new authentication key for you (for example if your previous one gets compromised. This can be accessed by clicking on the My Profile button and then clicking the reset key next to the currently active authentication code. The old key will become invalid when the new one is generated."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:46
+msgid "Clicking on reset will generate a new key for you and invalidate the old one, blocking it from being used."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:49
+msgid "MISP also provides its users with some information about itself and its users through the links provided in the Global Actions menu."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:51
+msgid "To read about the news regarding the system itself, click on News on the left menu. This will bring up a list of news items concerning updates and changes to MISP itself."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:52
+msgid "Member statistics"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:52
+msgid "By using the Attribute Histogram menu button on the left, you can see a quick histogram depicting the distribution of attribute types created by each organisation."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:53
+msgid "The user guide is also accessible via the Global Actions menu. You can find out more about how to use the system by reading this."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:54
+msgid "It is possible to review the terms &amp; conditions that were shown during the first run of the system by clicking on the terms &amp; conditions link in the Global Actions menu."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:55
+msgid "View statistics about the users and the data contained within this instance."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:58
+msgid "General Statistics"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:58
+msgid "View a set of statistics such as the number of Events and Attributes currently in existance on the platform. The number in the bracket shows the number of new items added during this week."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:61
+#: View/Users/statistics.ctp:42
+#: View/Users/statistics_data.ctp:53
+msgid "Activity Heatmap"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:61
+msgid "This graph shows a heatmap of all activity related to creating event related data on a day by day basis. By default, the graph shows the sum of the contributions of all organisations, but using the buttons representing each organisation in existance on the platform you can switch to the activity heatmap of a single organisation. If you'd like to see the activity further back in the past, just use the arrow buttons to navigate the heatmap."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:66
+msgid "Inspecting the input filters"
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:67
+msgid "All the events and attributes that get entered into MISP will be run through a series of input filters. These are defined by the site administrators or users with special privileges to edit the filters, but every user can take a look at the currently active lists."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:69
+msgid "All Attribute value and Event info fields will be parsed for a set of regular expressions and replaced based on the replacement values contained in this section. This has many uses, such as unifying similar data for better correlation, removing personal data from file-paths or simply for clarity. It is also possible to blacklist data by not defining a replacement for a regular expression."
+msgstr ""
+
+#: View/Pages/doc/user_management.ctp:70
+msgid "This list (can) contain a set of addresses that are allowed to be entered as attribute values but will be blocked from being exported to NIDS-es."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:9;27
+msgid "Creating an event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:10;154
+msgid "Browsing past events"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:11
+msgid "Updating and modifying events"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:12
+msgid "Contacting the publisher"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:16;365
+msgid "Exporting data"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:17
+msgid "Connecting to other servers"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:18;422
+msgid "Rest API"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:28
+msgid "The process of entering an event can be split into 3 phases, the creation of the event itself, populating it with attributes\n"
+"and attachments and finally publishing it."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:30
+msgid "During this first step, you will be create a basic event without any actual attributes, but storing general information such as a description, time and risk level of the incident. To start creating the event, click on the New Event button on the left and fill out the form you are presented with. The following fields need to be filled out"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:31
+msgid "Fill this form out to create a skeleton event, before proceeding to populate it with attributes and attachments."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:33
+msgid "The date when the incident has happened. Just click this field and a date-picker will pop up where you can select the desired date."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:35
+msgid "This setting controls, who will be able to see this event once it becomes published and eventually when it becomes pulled.\n"
+"                        Apart from being able to set which users on this server are allowed to see the event, this also controls whether\n"
+"                        the event will be synchronised to other servers or not. The distribution is inherited by attributes: the most restrictive setting wins.\n"
+"                        The following options are available"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:41
+msgid "Your organization only"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:41
+msgid "This setting will only allow members of your organisation to see this. It can be pulled to another instance by one of your organisation members where only your organisation will be able to see it.\n"
+"                            Events with this setting will not be synchronised"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:43
+msgid "Upon push: do not push. Upon pull : pull."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:45
+msgid "This Community-only"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:45
+msgid "Users that are part of your MISP community will be able to see the event.\n"
+"                            This includes your own organisation, organisations on this MISP server and organisations running MISP\n"
+"                            servers that synchronise with this server. Any other organisations connected to such linked servers will\n"
+"                            be restricted from seeing the event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:49
+msgid "Upon push: do not push. Upon pull: pull and downgrade to Your organization only."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:51
+msgid "Users that are part of your MISP community will be able to see the event.\n"
+"                            This includes all organisations on this MISP server, all organisations on MISP servers synchronising\n"
+"                            with this server and the hosting organisations of servers that connect to those afore mentioned servers\n"
+"                            (so basically any server that is 2 hops away from this one). Any other organisations connected to linked\n"
+"                            servers that are 2 hops away from this own will be restricted from seeing the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:56
+msgid "Upon push: downgrade to This Community only and push. Upon pull: pull and downgrade to This Community only."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:58
+msgid "This will share the event with all MISP communities, allowing the event to be\n"
+"                            freely propagated from one server to the next."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:60
+msgid "Upon push: push. Upon pull: pull."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:64
+msgid "This field indicates the risk level of the event. Incidents can be categorised into three different threat categories (low, medium, high). This field can alternatively be left as undefined. The 3 options are"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:66
+msgid "General mass malware."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:67
+msgid "Advanced Persistent Threats (APT)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:68
+msgid "Sophisticated APTs and 0day attacks."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:70;177
+msgid "Indicates the current stage of the analysis for the event, with the following possible options"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:72;180
+msgid "The analysis is just beginning"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:73;181
+msgid "The analysis is in progress"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:74;182
+msgid "The analysis is complete"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:76;319
+msgid "Event Description"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:76
+msgid "The info field, where the malware/incident can get a brief description starting with the internal reference. This field should be as brief and concise as possible, the more detailed description happens through attributes in the next stage of the event's creation. Keep in mind that the system will automatically replace detected text strings that match a regular expression entry set up by your server's administrator(s)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:79
+msgid "Add attributes to the event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:80
+msgid "The second step of creating an event is to populate it with attributes and attachments. This can be done by adding them manually or importing the attributes from an external format (OpenIOC, ThreatConnect). To import from an external format or to upload an attachment use the options in the menu on the left."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:82
+msgid "Attribute tools"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:82
+msgid "Use these tools to populate the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:83
+msgid "Using the above shown buttons, you can populate an event using various tools that will be explained in the following section. Let's start with the Add Attribute button."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:85
+msgid "Keep in mind that the system searches for regular expressions in the value field of all attributes when entered, replacing detected strings within it as set up by the server's administrator (for example to enforce standardised capitalisation in paths for event correlation or to bring exact paths to a standardised format). The following fields need to be filled out"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "This form allows you to add attributes."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:88
+msgid "This drop-down menu explains the category of the attribute, meaning what aspect of the malware this attribute is describing. This could mean the persistence mechanisms of the malware or network activity, etc. For a list of valid categories, %s"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:88;89;94;187;292
+msgid "click here"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:89
+msgid "Whilst categories determine what aspect of an event they are describing, the Type explains by what means that aspect is being described. As an example, the source IP address of an attack, a source e-mail address or a file sent through an attachment can all describe the payload delivery of a malware. These would be the types of attributes with the category of payload deliver. For an explanation of what each of the types looks like together with the valid combinations of categories and types, %s."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:90
+msgid "This drop-down list allows you to control who will be able to see this attribute.\n"
+"                The distribution is inherited by attributes: the most restrictive setting wins.\n"
+"                For more info <a href=\"#distribution\">click here</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:93
+msgid "Add a comment to the attribute. This will not be used for correlation."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:94
+msgid "The actual value of the attribute, enter data about the value based on what is valid for the chosen attribute type. For example, for an attribute of type ip-src (source IP address), 11.11.11.11 would be a valid value. For more information on types and values, %s."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:95;131
+msgid "You can add some comments to the attribute that will not be used for correlation but instead serves as purely an informational field."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:96
+msgid "This option allows the attribute to be used as an IDS signature when exporting the NIDS data, unless it is being overruled by the white-list. For more information about the whitelist, head over to the %s section."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:96
+msgid "administration"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:97
+msgid "Batch import"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:97
+msgid "If there are several attributes of the same type to enter (such as a list of IP addresses, it is possible to enter them all into the same value-field, separated by a line break between each line. This will allow the system to create separate lines for the each attribute."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:99
+msgid "Populate from Template"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:100
+msgid "Templates allow users to rapidly populate events of a specific type by filling out a series of pre-defined fields. Users with template creation privileges can create new templates for their organisations or for all organisations on their instance. If you are interested in template creation, please refer to the templating section.<br />\n"
+"For users trying to populate an event, after clicking on the populate from template button, you'll be presented with a list of all currently accessible templates. Pick the one that best describes the event that you are creating."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:102
+msgid "Template Choice"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:102
+msgid "Choose the most appropriate template for your event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:103
+msgid "Once you have chosen a template, you'll be presented with the actual form contained within. Make sure you fill out as many fields as possible with the mandatory fields - marked by a star in a bracket such as this: (*) - are filled out.<br />\n"
+"Templates are devided into sections, with each section having a title and a description in addition to a series of fields. Each field can be an attribute or a file attachment field. An attribute field has the following components"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:105
+msgid "Template Field"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:105
+msgid "MISP will generate attributes based on the field's settings and the data that you provide."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:107
+msgid "The name of the field along with an indication if the field is mandatory."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:108
+msgid "A short description of the field."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:109
+msgid "The value(s) that are valid for the field. In the case of several types being shown here, you can enter value(s) matching any one of the types, or in the case of a batch import field, any mixture of the given types."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:110
+msgid "Text field"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:110
+msgid "This field can either be a single line textfield or a multi-line text area. For the former, enter a single value of the above indicated type, whilst for the latter you cna paste a list of values separated by line-breaks."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:113;115
+msgid "Freetext"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:113
+msgid "Just paste a line-break separated list of indicators into the freetext import tool."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:114
+msgid "If you have a list of indicators that you would like to quickly generate attributes out of then the Free-text import tool is just what you need. Simply paste a list of indicators (separated by line-breaks into this tool)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:115
+msgid "MISP will often find several valid category/type combinations for the values. Do last minute adjustments on the result page."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:116
+msgid "Since there are several category / type combinations that can be valid for a lot of values, MISP will suggest the most common settings. You can alter the category / type / IDS fields manually if you disagree with the results. The options will be restricted to valid category/type combinations for the value that you have entered."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:118
+msgid "If you would like to create and maintain an event with a set of indicators that receives removals and additions over time, then the attribute replace tool might make this task easier for you."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:119
+msgid "Select a category/type combination and paste the updated list of indicators into the textarea."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:120
+msgid "Simply select the desired category / type combination, choose whether the attributes should be marked for IDS exports and paste the new list of indicators into the textarea. Attributes of the same category/type that are present in the event but not the new list will be removed, values in the pasted list that do not yet exist as attributes will be created as attributes and values that already have matching attributes will be left untouched."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:121
+msgid "Add attachments to the event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:122
+msgid "You can also upload attachments, such as the malware itself, report files from external analysis or simply artifacts dropped by the malware. Clicking on the add attachment button brings up a form that allows you to quickly attach a file to the event. The following fields need to be filled out"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:123
+msgid "Add attachment"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:123
+msgid "Point the uploader to the file you want to upload. Make sure to mark it as malware if the uploaded file is harmful, that way it will be neutralised."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:125
+msgid "The category is the same as with the attributes, it answers the question of what the uploaded file is meant to describe."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:126
+msgid "This drop-down list allows you to control who will be able to see this attachment.\n"
+"            The distribution is inherited by attributes: the most restrictive setting wins.\n"
+"            For more info <a href=\"#distribution\">click here</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:129
+msgid "Upload field"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:129
+msgid "By hitting browse, you can browse your file system and point the uploader to the file that you want to attach to the attribute. This will then be uploaded when the upload button is pushed."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:130
+msgid "This check-box marks the file as malware and as such it will be zipped and passworded, to protect the users of the system from accidentally downloading and executing the file. Make sure to tick this if you suspect that the filed is infected, before uploading it."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:134
+msgid "Propose a change to an event that belongs to another organisation"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:135
+msgid "If you would like to propose a modification to an attribute, or to propose some additional attributes to the creating organisation, you can do this with the buttons that replace the add attribute field on the left and the edit icon on the right end of each listed attribute in the event view. The creating organisation of the event will be able to see any proposals and discard or accept the changes."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:136
+msgid "Propose attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:136
+msgid "An attribute with a proposal attached will turn blue and the proposal itself will be grey. If there is a grey proposal without a blue attribute infront of it, it means that someone has proposed a new attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:137
+msgid "If the organisation that has created the event is on another connected server, they will be able to accept the proposal once they initiate a pull and receive your proposal. After this they can republish the event, sending the altered attribute back to your instance."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:139
+msgid "Populate from OpenIOC"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:140
+msgid "It is also possible to attempt to import the data contained in a .ioc file, The import tool will attempt to gather as many IndicatorItems within nested logical operators as possible without breaking their validity. After the procedure is done, you'll be presented with a list of successfully created attributes and a list of failed IndicatorItems as well as a graph of the .ioc file."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:141
+msgid "OpenIOC1"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:141
+msgid "The import tool will list the successful and failed entries after the process is done."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:142
+msgid "OpenIOC2"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:142
+msgid "You'll also be able to see a graph of the imported .ioc file and how successful the import was."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:144
+msgid "Populate from ThreatConnect"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:145
+msgid "You can also import the data from a ThreatConnect export csv file. The following columns are used by the import tool (and are thus mandatory fields to select during the export)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:145
+msgid "Confidence"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:145
+#: View/Sightings/ajax/list_sightings.ctp:8
+#: View/Users/statistics_sightings.ctp:9
+msgid "Source"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:145
+msgid "The result will be a list of attributes that get added to the currently selected event, each of which will be marked with a comment that indicates that its origin being from a ThreatConnect import."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:147
+msgid "Publish an event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:149
+msgid "Once all the attributes and attachments that you want to include with the event are uploaded / set, it is time to finalise its creation by publishing the event (click on publish event in the event view). This will alert the eligible users of it (based on the private-controls of the event and its attributes/attachments and whether they have auto-alert turned on), push the event to instances that your instance connects to and propagate it further based on the distribution rules. It also readies the network related attributes for NIDS signature creation (through the NIDS signature export feature, for more information, go to the export section.)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:150
+msgid "There is an alternate way of publishing an event without alerting any other users, by using the \"publish (no email)\" button. This should only be used for minor edits (such as correcting a typo)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:152
+msgid "If your instance has background jobs enabled then the event might not get published immediately."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:155
+msgid "The MISP interface allows the user to have an overview over or to search for events and attributes of events that are already stored in the system in various ways."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:156
+msgid "To list all events"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:157
+msgid "On the left menu bar, the option \"List events\" will generate a list of the last 60 events. While the attributes themselves aren't shown in this view, the following pieces of information can be seen"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:158
+msgid "List events"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:158
+msgid "This is the list of events in the system. Use the buttons to the right to alter or view any of the events."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:160
+msgid "Already published events are marked by a checkmark. Unpublished events are marked by a cross."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:161
+msgid "The organisation that created the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:162
+msgid "Owner Org"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:162
+msgid "The organisation that owns the event on this instance. This field is only visible to administrators."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:163
+msgid "The event's ID number, assigned by the system when the event was first entered (or in the case of an event that was synchronized, when it was first copied over - more on synchronisation in chapter xy)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:164
+msgid "Tags that are assigned to this event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:165
+msgid "#Attr."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:165
+msgid "The number of attributes that the event has."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:166
+msgid "The e-mail address of the event's reporter. This is not visible to regular users. Organisation administrators can see the e-mail addresses of their own organisation's users."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:167
+msgid "The date of the attack."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:168
+msgid "The risk level of the attack, the following levels are possible"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:171
+msgid "General Malware"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:172
+msgid "Advanced Persistent Threats (APTs)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:173
+msgid "Sophisticated APTs and 0day exploits<"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:174
+msgid "This field can be left undefined and edited at a later date."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:185
+msgid "A short description of the event, starting with an internal reference number."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:186
+msgid "This field indicates what the sharing privileges of the event. The options are described <a href=\"#distribution\">here</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:187
+msgid "The controls that the user has to view or modify the event. The possible actions that are available (depending on user privileges - %s to find out more about privileges)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:190
+msgid "Publishing an event will have several effects: The system will e-mail all eligible users that have auto-alert turned on (and having the needed privileges for the event, depending on its private classification) with a description of your newly published event, it will be flagged as published and it will be pushed to all eligible servers (to read more about synchronisation between servers, have a look at the %s)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:190
+msgid "section on connecting servers"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:191
+msgid "Clicking on the edit button will bring up the same screen as the one used for creating new events, with the exception that all fields come filled out with the data of the event that is being edited. The distribution of an event can only be edited if you are a user of the creating organisation of the event. For more information on this view, refer to the section on <a href=\"#create\">creating an event</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:192
+msgid "The system will prompt you before erasing the unwanted event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:193
+msgid "Will bring up the event view, which besides the basic information contained in the event list, will also include the following"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:198
+msgid "It is also possible to filter the events shown by clicking on the small magnifying glass icons next to the field names and entering a filter term."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:199
+msgid "Event view"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:200
+msgid "This view includes the basic information about an event, a link to related events, all attributes and attachments with tools to modify or delete them and extra functions for publishing the event or getting in touch with the event's reporter."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:201
+msgid "General Event Information"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:203
+msgid "The ID of the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:204
+msgid "In order to avoid collisions between events and attributes (during for example a sync) a Uuid is assigned that uniquely identifies each of them."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:205
+msgid "The organisation that has originally created the event. The logo (if it exists on the server, alternatively a string) representing the organisation is also shown int he right upper corner."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:206
+msgid "Shows a list of the organisations that have contributed to the event via proposals. If you click any of the logos listed here, you'll get redirected to a filtered event history view, including only the changes made by the organisation."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:207
+msgid "A list of tags associated with the event. Clicking a tag will show a list of events with the same tag attached. The little cross next to each tag allows you to remove the tag from the event, whilst the '+' button allows you to assign a tag. For the latter two options to be visible, you have to have tagging permission."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:208
+msgid "The date of detection, set by the user that creates the event, not to be confused with the creation date of the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:209
+msgid "The assigned threat level of the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:210
+msgid "The status of the analysis."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:211
+msgid "This shows the distribution rules applied to this event, controlling whether only the creating organisation can see (Your organisation only) it or everyone on the instance (This community only). The two remaining settings allow the event to be propagated to organisations on remote connected instances."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:212
+msgid "A short description of the event itself. Make sure not to put information in here that could be used for correlation purposes and be better suited as an Attribute."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:213
+msgid "Whether the event has been published or not. Publishing allows the attributes of the event to be used for all eligible exports and it notifies users that have subscribed to the event alerts. Also, a publish initiates a push to all eligible instances."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:215
+msgid "List of Related Events"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:216
+msgid "The list of relations is shown on the right hand side of the general event information. Events can be related by having one or more attributes that are exact matches. For example, if two events both contain a source IP attribute of 11.11.11.11 then they are related. The list of events that are related the currently shown one, are listed under \"Related Events\", as links (titled the related event's date and ID number) to the events themselves."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:217
+msgid "Data Element Toggles"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:218
+msgid "You can control some of the data that is shown on this page using three toggles. The elements that can be disabled are the pivot threads, the attributes (and proposals) and the Discussions. You can collapse these elements and then expand them again using the same button."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:219
+msgid "Pivot Threads"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:220
+msgid "While moving from event to event through the relation links (a process that we refer to as pivoting), you create a path that shows which events you have traversed. This path is reset by leaving the event view and navigating elsewhere in the application or by deleting the root pivot element."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:221
+msgid "Each event visited is represented by a bubble in the pivot thread graph, connected by lines that show how the user has arrived at the next connected event. It is possible to jump back to an earlier relation and pivot to another event through that, creating branches in the graph."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:222
+msgid "The currently selected event is coloured blue in the graph. If you would like to delete an element from the graph (including all of elements that branch off of it) just click on the small x within a pivot bubble. For a deletion to be possible the following conditions have to be met"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:224
+msgid "The pivot element to be deleted cannot be on the path that leads to the currently selected event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:225
+msgid "The pivot element residing in the graph's root can always be deleted - this will simply reset the current pivot thread"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:227
+msgid "Attributes and Proposals"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:228
+msgid "A list of all attributes and proposals attached to the event. The fields for each of them only differ in the available actions and the fact that for proposals to attributes all fields are blank that would stay unchanged if the proposal was accepted (for example, proposing a change to an attribute to turn the IDS flag on will have all fields apart from the IDS flag blank in the proposal. Here is a list of what each of the fields represents"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:230
+msgid "The date of the last modification to the attribute. Proposals don't have a date of last edit."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:231
+msgid "The category of the attribute or proposal. For a list of possible categories visit the section on <a href=\"%s/pages/display/doc/categories_and_types\">categories and types</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:232
+msgid "The type of the attribute or proposal. For a list of possible categories visit the section on <a href=\"%s/pages/display/doc/categories_and_types\">categories and types</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:233
+msgid "The value or value-pair of the attribute. This is the main payload of the attribute, which is described by the category and type columns. For certain types of attributes that are made up of value-pairs the two parts will be split by a pipe (|), such as for filename|md5. The value field(s) are used by the correlation engine to find relations between events. In value-pair attributes both values are correlated individually."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:234
+msgid "Attributes can have a contextual comment to further describe the attribute. These comments are not used for correlation and are purely informative."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:235
+msgid "A list of the event IDs that also contain an attribute with the same value."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:236
+msgid "Flags an attribute as an indicator of compromise, allowing it to be included in all of the eligible exports."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:237
+msgid "Defines the distribution of the attribute individually. An attribute can have a different distribution level than the event. In any case, the lowest distribution level of the two is used."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:238
+msgid "The user can interact with the events through these buttons, which will be further described in the next portion of the guide as they differ for attributes and proposals."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:240
+msgid "Depending on the colour coding of the row, you can have an attribute, a proposal to the event or a proposal to an attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:242
+msgid "Each uncoloured line represents an Attribute."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:243
+msgid "Proposals to an Event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:243
+msgid "Each gray line at the end of the list represents a Proposal to an event. These are proposals for a new attribute, mostly unrelated to any of the currently existing attributes. If the creator of the event accepts one of these a new attribute will be created."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:244
+msgid "Proposals to an Attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:244
+msgid "Each attribute can have several edit proposals. These will be placed right below the attribute that the proposal affects and - as with the event proposals - is coloured grey. The original attribute's row is coloured blue if a proposal exists for it."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:246
+msgid "Using the modify button will bring up the attribute creation view, with all data filled out with the attributes currently stored data."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:247
+msgid "Event Discussion Thread"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:248
+msgid "Each event has its own assigned discussion where users (that are eligible to see the event) can participate in an open discussion. The users are anonymised in the messages, all that other users will see is their user ID number and their organisation. To post a message on the Event Discussion, either use the reply button on a previous post or use the quickresponse field at the bottom of the page.\n"
+"Each post is made up of the following"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:251
+msgid "The date when the post was created."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:252
+msgid "Post navigation"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:252
+msgid "This should the posts' ID as well as a link to jump to the top of the discussion thread on the page itself."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:253
+msgid "Organisation logo"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:253
+msgid "If such an image exists for the organisation that has posted the message, then the logo is shown."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:254
+msgid "The body of the post itself. This can also include automatically generated links to other events and threads as well as show quoted test in embedded bubbles. Editing an event will also append a post with a message indicating that it was edited together with the timestamp of the edit."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:255
+msgid "The e-mail address of the poster if he/she is from the organisation as the current user. Alternatively a generated sting is shown that includes the user ID of the user, so that his/her e-mail address could remain hidden whilst still being identifiable."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:256
+msgid "Action buttons"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:256
+msgid "Edit, Delete and Reply. The first two of the three options are only available to the poster of the message or a site admin. Quoting a post will automatically include the original message in [quote] tags."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:258
+msgid "Here is a list of the various tools you can use while using this feature"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:260
+msgid "Pagination"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:260
+msgid "There are 5 posts visible on each event page, if there have been more messages posted, use the previous and next button to navigate through the thread. This will not reload the rest of the page."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:261
+msgid "Discussion Tags"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:261
+msgid "Users can quote something by encapsulating it in [quote][/quote] tags, they can create a link to another event with the [event][/event] tags or to another discussion thread with [thread][/thread]."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:262
+msgid "Quick Post"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:262
+msgid "Adding a post will take the user to a separate add Post page, something that can be a bit of an inconvenience. To avoid this, there is a quick post button, where users can add messages on the fly without having to reload the page. On top of the quick post field, 3 buttons allow users to generate quote, event and thread tags quickly."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:265
+msgid "Event History"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:266
+msgid "View the logs of the event that show how the event has changed over time, including the contribution from other organisations in the form of proposals. There are two ways to get to this view, either by clicking on View Event History on the side menu of an event view, or by clicking on a contributing organisation's logo on the event view. The latter will show a restricted form of the logs, showing only Proposals created by the selected organisation. The fields shown in this view are as described as follows"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:268
+msgid "The logo (or in the lack thereof a string representation) of the organisation."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:269
+msgid "Each entry in the log happens during an action, such as the creation, modification or deletion of data and some special actions (such as accepting a proposal). This field shows which action caused the entry to be created."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:270
+msgid "Model"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:270
+msgid "As described above, a log entry is generated on certain actions. This field shows which type of data was affected that caused the log entry to be created (such as a change to the event, the creation of an attribute, the discarding of a proposal, etc)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:271
+msgid "This is a short description of the change itself and it is not nearly as detailed as the information administrators get in the audit logs. However, for attributes and proposals the category / type and value of the created or edited attribute is shown."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:272
+msgid "The date and time of the log entrys' creation."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:275
+msgid "Listing all attributes"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:276
+msgid "Apart from having a list of all the events, it is also possible to get a list of all the stored attributes in the system by clicking on the list attributes button. The produced list of attributes will include the followings fields"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:277
+msgid "Use the buttons to the right to view the event that this attribute belongs to or to modify/delete the attribute."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:279
+msgid "This is the ID number of the event that the attribute is tied to. If an event belongs to your organisation, then this field will be coloured red."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:280
+msgid "The organisation that has created the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:281
+msgid "The category of the attribute, showing what the attribute describes (for example the malware's payload). For more information on categories, go to section xy"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:282
+msgid "The type of the value contained in the attribute (for example a source IP address). For more information on types, go to section xy"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:283
+msgid "The actual value of the attribute, describing an aspect, defined by the category and type fields of the malware (for example 11.11.11.11)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:284
+msgid "An optional contextual comment attached to the attribute."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:285
+msgid "Shows whether the attribute has been flagged for NIDS signature generation or not."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:286
+msgid "A set of buttons that allow you to view the event that the attribute is tied to, to edit the attribute (using the same view as what is used to set up attributes, but filled out with the attribute's current data) and a delete button."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:288
+msgid "Searching for attributes"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:289
+msgid "Apart from being able to list all events, it is also possible to search for data contained in the value field of an attribute, by clicking on the \"Search Attributes\" button."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:290
+msgid "Search attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:291
+msgid "This will bring up a form that lets you enter one or several search strings (separate search strings with line breaks) that will be compared to the values of all attributes, along with options to narrow down the search based on category and type. The entered search string has to be an exact match with (the sub-string of) a value. A second text field makes it possible to enter event IDs for events that should be excluded from the search (again, each line represents an event ID to be excluded). The third text field allows the user to restrict the results to attributes from certain organisations or to attributes not created by certain other organisations, using the above described syntax."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:292
+msgid "The list generated by the search will look exactly the same as listing all attributes, except that only the attributes that matched the search criteria will be listed (to find out more about the list attributes view, %s.). The search parameters will be shown above the produced list and the search terms will be highlighted."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:293
+msgid "The last option is a checkbox that restricts all of the results to attributes that are marked as IDS signatures."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:294
+msgid "You can view the event that an attribute belongs to with the view button, or you can edit/delete the attribute via the buttons on the right."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:296
+msgid "Updating and modifying events and attributes"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:297
+msgid "Every event and attribute can easily be edited. First of all it is important to find the event or attribute that is to be edited, using any of the methods mentioned in the section on <a href=\"#browsing_events\">browsing past events</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:298
+msgid "Once it is found, the edit button (whether it be under actions when events/attributes get listed or simply on the event view) will bring up the same screen as what is used to create the entry of the same type (for an event it would be the event screen as <a href=\"#create\">seen here</a>, for an attribute the attribute screen as <a href=\"#create_attribute\">described here</a>)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:299
+msgid "Keep in mind that editing any event (either directly or indirectly through an attribute) will unpublish it, meaning that you'll have to publish it (through the event view) again once you are done."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:302
+msgid "As described earlier, users with tagging rights can arbitrarily tag events using tags chosen from a pool of available options. If you have tagging privileges and would like to create a new tag, navigate to Event Actions - Add Tag. You'll be presented with the following form"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:303
+msgid "Enter a name for the tag and click on the color field to be able to pick a colour for it."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:304
+msgid "Fill out the following fields"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:306
+msgid "Pick a name for the tag. Try to use consistent naming conventions across your instance, to avoid confusion."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:307
+msgid "Colour"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:307
+msgid "You can choose a colour for the tag by clicking on the colour field and using the colour picker tool. Try to avoid having duplicate or similar looking colours to help avoid confusion."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:311
+msgid "Newer users can easily be overwhelmed by having to manually populate events with attributes without any guidance. What sort of information should go into the event? What should be the category and type of a C2 IP? Templates allow users to use simple forms to populate events."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:312
+msgid "Even though MISP ships with a few default templates, it is possible for users (with the appropriate templating privilege) to create new templates for their users or for all users of the instance. Let's look at how you can create a template."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:313
+msgid "First go to Event Actions - Add Template to go to the event creation view."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:314
+#: View/Templates/add.ctp:6
+msgid "Create Template"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:314
+msgid "Fill in the generic information about the template."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:315;325;338;349
+msgid "The following fields have to be filled out"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:317
+msgid "The name of the template should describe what type of an event it should be used to generate attributes."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:318
+msgid "You can attach tags to the template - an event populated using the template would automatically receive the tag(s). Add new tags using the + button. If you change your mind about a tag you can remove it with the cross next to the tag name."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:319
+msgid "A short description about the events that this template should be used for."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:320
+#: View/Templates/add.ctp:44
+#: View/Templates/edit.ctp:44
+msgid "Share this template with others"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:320
+msgid "The template can be set to be usable by any organisation on the instance or only by the one that has created it."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:322
+msgid "Once the skeleton template is created, you can start populating the template with data. There are 3 types of elements that can be used during the creation of a template: attribute, file and text elements. Text elements divide the template into sections with an information field, followed by all of the attribute/file fields until a new text field is read. Don't worry about the order of the elements during creation, they can be re-arranged using drag &amp; drop. Let's look at the 3 element types"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:323
+msgid "Attribute Element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:324
+msgid "Template Attribute Element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:324
+msgid "This element will generate regular attributes based on user entry."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:327;340
+msgid "The field name that will be presented to the user."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:328;341
+msgid "A brief description of the element. Make sure that you provide sufficient information to the user to make it obvious what is expected."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:329
+msgid "The category used for any attributes created using this template element."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:330
+msgid "The type or complex type used for any attributes created using this template element. Complex types allow for several related types to be used on data entry. For example, a \"file\" complex type element allows for filenames and hashes."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:331
+msgid "Use Complex types"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:331
+msgid "If the category permits it, switch to a complex type using this checkbox."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:332
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:63
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:60
+msgid "Automatically mark for IDS"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:332
+msgid "If checked, any attributes generated using this element will be marked for IDS exporting."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:333;344
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:72
+#: View/TemplateElements/ajax/template_element_add_file.ctp:48
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:48
+msgid "Mandatory element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:333
+msgid "If the elemnt is marked as mandatory, then the template form can only be submitted by users if this field is filled out."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:334;345
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:81
+#: View/TemplateElements/ajax/template_element_add_file.ctp:57
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:76
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:57
+msgid "Batch import element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:334
+msgid "Allow for multiple values to be entered (separated by line breaks)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:336
+msgid "File Element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:337
+msgid "Template File Element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:337
+msgid "This element will generate attachments based on user entry."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:342
+msgid "The category to be used by all attachments uploaded through this element."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:343
+msgid "If the uploaded files are malicious and should be encrypted and password protected, mark this checkbox."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:344
+msgid "If it should be required to upload an attachment, check this checkbox."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:345
+msgid "Ticking this checkbox allows users to upload several files using this element."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:347
+msgid "Text Element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:348
+msgid "Template Text Element"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:348
+msgid "This element will start a section in the template, which continues until the next text element or the end of the template."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:351
+msgid "The name of the section that will be presented to the user."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:352
+msgid "The description of the section. Explain briefly to the user what the following attribute/file elements will be dealing with. There are several ways to split a template into sections, try to have ease of use in mind while creating it."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:355
+msgid "Contacting the reporter"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:356
+msgid "To get in touch with the reporter of a previously registered event, just find the event for which you would like to contact the reporter by either finding it on the list of events, by finding it through one of its attributes or by finding it through a related event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:357
+msgid "Once the event is found and the event view opened, click the button titled \"Contact Reporter\". This will bring up a view where you can enter your message that is to be e-mailed to all members of the reporting organisation that subscribe to receiving such reports or the reporting user himself. Along with your message, the detailed information about the event in question will be included in the e-mail."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:358
+msgid "Enter your message to the reporter and choose whether his/her entire organisation should get the message or not by ticking the check-box."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:359
+msgid "By default, the message will be sent to every member of the organisation that posted the event in the first place, but if you tick the check-box below the message field before sending the mail, only the person that reported the event will get e-mailed."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:362
+msgid "It is possible to quickly and conveniently export the data contained within the system using the automation features located in the main menu on the left (available to users with authentication key access only). There are various sets of data that can be exported, by using the authentication key provided by the system (also shown on the export page). If for whatever reason you would need to invalidate your current key and get a new one instead (for example due to the old one becoming compromised) just hit the reset link next to the authentication key in the export view or in your \"my profile\" view."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:363
+msgid "To find out about the various export formats and the usage within the automation functions, please read the page on <a href=\"%s/events/automation\">automation</a>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:366
+msgid "For users that do not have authentication key access, an alternate export feature is available that relies on your interactive login to the site. To access these, just use the export menu button to the left and you'll be presented with a list of export options."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:367
+msgid "Depending on your server's configuration, you will be presented with one of two possible pages, depending on whether you have background processing enabled or not. (The setting on this instance is currently set to: <code>%s</code>)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:367
+msgid "On"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:367
+msgid "Off"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:368;371
+msgid "Export page with background jobs"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:369
+msgid "The page will list a set of export formats that you can immediately download as a file. Just click on the desired export format and MISP will start collecting all the data that you will receive in a file. Keep in mind that this can be a lengthy process. To avoid having to wait, consult with your instance's site administrator about enabling the background processing."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:370;384
+msgid "Use the export features here to quickly download data in various formats"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:372
+msgid "If the background jobs are enabled, you'll be redirected to a different version of the export page. Here you will see a table with all of the major export formats and the current status of the cached export files. Keep in mind that these are generated on an organisation by organisation basis, so even though others have generated newer export caches your organisation may have an outdated cache. You can simply issue a generate command (by clicking the \"Generate\" button) on the desired export type and the background workers will start fetching and assembling your cache. A progress bar will show the progress of the export process."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:373
+msgid "Once done, you can click \"Download\" to download the freshly generated cache file. If the cache is already up to date from before, then you don't have to regenerate the cache, just click on the \"download\" button."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:374
+msgid "You may have noticed that the TEXT export only has a generate button - this is because TEXT exports are made up of a lot of types of exports, all of which get generated together. To download any of these files, just click on any of the attribute types at the bottom of the table."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:375
+msgid "A quick description of each of the fields in the table"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:377
+msgid "The type of the export (such as XML, Suricata, MD5, etc.)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:378
+msgid "The generation date of the current cache for the given export type."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:379
+msgid "A description of the export format."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:380
+msgid "This compares the cache generation date to the last timestamp when an event was updated and lets you know whether the cache is outdated or not."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:381
+msgid "Shows the progress of the last initiated generation process."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:382
+msgid "Download or Generate the given cache with these buttons."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:385
+msgid "Exporting search results and individual events"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:386
+msgid "Apart from the options offered by the export pages, it's also possible to export all events involved in a search attribute result table, by using the \"Download results as XML\" button on the left menu bar."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:387
+msgid "Download a .xml from all the events that are shown through an attribute in the search results."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:388
+msgid "Each event's view has its own export feature, both as an XML export and as a .ioc file. To reach these features, just navigate to an event and use the appropriate buttons on the right side."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:389
+msgid "Download a .xml or a .ioc of the event."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:391
+msgid "Connecting to other instances"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:392
+msgid "Apart from being a self contained repository of attacks/malware, one of the main features of MISP is its ability to connect to other instances and share (parts of) its information. The following options allow you to set up and maintain such connections."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:393
+msgid "Setting up a connection to another server"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:394
+msgid "In order to share data with a remote server via pushes and pulls, you need to request a valid authentication key from the hosting organisation of the remote instance. When clicking on List Servers and then on New Server, a form comes up that needs to be filled out in order for your instance to connect to it. The following fields need to be filled out"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:395
+msgid "Add server"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:395
+msgid "Make sure that you enter the authentication key that you have been given by the hosting organisation of the remote instance, instead of the one you have gotten from this one."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:397
+#: View/Servers/add.ctp:8
+#: View/Servers/edit.ctp:8
+msgid "Base URL"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:397
+msgid "The URL of the remote server."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:398
+msgid "Organization"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:398
+msgid "The organisation that runs the remote server. It is very impoportant that this setting is filled out exactly as the organisation name set up in the bootstrap file of the remote instance."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:399
+msgid "The authentication key that you have received from the hosting organisation of the remote instance."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:400
+msgid "This check-box controls whether your server is allowed to push to the remote instance."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:401
+msgid "This check-box controls whether your server can request to pull all data from the remote instance."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:402
+msgid "Unpublish event (Push only)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:402
+msgid "This check-box controls to unpublish new event (working with Push events)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:403
+msgid "Publish without email (Pull only)"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:403
+msgid "This check-box controls whether your server is allowed to publish event without email (working with Pull events)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:404
+msgid "Self Signed"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:404
+msgid "Ticking this checkbox will allow syncing with instances using self-signed certificates."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:405
+msgid "Certificate File"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:405
+msgid "If the instance that you want to connect to has their entire own certificate chain, you can use this to import a .pem file with it and override CakePHP's standard root CA file."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:407
+msgid "If you are an administrator</b>, trying to allow another instance to connect to your own, it is vital that two rules are followed when setting up a synchronisation account"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:409
+msgid "The synchronisation user has to have the sync permission and full read/write/publish privileges turned on"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:410
+msgid "Both the sync user and the organisation setting in your instance's Config/bootstrap.php file have to match the organisation identifier of the hosting organisation."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:412
+msgid "Browsing the currently set up server connections and interacting with them"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:413
+msgid "If you ever need to change the data about the linked servers or remove any connections, you have the following options to view and manipulate the server connections, when clicking on List Servers: (you will be able to see a list of all servers that your server connects to, including the base address, the organisation running the server the last pushed and pulled event IDs and the control buttons.)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:414
+msgid "Apart from editing / deleting the link to the remote server, you can issue a push all or pull all command from here."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:416
+msgid "Editing the connection to the"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:416
+msgid "By clicking edit a view, <a href=#new_server>that is identical to the new instance view</a>, is loaded, with all the current information of the instance pre-entered."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:417
+msgid "Deleting the connection to the instance"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:417
+msgid "Clicking the delete button will delete the link to the instance."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:418
+#: View/Servers/index.ctp:128
+msgid "Push all"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:418
+msgid " By clicking this button, all events that are eligible to be pushed on the instance you are on will start to be pushed to the remote instance. Events and attributes that exist on the far end will be updated."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:419
+#: View/Servers/index.ctp:125
+msgid "Pull all"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:419
+msgid "By clicking this button, all events that are set to be pull-able or full access on the remote server will be copied to this instance. Existing events will not be updated."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:423
+msgid "The platform is also <a href=\"http://en.wikipedia.org/wiki/Representational_state_transfer\">RESTfull</a>, so this means that you can use structured format (XML or JSON) to access Events data."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:424
+msgid "Requests"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:425
+msgid "Use any HTTP compliant library to perform requests."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:426
+msgid "You can choose which format you would like to use as input/output for the REST calls by specifying the Accept and Content-Type headers."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:427
+msgid "The following headers are required if you wish to recieve / push XML data"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:431
+msgid "The following headers are required if you wish to receive / push JSON data"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:435
+msgid "The following table shows the relation of the request type and the resulting action"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:444
+msgid "HTTP format"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:446
+msgid "Controller action invoked"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:476
+msgid "(1) Warning, there's a limit on the number of results when you call <code>index</code>."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:477
+msgid "(2) Attachments are included using base64 encoding below the <code>data</code> tag."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:480
+msgid "Example - Get single Event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:481
+msgid "In this example we fetch the details of a single Event (and thus also his Attributes)."
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:482
+msgid "The request should be"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:484
+msgid "And with the HTTP Headers"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:487;548
+msgid "The response you're going to get is the following data"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:495;596
+msgid "Code monkey doing code monkey stuff"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:509;581
+msgid "Artifacts dropped"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:515;544
+msgid "This is an Attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:516;545;588
+msgid "Some_attribute"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:525
+msgid "Example - Add new Event"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:526
+msgid "In this example we want to add a single Event.<br/>\n"
+"The request should be"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:531
+msgid "And the request body"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:535;567
+msgid "Something concise"
+msgstr ""
+
+#: View/Pages/doc/using_the_system.ctp:613
+msgid "The response from requesting an invalid page"
+msgstr ""
+
+#: View/Posts/add.ctp:10;16
+#: View/Posts/edit.ctp:6
+msgid "Thread Subject"
+msgstr ""
+
+#: View/Posts/add.ctp:24
+msgid "In response to"
+msgstr ""
+
+#: View/Regexp/admin_add.ctp:4
+msgid "Add Import Regexp"
+msgstr ""
+
+#: View/Regexp/admin_add.ctp:10
+#: View/Regexp/admin_edit.ctp:11
+msgid "Types to be affected by the filter (Setting 'all' will override the other settings)"
+msgstr ""
+
+#: View/Regexp/admin_edit.ctp:4
+msgid "Edit Import Regexp"
+msgstr ""
+
+#: View/Roles/admin_add.ctp:9
+#: View/Roles/admin_edit.ctp:9
+msgid "Restrict to site admins"
+msgstr ""
+
+#: View/Roles/admin_add.ctp:19
+#: View/Roles/admin_edit.ctp:18
+msgid "Memory limit"
+msgstr ""
+
+#: View/Roles/admin_add.ctp:20
+#: View/Roles/admin_edit.ctp:19
+msgid "Maximum execution time"
+msgstr ""
+
+#: View/Roles/index.ctp:36
+msgid "ok"
+msgstr ""
+
+#: View/Roles/index.ctp:36
+msgid "remove"
+msgstr ""
+
+#: View/Roles/view.ctp:5
+msgid "Permission level"
+msgstr ""
+
+#: View/Servers/add.ctp:4
+msgid "Add Server"
+msgstr ""
+
+#: View/Servers/add.ctp:6
+#: View/Servers/edit.ctp:6
+msgid "Instance identification"
+msgstr ""
+
+#: View/Servers/add.ctp:11
+#: View/Servers/edit.ctp:11
+msgid "Instance name"
+msgstr ""
+
+#: View/Servers/add.ctp:17
+msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change."
+msgstr ""
+
+#: View/Servers/add.ctp:20
+#: View/Servers/edit.ctp:20
+msgid "Internal instance"
+msgstr ""
+
+#: View/Servers/add.ctp:30
+#: View/Servers/edit.ctp:31
+msgid "Instance ownership and credentials"
+msgstr ""
+
+#: View/Servers/add.ctp:31
+#: View/Servers/edit.ctp:32
+msgid "Information about the organisation that will receive the events, typically the remote instance's host organisation."
+msgstr ""
+
+#: View/Servers/add.ctp:37
+msgid "Remote Sync Organisation Type"
+msgstr ""
+
+#: View/Servers/add.ctp:42
+#: View/Servers/edit.ctp:43
+msgid "External Organisation"
+msgstr ""
+
+#: View/Servers/add.ctp:48
+msgid "Owner of remote instance"
+msgstr ""
+
+#: View/Servers/add.ctp:54
+#: View/Servers/edit.ctp:65
+msgid "Remote Organisation's Name"
+msgstr ""
+
+#: View/Servers/add.ctp:58
+#: View/Servers/edit.ctp:69
+msgid "Remote Organisation's Uuid"
+msgstr ""
+
+#: View/Servers/add.ctp:67
+#: View/Servers/edit.ctp:78
+msgid "Enabled synchronisation methods"
+msgstr ""
+
+#: View/Servers/add.ctp:86
+msgid "Server certificate file"
+msgstr ""
+
+#: View/Servers/add.ctp:92
+msgid "Client certificate file"
+msgstr ""
+
+#: View/Servers/add.ctp:97
+#: View/Servers/edit.ctp:142
+msgid "Push rules:"
+msgstr ""
+
+#: View/Servers/add.ctp:98;104
+#: View/Servers/edit.ctp:143;149
+msgid "Events with the following tags allowed: "
+msgstr ""
+
+#: View/Servers/add.ctp:99;105
+#: View/Servers/edit.ctp:144;150
+msgid "Events with the following tags blocked: "
+msgstr ""
+
+#: View/Servers/add.ctp:100;106
+#: View/Servers/edit.ctp:145;151
+msgid "Events with the following organisations allowed: "
+msgstr ""
+
+#: View/Servers/add.ctp:101;107
+#: View/Servers/edit.ctp:146;152
+msgid "Events with the following organisations blocked: "
+msgstr ""
+
+#: View/Servers/add.ctp:103
+#: View/Servers/edit.ctp:148
+msgid "Pull rules:"
+msgstr ""
+
+#: View/Servers/add.ctp:131
+#: View/Servers/edit.ctp:179
+msgid "The base-url to the external server you want to sync with. Example: https://foo.sig.mil.be"
+msgstr ""
+
+#: View/Servers/add.ctp:137
+msgid "Unpublish new event (working with Pull event)."
+msgstr ""
+
+#: View/Servers/add.ctp:138
+msgid "Publish new event without email (working with Push event)."
+msgstr ""
+
+#: View/Servers/add.ctp:139
+msgid "You can also upload a certificate file if the instance you are trying to connect to has its own signing authority.  (*.pem)"
+msgstr ""
+
+#: View/Servers/edit.ctp:17
+msgid "You can set this instance up as an internal instance by checking the checkbox below. This means that any synchronisation between this instance and the remote will not be automatically degraded as it would in a normal synchronisation scenario. Please make sure that you own both instances and that you are OK with this otherwise dangerous change. This also requires that the current instance's host organisation and the remote sync organisation are the same."
+msgstr ""
+
+#: View/Servers/edit.ctp:37
+msgid "Organisation Type"
+msgstr ""
+
+#: View/Servers/edit.ctp:54
+msgid "Local Organisation"
+msgstr ""
+
+#: View/Servers/edit.ctp:75
+msgid "Leave empty to use current key"
+msgstr ""
+
+#: View/Servers/edit.ctp:99
+msgid "Server certificate file (*.pem): "
+msgstr ""
+
+#: View/Servers/edit.ctp:107;129
+msgid "Add certificate file"
+msgstr ""
+
+#: View/Servers/edit.ctp:108;130
+msgid "Remove certificate file"
+msgstr ""
+
+#: View/Servers/edit.ctp:121
+msgid "Client certificate file: "
+msgstr ""
+
+#: View/Servers/edit.ctp:188
+msgid "You can also upload a client certificate file if the instance you are trying to connect requires this."
+msgstr ""
+
+#: View/Servers/edit.ctp:245;249
+msgid "Not set."
+msgstr ""
+
+#: View/Servers/filter_event_index.ctp:6
+msgid "Please enter the url parameters that are to be used for the request. Valid parameters are: "
+msgstr ""
+
+#: View/Servers/filter_event_index.ctp:8
+msgid "Example:"
+msgstr ""
+
+#: View/Servers/filter_event_index.ctp:21
+msgid "Apply filters to the remote instance's index"
+msgstr ""
+
+#: View/Servers/index.ctp:2
+msgid "Servers"
+msgstr ""
+
+#: View/Servers/index.ctp:23
+msgid "Connection test"
+msgstr ""
+
+#: View/Servers/index.ctp:31
+msgid "Remote Organisation"
+msgstr ""
+
+#: View/Servers/index.ctp:72
+msgid "Test the connection to the remote instance"
+msgstr ""
+
+#: View/Servers/index.ctp:72
+msgid "Run"
+msgstr ""
+
+#: View/Servers/index.ctp:73
+msgid "Internal instance that ignores distribution level degradation *WARNING: Only use this setting if you have several internal instances and the sync link is to an internal extension of the current MISP community*"
+msgstr ""
+
+#: View/Servers/index.ctp:73
+msgid "Normal sync link to an external MISP instance. Distribution degradation will follow the normal rules."
+msgstr ""
+
+#: View/Servers/index.ctp:122
+msgid "Explore"
+msgstr ""
+
+#: View/Servers/index.ctp:124
+msgid "Pull updates to events that already exist locally"
+msgstr ""
+
+#: View/Servers/index.ctp:131
+msgid "Cache instance"
+msgstr ""
+
+#: View/Servers/preview_event.ctp:7
+msgid "You are currently viewing an event on the remote instance %s "
+msgstr ""
+
+#: View/Servers/preview_event.ctp:31
+msgid "Filter the remote instance by tag: %s"
+msgstr ""
+
+#: View/Servers/preview_event.ctp:31
+msgid "Filter the remote instance on the tag: %s"
+msgstr ""
+
+#: View/Servers/preview_index.ctp:3
+msgid "You are currently viewing the event index of the remote instance %s"
+msgstr ""
+
+#: View/Servers/preview_index.ctp:112
+msgid "not "
+msgstr ""
+
+#: View/Servers/preview_index.ctp:112
+msgid "published"
+msgstr ""
+
+#: View/Servers/preview_index.ctp:173
+msgid "Fetch the event"
+msgstr ""
+
+#: View/Servers/pull.ctp:2
+msgid "Failed pulls"
+msgstr ""
+
+#: View/Servers/pull.ctp:5
+msgid "No failed pulls"
+msgstr ""
+
+#: View/Servers/pull.ctp:13
+msgid "Succeeded pulls"
+msgstr ""
+
+#: View/Servers/pull.ctp:16
+msgid "No succeeded pulls"
+msgstr ""
+
+#: View/Servers/pull.ctp:24
+msgid "Proposals pulled"
+msgstr ""
+
+#: View/Servers/pull.ctp:27
+msgid "No proposals pulled"
+msgstr ""
+
+#: View/Servers/push.ctp:2
+msgid "Failed pushes"
+msgstr ""
+
+#: View/Servers/push.ctp:5
+msgid "No failed pushes"
+msgstr ""
+
+#: View/Servers/push.ctp:13
+msgid "Succeeded pushes"
+msgstr ""
+
+#: View/Servers/push.ctp:16
+msgid "No succeeded pushes"
+msgstr ""
+
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
+msgid "Relative path to query"
+msgstr ""
+
+#: View/Servers/rest.ctp:116
+msgid "Response code"
+msgstr ""
+
+#: View/Servers/rest.ctp:117
+msgid "Request duration"
+msgstr ""
+
+#: View/Servers/rest.ctp:118
+msgid "Headers"
+msgstr ""
+
+#: View/Servers/server_settings.ctp:3
+msgid "Warning: app/Config/config.php is not writeable. This means that any setting changes made here will NOT be saved."
+msgstr ""
+
+#: View/Servers/server_settings.ctp:20
+msgid "To edit a setting, simply double click it."
+msgstr ""
+
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:2
+msgid "Select instances to add"
+msgstr ""
+
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:7
+msgid "Available Instances"
+msgstr ""
+
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:21
+msgid "Added Instances"
+msgstr ""
+
+#: View/Servers/ajax/fetch_servers_for_sg.ctp:26
+msgid "Add servers to sharing group"
+msgstr ""
+
+#: View/Servers/ajax/update.ctp:7
+msgid "Do you want to pull the latest commit from the <?php echo h($branch); ?> branch? If you have made local changes to MISP the merge will fail."
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:2
+msgid "ZeroMQ Server Status"
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:5
+msgid "Start time"
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:6
+msgid "Settings read at"
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:7
+msgid "Events processed"
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:9
+msgid "The ZeroMQ server is unreachable."
+msgstr ""
+
+#: View/Servers/ajax/zeromqstatus.ctp:11
+msgid "Cancel prompt"
+msgstr ""
+
+#: View/ShadowAttributes/add.ctp:4
+#: View/ShadowAttributes/edit.ctp:4
+msgid "Add Proposal"
+msgstr ""
+
+#: View/ShadowAttributes/add.ctp:52;65
+#: View/ShadowAttributes/add_attachment.ctp:35
+#: View/ShadowAttributes/edit.ctp:51
+msgid "Propose"
+msgstr ""
+
+#: View/ShadowAttributes/edit.ctp:41
+msgid "IDS Signature?"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:24
+msgid "My Org's Events"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:29
+msgid "All Events"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:43
+msgid "Proposal by"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:49
+msgid "Event creator"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:55
+msgid "Proposed value"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:81
+msgid "Attribute edit"
+msgstr ""
+
+#: View/ShadowAttributes/index.ctp:83
+msgid "New Attribute"
+msgstr ""
+
+#: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:7
+msgid "Are you sure you want to propose to delete Attribute #%s?"
+msgstr ""
+
+#: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
+msgid "Propose to delete attribute"
+msgstr ""
+
+#: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:5
+msgid "Proposal Deletion"
+msgstr ""
+
+#: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:7
+msgid "Are you sure you want to delete Proposal #%s?"
+msgstr ""
+
+#: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
+msgid "Delete proposal"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:3
+msgid "New Sharing Group"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
+msgid "General"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
+msgid "Organisations tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
+msgid "MISP Instances"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
+msgid "Summary and Save"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
+msgid "Example: Multinational sharing group"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
+msgid "Releasable to"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
+msgid "Example: Community1, Organisation1, Organisation2"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
+msgid "A description of the sharing group."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
+msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
+msgid "Make the sharing group selectable (active)"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
+msgid "Next page"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
+msgid "Add local organisation(s) to the sharing group"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
+msgid "Add local organisation"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
+msgid "Add remote organisations to the sharing group"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
+msgid "Add remote organisation"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
+#: View/SharingGroups/view.ctp:44
+msgid "Extend"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
+msgid "Previous page"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
+msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
+msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
+msgid "Add instance"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
+#: View/SharingGroups/view.ctp:69
+msgid "All orgs"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:103
+msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:104
+msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:105
+msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:106
+msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
+msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
+msgstr ""
+
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
+msgid "Submit and create sharing group"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:135
+msgid "Local instance"
+msgstr ""
+
+#: View/SharingGroups/edit.ctp:111
+msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
+"                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
+"                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
+msgstr ""
+
+#: View/SharingGroups/edit.ctp:114
+msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:2
+msgid "Sharing Groups"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:26
+msgid "Active Sharing Groups"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:31
+msgid "Passive Sharing Groups"
+msgstr ""
+
+#: View/SharingGroups/index.ctp:80
+msgid "Distribution List"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:12
+msgid "Selectable"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:28
+msgid "Synced by"
+msgstr ""
+
+#: View/SharingGroups/view.ctp:68
+msgid "Url"
+msgstr ""
+
+#: View/Sightings/ajax/add_sighting.ctp:11
+msgid "honeypot, IDS sensor id, SIEM,…"
+msgstr ""
+
+#: View/Sightings/ajax/add_sighting.ctp:15
+msgid "Sighting date"
+msgstr ""
+
+#: View/Sightings/ajax/advanced.ctp:2
+msgid "Sighting details"
+msgstr ""
+
+#: View/Sightings/ajax/advanced.ctp:4
+msgid "Graph"
+msgstr ""
+
+#: View/Sightings/ajax/advanced.ctp:6
+msgid "My org"
+msgstr ""
+
+#: View/Sightings/ajax/list_sightings.ctp:10
+msgid "Attribute ID"
+msgstr ""
+
+#: View/Sightings/ajax/list_sightings.ctp:35
+msgid "Delete sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:5
+msgid "Add Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
+msgstr ""
+
+#: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
+msgid "Remove Sighting"
+msgstr ""
+
+#: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:7
+msgid "Remove sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
+msgid "Remove sighting"
+msgstr ""
+
+#: View/TagCollections/add.ctp:8
+msgid "Edit Tag Collection"
+msgstr ""
+
+#: View/TagCollections/add.ctp:16
+msgid "Visible to all orgs"
+msgstr ""
+
+#: View/TagCollections/import.ctp:4
+msgid "Paste tag collection data"
+msgstr ""
+
+#: View/TagCollections/import.ctp:5
+msgid "Paste a MISP tag collection JSON below to add tag collections."
+msgstr ""
+
+#: View/TagCollections/import.ctp:10
+msgid "Tag collection JSON"
+msgstr ""
+
+#: View/Tags/add.ctp:12
+#: View/Tags/edit.ctp:12
+msgid "Restrict tagging to org"
+msgstr ""
+
+#: View/Tags/add.ctp:17
+#: View/Tags/edit.ctp:17
+msgid "Restrict tagging to user"
+msgstr ""
+
+#: View/Tags/edit.ctp:31
+msgid "Unselectable Tag"
+msgstr ""
+
+#: View/Tags/index.ctp:10
+msgid "Your Favourite Tags"
+msgstr ""
+
+#: View/Tags/index.ctp:56
+msgid "Filter user tags"
+msgstr ""
+
+#: View/Tags/index.ctp:66
+msgid "Restricted to org"
+msgstr ""
+
+#: View/Tags/index.ctp:68
+msgid "Restricted to user"
+msgstr ""
+
+#: View/Tags/index.ctp:70
+msgid "Taxonomy"
+msgstr ""
+
+#: View/Tags/index.ctp:71
+msgid "Tagged events"
+msgstr ""
+
+#: View/Tags/index.ctp:72
+msgid "Tagged attributes"
+msgstr ""
+
+#: View/Tags/index.ctp:74
+msgid "Favourite"
+msgstr ""
+
+#: View/Tasks/index.ctp:4
+msgid "Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks."
+msgstr ""
+
+#: View/Tasks/index.ctp:5
+msgid "Warning: Scheduled tasks come with a lot of caveats and little in regards of customisations / granularity. You can instead simply create cron jobs out of the console commands as described here: "
+msgstr ""
+
+#: View/Tasks/index.ctp:55
+msgid "Set frequency timer for scheduled task"
+msgstr ""
+
+#: View/Tasks/index.ctp:96
+msgid "Update all"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:2
+msgid "Taxonomies"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:26
+msgid "Active Tags"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:36
+msgid "enable all"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:36
+msgid "Enable all tags"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:36
+msgid "Are you sure you want to enable every tag associated to this taxonomy?"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:41
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
+msgid "Disable"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:41
+#: View/Taxonomies/view.ctp:29
+msgid "Are you sure you want to disable this taxonomy library?"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:43
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
+msgid "Enable"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:43
+#: View/Taxonomies/view.ctp:31
+msgid "Are you sure you want to enable this taxonomy library?"
+msgstr ""
+
+#: View/Taxonomies/index.ctp:48
+msgid "Delete taxonomy"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:62
+msgid "Create and/or update selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
+msgid "Hidden"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:137
+msgid "View graph"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:154
+msgid "Refresh"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:159
+msgid "Refresh or enable"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:9
+msgid "Taxonomy Deletion"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Taxonomy #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the taxonomy at any time by updating your taxonomies."
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:13
+msgid "Create Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:15
+msgid "Are you sure you want to create / update all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+msgid "Create / update all selected taxonomy entries as tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+msgid "Create / update all taxonomy entries as tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
+#: View/TemplateElements/ajax/ajaxIndex.ctp:2
+msgid "Template Elements"
+msgstr ""
+
+#: View/TemplateElements/ajax/ajaxIndex.ctp:11
+msgid "Add a new template element"
+msgstr ""
+
+#: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:5
+msgid "Template Element Deletion"
+msgstr ""
+
+#: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:7
+msgid "Are you sure you want to delete Template Element #%s?"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:5
+msgid "Add Attribute Element To Template"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:29
+#: View/TemplateElements/ajax/template_element_add_file.ctp:29
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:29
+msgid "Select Category"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:37
+msgid "Select Type"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:43
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:42
+msgid "Some categories can use complex types. A complex type can define attributes that can be described by various different types, the system will parse the user's entry and determine the most suitable type for the found attributes. The list of valid types for the chosen complex type is shown below."
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:47
+msgid "Use complex types"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:55
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:53
+msgid "Types allowed based on the above setting"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:59
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:57
+msgid "When checked, attributes created using this element will automatically be marked for IDSes."
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:68
+#: View/TemplateElements/ajax/template_element_add_file.ctp:44
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:65
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:44
+msgid "This setting will make this element mandatory."
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:77
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:73
+msgid "If this checkbox is checked, then the resulting field in the form will allow several values to be entered (separated by a linebreak)."
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
+msgid "Add attribute element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:2
+#: View/Templates/ajax/template_choices.ctp:2
+msgid "Choose element type"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:3
+msgid "Add an attribute element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:4
+msgid "Add a file element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_choices.ctp:5
+msgid "Add a text description to the elements that follow"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_file.ctp:5
+msgid "Add File Element To Template"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_file.ctp:34
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:34
+msgid "If a file is flagged as malicious then it will automatically be encrypted."
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_file.ctp:53
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:53
+msgid "If this checkbox is checked, then the resulting field in the form will allow several files to be uploaded."
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_file.ctp:67
+msgid "Submit the file element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_text.ctp:5
+#: View/TemplateElements/ajax/template_element_edit_text.ctp:5
+msgid "Add Text Element To Template"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_add_text.ctp:29
+msgid "Add text description element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:5
+msgid "Edit Attribute Element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:86
+msgid "Submit attribute element changes"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:5
+msgid "Edit File Element"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:67
+msgid "Submit file element changes"
+msgstr ""
+
+#: View/TemplateElements/ajax/template_element_edit_text.ctp:29
+msgid "Submit description changes"
+msgstr ""
+
+#: View/Templates/add.ctp:41
+#: View/Templates/edit.ctp:41
+msgid "A description of the template"
+msgstr ""
+
+#: View/Templates/add.ctp:49
+msgid "Create"
+msgstr ""
+
+#: View/Templates/index.ctp:2
+msgid "Templates"
+msgstr ""
+
+#: View/Templates/index.ctp:45
+msgid "Are you sure you want to delete Template #"
+msgstr ""
+
+#: View/Templates/populate_event_from_template_attributes.ctp:2
+msgid "Populate From Template Results"
+msgstr ""
+
+#: View/Templates/populate_event_from_template_attributes.ctp:3
+msgid "Below you can see the attributes that are to be created based on the data that you have entered into the template. If you are satisfied with the result, click \"Finalise\". Otherwise, click \"Modify\"."
+msgstr ""
+
+#: View/Templates/populate_event_from_template_attributes.ctp:37
+msgid "Finalise"
+msgstr ""
+
+#: View/Templates/upload_file.ctp:3
+msgid "Upload Files"
+msgstr ""
+
+#: View/Templates/upload_file.ctp:8
+msgid "Replace File"
+msgstr ""
+
+#: View/Templates/upload_file.ctp:10
+msgid "Upload File"
+msgstr ""
+
+#: View/Templates/view.ctp:38
+msgid "Shareable"
+msgstr ""
+
+#: View/Threads/index.ctp:24
+msgid "Last Post By"
+msgstr ""
+
+#: View/Threads/index.ctp:26
+msgid "Posts"
+msgstr ""
+
+#: View/Threads/index.ctp:81
+msgid "View Discussion"
+msgstr ""
+
+#: View/Users/admin_add.ctp:4
+msgid "Admin Add User"
+msgstr ""
+
+#: View/Users/admin_add.ctp:32
+#: View/Users/admin_edit.ctp:32
+msgid "Set password"
+msgstr ""
+
+#: View/Users/admin_add.ctp:37
+msgid "Length"
+msgstr ""
+
+#: View/Users/admin_add.ctp:38
+msgid "Complexity"
+msgstr ""
+
+#: View/Users/admin_add.ctp:52
+msgid "Choose organisation"
+msgstr ""
+
+#: View/Users/admin_add.ctp:66
+#: View/Users/admin_edit.ctp:60
+msgid "Sync user for"
+msgstr ""
+
+#: View/Users/admin_add.ctp:70
+#: View/Users/admin_edit.ctp:64
+msgid "Paste the user's GnuPG key here or try to retrieve it from the MIT key server by clicking on \"Fetch GnuPG key\" below."
+msgstr ""
+
+#: View/Users/admin_add.ctp:72
+#: View/Users/admin_edit.ctp:66
+msgid "Fetch the user's GnuPG key"
+msgstr ""
+
+#: View/Users/admin_add.ctp:72
+#: View/Users/admin_edit.ctp:66
+#: View/Users/edit.ctp:25
+msgid "Fetch GnuPG key"
+msgstr ""
+
+#: View/Users/admin_add.ctp:74
+#: View/Users/admin_edit.ctp:68
+msgid "SMIME key"
+msgstr ""
+
+#: View/Users/admin_add.ctp:74
+#: View/Users/admin_edit.ctp:68
+msgid "Paste the user's SMIME public key in PEM format here."
+msgstr ""
+
+#: View/Users/admin_add.ctp:88
+#: View/Users/admin_edit.ctp:78
+msgid "Disable this user account"
+msgstr ""
+
+#: View/Users/admin_add.ctp:90
+msgid "Send credentials automatically"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:4
+msgid "Admin Edit User"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
+msgid "Terms accepted"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:74
+msgid "Reset Auth Key"
+msgstr ""
+
+#: View/Users/admin_edit.ctp:86
+#: View/Users/change_pw.ctp:18
+#: View/Users/edit.ctp:36
+msgid "Confirm with your current password"
+msgstr ""
+
+#: View/Users/admin_email.ctp:2
+msgid "Contact User(s)"
+msgstr ""
+
+#: View/Users/admin_email.ctp:6
+msgid "Messaging - here's a quick guide on how this feature works"
+msgstr ""
+
+#: View/Users/admin_email.ctp:7
+msgid "You can use this view to send messages to your current or future users or send them a temporary password."
+msgstr ""
+
+#: View/Users/admin_email.ctp:9
+msgid "When adding a new user to the system, or when you want to manually reset the password for a user, just use the \"Send temporary password\" setting."
+msgstr ""
+
+#: View/Users/admin_email.ctp:10
+msgid "After selecting the action, choose who the target of the e-mails should be (all users, a single user or a user not yet in the system)."
+msgstr ""
+
+#: View/Users/admin_email.ctp:11
+msgid "You can then specify (if eligible) what the e-mail address of the target is (for existing users you can choose from a dropdown menu)."
+msgstr ""
+
+#: View/Users/admin_email.ctp:12
+msgid "In the case of a new user, you can specify the future user's GnuPG key, to send his/her new key in an encrypted e-mail."
+msgstr ""
+
+#: View/Users/admin_email.ctp:13
+msgid "The system will automatically generate a message for you, but it is also possible to write a custom message if you tick the check-box,\n"
+"                        but don't worry about assigning a temporary password manually, the system will do that for you, right after your custom message."
+msgstr ""
+
+#: View/Users/admin_email.ctp:18
+msgid "Custom message"
+msgstr ""
+
+#: View/Users/admin_email.ctp:18
+msgid "Welcome message"
+msgstr ""
+
+#: View/Users/admin_email.ctp:18
+msgid "Reset password"
+msgstr ""
+
+#: View/Users/admin_email.ctp:19
+msgid "A single user"
+msgstr ""
+
+#: View/Users/admin_email.ctp:19
+msgid "All users"
+msgstr ""
+
+#: View/Users/admin_email.ctp:19
+msgid "All users of the same organisation"
+msgstr ""
+
+#: View/Users/admin_email.ctp:39
+msgid "Enter a custom message"
+msgstr ""
+
+#: View/Users/admin_email.ctp:73
+msgid "New user registration"
+msgstr ""
+
+#: View/Users/admin_email.ctp:73
+msgid "Password reset"
+msgstr ""
+
+#: View/Users/admin_filter_user_index.ctp:4
+msgid "Filter User Index"
+msgstr ""
+
+#: View/Users/admin_filter_user_index.ctp:81
+msgid "Remove filter"
+msgstr ""
+
+#: View/Users/admin_filter_user_index.ctp:106
+msgid "Apply filters"
+msgstr ""
+
+#: View/Users/admin_index.ctp:2
+#: View/Users/statistics.ctp:25
+#: View/Users/statistics_data.ctp:30
+#: View/Users/statistics_orgs.ctp:32
+#: View/Users/ajax/admin_index.ctp:3
+msgid "Users"
+msgstr ""
+
+#: View/Users/admin_quick_email.ctp:2
+msgid "Contact %s"
+msgstr ""
+
+#: View/Users/admin_quick_email.ctp:4
+msgid "WARNING: This user does not have an encryption key set. The security posture of this instance allows for the sending of clear-text e-mails, so this is what will happen if you proceed."
+msgstr ""
+
+#: View/Users/admin_quick_email.ctp:7
+msgid "%s key found for user, the e-mail will be sent encrypted using this key."
+msgstr ""
+
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
+msgid "Contactalert"
+msgstr ""
+
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/admin_view.ctp:44
+msgid "Invited By"
+msgstr ""
+
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
+msgstr ""
+
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr ""
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
+msgid "GnuPG fingerprint"
+msgstr ""
+
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
+msgid "GnuPG status"
+msgstr ""
+
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
+msgid "SMIME Public certificate"
+msgstr ""
+
+#: View/Users/check_and_correct_pgps.ctp:2
+msgid "Failed GnuPGs?"
+msgstr ""
+
+#: View/Users/check_and_correct_pgps.ctp:4
+msgid "No failed composites"
+msgstr ""
+
+#: View/Users/edit.ctp:27
+msgid "SMIME Public certificate (PEM format)"
+msgstr ""
+
+#: View/Users/login.ctp:37;44
+msgid "Login"
+msgstr ""
+
+#: View/Users/statistics.ctp:8
+#: View/Users/statistics_data.ctp:11
+msgid "Some statistics about this instance. The changes since the beginning of this month are noted in brackets wherever applicable"
+msgstr ""
+
+#: View/Users/statistics.ctp:21
+#: View/Users/statistics_data.ctp:26
+msgid "Correlations found"
+msgstr ""
+
+#: View/Users/statistics.ctp:23
+#: View/Users/statistics_data.ctp:28
+msgid "Proposals active"
+msgstr ""
+
+#: View/Users/statistics.ctp:29
+#: View/Users/statistics_data.ctp:40
+msgid "Discussion threads"
+msgstr ""
+
+#: View/Users/statistics.ctp:34
+#: View/Users/statistics_data.ctp:45
+msgid "Discussion posts"
+msgstr ""
+
+#: View/Users/statistics.ctp:43
+#: View/Users/statistics_data.ctp:54
+msgid "A heatmap showing user activity for each day during this month and the 4 months that preceded it. Use the buttons below to only show the heatmap of a specific organisation."
+msgstr ""
+
+#: View/Users/statistics.ctp:60
+#: View/Users/statistics_data.ctp:71
+msgid "Go left"
+msgstr ""
+
+#: View/Users/statistics.ctp:66
+#: View/Users/statistics_data.ctp:77
+msgid "Go right"
+msgstr ""
+
+#: View/Users/statistics.ctp:113
+#: View/Users/statistics_data.ctp:124
+msgid "The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings."
+msgstr ""
+
+#: View/Users/statistics.ctp:117
+#: View/Users/statistics_data.ctp:128
+msgid "The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer."
+msgstr ""
+
+#: View/Users/statistics_attackmatrix.ctp:6
+msgid "A heatmap showing the usage of ATT&CK Tactic."
+msgstr ""
+
+#: View/Users/statistics_data.ctp:32
+msgid "Users with PGP keys"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:36
+msgid "Local Organisations"
+msgstr ""
+
+#: View/Users/statistics_data.ctp:38
+msgid "Average Users / Org"
+msgstr ""
+
+#: View/Users/statistics_orgs.ctp:17
+msgid "Organisation list"
+msgstr ""
+
+#: View/Users/statistics_orgs.ctp:18
+msgid "Quick overview over the organisations residing on or known by this instance."
+msgstr ""
+
+#: View/Users/statistics_orgs.ctp:34
+msgid "Nationality"
+msgstr ""
+
+#: View/Users/statistics_orgs.ctp:36
+msgid "Sector"
+msgstr ""
+
+#: View/Users/statistics_sightings.ctp:6
+msgid "A toplist of the top sources for the sightings of your organisation."
+msgstr ""
+
+#: View/Users/statistics_sightings.ctp:10
+msgid "#Entries"
+msgstr ""
+
+#: View/Users/statistics_sightings.ctp:11
+msgid "#Sighting"
+msgstr ""
+
+#: View/Users/statistics_sightings.ctp:12
+msgid "#False-positive"
+msgstr ""
+
+#: View/Users/statistics_sightings.ctp:13
+msgid "Expiration"
+msgstr ""
+
+#: View/Users/statistics_tags.ctp:11
+msgid "A treemap of the currently used event tags. Click on any of the taxonomies to hide it and click it again to show it."
+msgstr ""
+
+#: View/Users/statistics_users.ctp:6
+msgid "User and Organisation Statistics"
+msgstr ""
+
+#: View/Users/terms.ctp:2
+msgid "MISP Terms and Conditions"
+msgstr ""
+
+#: View/Users/terms.ctp:11
+msgid "Terms and Conditions file not found."
+msgstr ""
+
+#: View/Users/terms.ctp:19
+msgid "Download Terms and Conditions"
+msgstr ""
+
+#: View/Users/terms.ctp:27
+msgid "Accept Terms"
+msgstr ""
+
+#: View/Users/verify_certificate.ctp:2
+msgid "Certificates validation"
+msgstr ""
+
+#: View/Users/verify_g_p_g.ctp:2
+msgid "GnuPG key validation"
+msgstr ""
+
+#: View/Users/ajax/emailConfirmTemplate.ctp:2
+msgid "Confirm sending"
+msgstr ""
+
+#: View/Users/ajax/emailConfirmTemplate.ctp:4
+msgid "You are about to send a mail to %s recipient(s)?"
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:2
+msgid "Choose the key that you would like to use"
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:6
+msgid "Key ID"
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:7
+msgid "Creation date"
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:8
+msgid "Associated E-mail addresses"
+msgstr ""
+
+#: View/Users/ajax/fetchpgpkey.ctp:12
+msgid "Select GnuPG key"
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:3
+msgid "WARNING: This user does not have an encryption key set. The security posture of this instance allows for the sending of clear text e-mails, so this is what will happen if you proceed."
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:8
+msgid "Send welcome message to user"
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:8
+msgid "Initiate password reset for user"
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:9
+msgid "Are you sure you want to reset the password of %s and send him/her a welcome message with the credentials?"
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:9
+msgid "Are you sure you want to reset the password of %s and send him/her the temporary credentials? "
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:22
+msgid "First time registration"
+msgstr ""
+
+#: View/Users/ajax/passwordResetConfirmationForm.ctp:27
+msgid "Submit password reset"
+msgstr ""
+
+#: View/Warninglists/index.ctp:2
+msgid "Warninglists"
+msgstr ""
+
+#: View/Warninglists/index.ctp:61
+msgid "Delete Warninglist"
+msgstr ""
+
+#: View/Warninglists/index.ctp:61
+msgid "Delete warninglist"
+msgstr ""
+
+#: View/Warninglists/view.ctp:14;16
+msgid "Accepted attribute types"
+msgstr ""
+
+#: View/Warninglists/ajax/delete_confirmation.ctp:9
+msgid "Warninglist Deletion"
+msgstr ""
+
+#: View/Warninglists/ajax/delete_confirmation.ctp:11
+msgid "Are you sure you want to delete Warninglist #%s<br /> Associated tags will not be removed. You can reload the warninglist at any time by updating your warninglists."
+msgstr ""
+
+#: View/Whitelists/admin_add.ctp:4
+msgid "Add Signature Whitelist"
+msgstr ""
+
+#: View/Whitelists/admin_edit.ctp:4
+msgid "Edit Signature Whitelist"
+msgstr ""
+
+#: View/Whitelists/admin_index.ctp:3
+#: View/Whitelists/index.ctp:3
+msgid "Regex entries (in the standard php regex /{regex}/{modifier} format) entered below will restrict matching attributes from being included in the IDS flag sensitive exports (such as NIDS exports)."
+msgstr ""
+
+#: Model/Attribute.php:validation for field event_id
+#: Model/Event.php:validation for field org_id;validation for field orgc_id;validation for field user_id
+#: Model/Server.php:validation for field org_id;validation for field lastpushedid;validation for field lastpulledid
+#: Model/ShadowAttribute.php:validation for field event_id;validation for field org_id;validation for field event_org_id
+#: Model/User.php:validation for field role_id;validation for field invited_by;validation for field newsread
+msgid "numeric"
+msgstr ""
+
+#: Model/Attribute.php:validation for field type
+#: Model/ShadowAttribute.php:validation for field type
+msgid "Options depend on the selected category."
+msgstr ""
+
+#: Model/Attribute.php:validation for field category
+#: Model/ShadowAttribute.php:validation for field category
+msgid "Options : Payload delivery, Antivirus detection, Payload installation, Files dropped ..."
+msgstr ""
+
+#: Model/Attribute.php:validation for field value
+#: Model/ShadowAttribute.php:validation for field value
+msgid "stringNotEmpty"
+msgstr ""
+
+#: Model/Attribute.php:validation for field value
+#: Model/ShadowAttribute.php:validation for field value
+msgid "Value not in the right type/format. Please double check the value or select type \"other\"."
+msgstr ""
+
+#: Model/Attribute.php:validation for field value
+msgid "A similar attribute already exists for this event."
+msgstr ""
+
+#: Model/Attribute.php:validation for field value
+msgid "Composite type found but the value not in the composite (value1|value2) format."
+msgstr ""
+
+#: Model/Attribute.php:validation for field value
+msgid "maxTextLength"
+msgstr ""
+
+#: Model/Attribute.php:validation for field to_ids
+#: Model/Event.php:validation for field published
+#: Model/Server.php:validation for field push;validation for field pull
+#: Model/ShadowAttribute.php:validation for field to_ids;validation for field proposal_to_delete
+#: Model/User.php:validation for field autoalert;validation for field contactalert;validation for field change_pw;validation for field termsaccepted
+msgid "boolean"
+msgstr ""
+
+#: Model/Attribute.php:validation for field uuid
+#: Model/Event.php:validation for field uuid;validation for field extends_uuid
+#: Model/EventBlacklist.php:validation for field event_uuid
+#: Model/MispObject.php:validation for field uuid
+#: Model/OrgBlacklist.php:validation for field org_uuid
+#: Model/Organisation.php:validation for field uuid
+#: Model/ShadowAttribute.php:validation for field uuid
+#: Model/SharingGroup.php:validation for field uuid
+msgid "Please provide a valid UUID"
+msgstr ""
+
+#: Model/Attribute.php:validation for field uuid
+#: Model/MispObject.php:validation for field uuid
+msgid "The UUID provided is not unique"
+msgstr ""
+
+#: Model/Attribute.php:validation for field distribution
+msgid "Options: Your organisation only, This community only, Connected communities, All communities, Sharing group, Inherit event"
+msgstr ""
+
+#: Model/AttributeTag.php:validation for field attribute_id;validation for field tag_id
+#: Model/Event.php:validation for field org_id;validation for field orgc_id;validation for field info
+#: Model/EventDelegation.php:validation for field event_id;validation for field org_id
+#: Model/EventTag.php:validation for field event_id;validation for field tag_id
+#: Model/FavouriteTag.php:validation for field user_id;validation for field tag_id
+#: Model/News.php:validation for field message;validation for field title
+#: Model/ObjectRelationship.php:validation for field name
+#: Model/Organisation.php:validation for field name;validation for field uuid
+#: Model/Role.php:validation for field name
+#: Model/ServerTag.php:validation for field server_id;validation for field tag_id
+#: Model/SharingGroup.php:validation for field name
+#: Model/Tag.php:validation for field name;validation for field colour
+#: Model/TagCollection.php:validation for field name
+#: Model/TemplateElementAttribute.php:validation for field name;validation for field description
+#: Model/ThreatLevel.php:validation for field name;validation for field description;validation for field form_description
+#: Model/User.php:validation for field org_id;validation for field authkey
+#: Model/Whitelist.php:validation for field name
+msgid "valueNotEmpty"
+msgstr ""
+
+#: Model/Event.php:validation for field date
+msgid "Expected date format: YYYY-MM-DD"
+msgstr ""
+
+#: Model/Event.php:validation for field threat_level_id
+msgid "Options : 1, 2, 3, 4 (for High, Medium, Low, Undefined)"
+msgstr ""
+
+#: Model/Event.php:validation for field distribution
+msgid "Options : Your organisation only, This community only, Connected communities, All communities"
+msgstr ""
+
+#: Model/Event.php:validation for field sharing_group_id
+msgid "If the distribution is set to \"Sharing Group\", a sharing group has to be selected."
+msgstr ""
+
+#: Model/Event.php:validation for field analysis
+msgid "Options : 0, 1, 2 (for Initial, Ongoing, Completed)"
+msgstr ""
+
+#: Model/EventBlacklist.php:validation for field event_uuid
+msgid "Event already blacklisted."
+msgstr ""
+
+#: Model/EventGraph.php:validation for field network_json
+msgid "The provided eventGraph is not a valid json format"
+msgstr ""
+
+#: Model/Feed.php:validation for field url
+#: Model/Noticelist.php:validation for field name;validation for field version
+#: Model/NoticelistEntry.php:validation for field value
+#: Model/Post.php:validation for field contents
+#: Model/Role.php:validation for field valueNotEmpty
+#: Model/Server.php:validation for field authkey
+#: Model/Taxonomy.php:validation for field namespace;validation for field description;validation for field version
+#: Model/TaxonomyEntry.php:validation for field value;validation for field expanded
+#: Model/TaxonomyPredicate.php:validation for field value;validation for field expanded
+#: Model/Warninglist.php:validation for field name;validation for field description;validation for field version
+#: Model/WarninglistEntry.php:validation for field value
+#: Model/WarninglistType.php:validation for field type
+msgid "rule"
+msgstr ""
+
+#: Model/Feed.php:validation for field event_id
+msgid "Please enter a numeric event ID or leave this field blank."
+msgstr ""
+
+#: Model/Log.php:validation for field action
+msgid "Options : ..."
+msgstr ""
+
+#: Model/ObjectRelationship.php:validation for field name
+msgid "A relationship with this name already exists."
+msgstr ""
+
+#: Model/OrgBlacklist.php:validation for field org_uuid
+msgid "Organisation already blacklisted."
+msgstr ""
+
+#: Model/Organisation.php:validation for field name
+msgid "An organisation with this name already exists."
+msgstr ""
+
+#: Model/Organisation.php:validation for field uuid
+msgid "An organisation with this UUID already exists."
+msgstr ""
+
+#: Model/Regexp.php:validation for field regexp
+msgid "This is not a valid regular expression. Don't forget the delimiters!"
+msgstr ""
+
+#: Model/Role.php:validation for field name
+msgid "A role with this name already exists."
+msgstr ""
+
+#: Model/Server.php:validation for field url
+msgid "Please enter a valid base-url."
+msgstr ""
+
+#: Model/SharingGroup.php:validation for field name
+msgid "A sharing group with this name already exists."
+msgstr ""
+
+#: Model/Sighting.php:validation for field type
+msgid "Invalid type. Valid options are: 0 (Sighting), 1 (False-positive), 2 (Expiration)."
+msgstr ""
+
+#: Model/Tag.php:validation for field name
+msgid "This field is required."
+msgstr ""
+
+#: Model/Tag.php:validation for field name
+#: Model/TagCollection.php:validation for field name
+#: Model/Whitelist.php:validation for field name
+msgid "A similar name already exists."
+msgstr ""
+
+#: Model/Tag.php:validation for field colour
+msgid "Colour has to be in the RGB format (#FFFFFF)"
+msgstr ""
+
+#: Model/TemplateElementAttribute.php:validation for field category
+#: Model/TemplateElementFile.php:validation for field category
+msgid "Please choose a category."
+msgstr ""
+
+#: Model/TemplateElementAttribute.php:validation for field type
+msgid "Please choose a type."
+msgstr ""
+
+#: Model/TemplateElementFile.php:validation for field name
+#: Model/TemplateElementText.php:validation for field name
+msgid "Please enter a Name"
+msgstr ""
+
+#: Model/TemplateElementFile.php:validation for field description
+msgid "Please enter a Description"
+msgstr ""
+
+#: Model/TemplateElementText.php:validation for field text
+msgid "Please fill out the text field"
+msgstr ""
+
+#: Model/User.php:validation for field password
+msgid "Password length requirement not met."
+msgstr ""
+
+#: Model/User.php:validation for field password
+msgid "Password complexity requirement not met."
+msgstr ""
+
+#: Model/User.php:validation for field password
+msgid "Please re-enter your password twice so that the values match."
+msgstr ""
+
+#: Model/User.php:validation for field org_id
+msgid "The organisation ID has to be a numeric value."
+msgstr ""
+
+#: Model/User.php:validation for field email
+msgid "Please enter a valid email address."
+msgstr ""
+
+#: Model/User.php:validation for field email
+msgid "An account with this email address already exists."
+msgstr ""
+
+#: Model/User.php:validation for field authkey
+msgid "A authkey of a minimum length of 40 is required."
+msgstr ""
+
+#: Model/User.php:validation for field gpgkey
+msgid "GnuPG key not valid, please enter a valid key."
+msgstr ""
+
+#: Model/User.php:validation for field certif_public
+msgid "Certificate not valid, please enter a valid certificate (x509)."
+msgstr ""
+
+#: Model/User.php:validation for field nids_sid
+msgid "A SID should be an integer."
+msgstr ""
+
+#: Model/Whitelist.php:validation for field name
+msgid "Name not in the right format. Whitelist entries have to be enclosed by a valid php delimiter (which can be most non-alphanumeric / non-whitespace character). Format: \"/8.8.8.8/\" Please double check the name."
+msgstr ""
+
diff --git a/app/Locale/ukr/LC_MESSAGES/default.po b/app/Locale/ukr/LC_MESSAGES/default.po
index 342d391ba..d824a089a 100644
--- a/app/Locale/ukr/LC_MESSAGES/default.po
+++ b/app/Locale/ukr/LC_MESSAGES/default.po
@@ -6624,6 +6624,10 @@ msgstr ""
 msgid "Quickfilter"
 msgstr ""
 
+#: View/Events/index.ctp:95
+msgid "Enter value to search"
+msgstr ""
+
 #: View/Events/index.ctp:44
 #: View/Organisations/index.ctp:59
 #: View/Servers/preview_index.ctp:45
diff --git a/app/Locale/zh-s/LC_MESSAGES/default.po b/app/Locale/zh-s/LC_MESSAGES/default.po
index 922060d86..a61ed4168 100644
--- a/app/Locale/zh-s/LC_MESSAGES/default.po
+++ b/app/Locale/zh-s/LC_MESSAGES/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: misp\n"
-"PO-Revision-Date: 2019-01-22 21:41\n"
+"PO-Revision-Date: 2019-03-06 02:05\n"
 "Last-Translator: SteveClement <steve@localhost.lu>\n"
 "Language-Team: Chinese Simplified\n"
 "MIME-Version: 1.0\n"
@@ -17,52 +17,52 @@ msgstr ""
 #: Console/Command/EventShell.php:13
 #: Controller/AttributesController.php:125;129;133
 #: Controller/EventGraphController.php:34;69
-#: Controller/EventsController.php:1029;1380;1384;1388;1431;1854;1930;1934;1938;2160;2197;2261;2343;2873;5068;5236;5240;5249
+#: Controller/EventsController.php:1077;1481;1485;1489;1535;2041;2117;2121;2125;2343;2380;2444;2526;3056;5312;5480;5484;5493
 #: Controller/PostsController.php:56
-#: Model/Galaxy.php:272
+#: Model/Galaxy.php:292
 msgid "Invalid event"
 msgstr "无效的事件"
 
 #: Console/Command/ServerShell.php:49
-#: Controller/ServersController.php:631
+#: Controller/ServersController.php:632
 msgid "Pull completed. %s events pulled, %s events could not be pulled, %s proposals pulled."
 msgstr ""
 
 #: Console/Command/ServerShell.php:51
 msgid "ERROR: %s"
-msgstr ""
+msgstr "错误：%s"
 
-#: Controller/AppController.php:365
+#: Controller/AppController.php:383
 msgid "Something went wrong. Your user account that you are authenticated with doesn't exist anymore."
-msgstr ""
+msgstr "错误。通过身份验证的用户帐户不存在。"
 
-#: Controller/AppController.php:583
-#: Controller/AttributesController.php:1995;2104;2154;2237;2323
-#: Controller/EventsController.php:2582;2698;2760;3112;3723;3786
+#: Controller/AppController.php:601
+#: Controller/AttributesController.php:2002;2111;2161;2244;2330
+#: Controller/EventsController.php:2765;2881;2943;3298;3909;3972
 msgid "This authentication key is not authorized to be used for exports. Contact your administrator."
 msgstr "此身份验证密钥无权用于导出。请联系你的管理员。"
 
-#: Controller/AppController.php:592
-#: Controller/AttributesController.php:2158;2241;2327
-#: Controller/EventsController.php:2586;2703;2765;3116;3727;3790
+#: Controller/AppController.php:610
+#: Controller/AttributesController.php:2165;2248;2334
+#: Controller/EventsController.php:2769;2886;2948;3302;3913;3976
 msgid "You have to be logged in to do that."
 msgstr "干嘛呢？伙计，你要先登陆后才可以开干。"
 
-#: Controller/AppController.php:609
+#: Controller/AppController.php:627
 msgid "Either specify the search terms in the url, or POST a json with the filter parameters."
 msgstr ""
 
-#: Controller/AppController.php:731
+#: Controller/AppController.php:752
 msgid "All done. attribute_count generated from scratch for "
 msgstr "全部完成。attribute_count 从零开始生成"
 
-#: Controller/AppController.php:850
-#: Controller/AttributesController.php:2381
-#: Controller/ShadowAttributesController.php:1274
+#: Controller/AppController.php:871
+#: Controller/AttributesController.php:2388
+#: Controller/ShadowAttributesController.php:1276
 msgid "Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs)."
 msgstr "作业已排队。如果导航至活动作业视图（管理->作业），可以查看进度。"
 
-#: Controller/AttributesController.php:116;1399
+#: Controller/AttributesController.php:116;1403
 #: Controller/EventGraphController.php:19;77
 msgid "No event ID set."
 msgstr "未设置事件ID。"
@@ -73,13 +73,13 @@ msgstr "你没有创建属性的权利。"
 
 #: Controller/AttributesController.php:139;488;668
 #: Controller/EventGraphController.php:88
-#: Controller/EventsController.php:1737;1758;1792
-#: Controller/ObjectsController.php:452
+#: Controller/EventsController.php:1924;1945;1979
+#: Controller/ObjectsController.php:454
 msgid "You do not have permission to do that."
 msgstr "你无权这样做。"
 
-#: Controller/AttributesController.php:411;866;871;875;1079;1159;2397;2411;2444;2466;2475;3059;3067;3166;3170
-#: Controller/ShadowAttributesController.php:822;1065;1089;1122;1132
+#: Controller/AttributesController.php:411;866;871;875;1083;1163;2404;2418;2451;2473;2482;3065;3073;3172;3176
+#: Controller/ShadowAttributesController.php:822;1067;1091;1124;1134
 #: Controller/TagsController.php:491
 msgid "Invalid attribute"
 msgstr "无效属性"
@@ -93,8 +93,8 @@ msgstr "你无权浏览此事件"
 msgid "Attribute not an attachment or malware-sample"
 msgstr "属性不是附件或恶意软件样本"
 
-#: Controller/AttributesController.php:485;652;943;1408
-#: Controller/EventsController.php:4420;4434;5017;5031
+#: Controller/AttributesController.php:485;652;943;1412
+#: Controller/EventsController.php:4609;4623;5261;5275
 msgid "Invalid Event."
 msgstr "无效事件。"
 
@@ -133,167 +133,167 @@ msgstr "无法保存属性：请求中的属性不比本地副本新。"
 msgid "The attribute has been saved"
 msgstr "属性已被保存"
 
-#: Controller/AttributesController.php:992
+#: Controller/AttributesController.php:995
 msgid "The attribute could not be saved. Please, try again."
 msgstr "无法保存该属性。请再试一次。"
 
-#: Controller/AttributesController.php:1083
+#: Controller/AttributesController.php:1087
 msgid "Invalid event id."
 msgstr "无效事件id。"
 
-#: Controller/AttributesController.php:1113
-#: Controller/EventsController.php:2082
+#: Controller/AttributesController.php:1117
+#: Controller/EventsController.php:2265
 #: Controller/ShadowAttributesController.php:729
 msgid "Invalid input."
 msgstr "无效输入。"
 
-#: Controller/AttributesController.php:1118
+#: Controller/AttributesController.php:1122
 msgid "Invalid field."
 msgstr "无效字段。"
 
-#: Controller/AttributesController.php:1163
+#: Controller/AttributesController.php:1167
 msgid "Invalid attribute id."
 msgstr "无效属性id。"
 
-#: Controller/AttributesController.php:1238;1248
+#: Controller/AttributesController.php:1242;1252
 msgid "Attribute deleted"
 msgstr "属性已删除"
 
-#: Controller/AttributesController.php:1243;1245
+#: Controller/AttributesController.php:1247;1249
 msgid "Attribute was not deleted"
 msgstr "属性未被删除"
 
-#: Controller/AttributesController.php:1270;2868
-#: Controller/ShadowAttributesController.php:862
+#: Controller/AttributesController.php:1274;2875
+#: Controller/ShadowAttributesController.php:863
 msgid "Invalid Attribute"
 msgstr "无效属性"
 
-#: Controller/AttributesController.php:1297
+#: Controller/AttributesController.php:1301
 msgid "Could not restore the attribute"
 msgstr "无法还原属性"
 
-#: Controller/AttributesController.php:1318;1325;1329
+#: Controller/AttributesController.php:1322;1329;1333
 msgid "Attribute not found or not authorised."
 msgstr "未找到或未授权的属性。"
 
-#: Controller/AttributesController.php:1379
+#: Controller/AttributesController.php:1383
 msgid "This function is only accessible via POST requests."
 msgstr "此功能只能通过POST请求访问。"
 
-#: Controller/AttributesController.php:1434
+#: Controller/AttributesController.php:1438
 msgid "No matching attributes found."
 msgstr "找不到匹配的属性。"
 
-#: Controller/AttributesController.php:1468
+#: Controller/AttributesController.php:1472
 msgid "This method can only be accessed via AJAX."
 msgstr "此方法只能通过AJAX访问。"
 
-#: Controller/AttributesController.php:1478
+#: Controller/AttributesController.php:1482
 msgid "You are not authorized to edit this event."
 msgstr "你无权编辑此事件。"
 
-#: Controller/AttributesController.php:1576
+#: Controller/AttributesController.php:1580
 msgid "No event ID provided."
 msgstr "未提供事件id。"
 
-#: Controller/AttributesController.php:1621
-#: Controller/GalaxiesController.php:225
+#: Controller/AttributesController.php:1625
+#: Controller/GalaxiesController.php:193
 msgid "Synonyms: "
 msgstr ""
 
-#: Controller/AttributesController.php:1990;2097
+#: Controller/AttributesController.php:1997;2104
 msgid "You are not authorized. Please send the Authorization header with your auth key along with an Accept header for application/xml."
 msgstr "您没有被授权。请使用您的身份验证密钥以及application/xml 的Accept标头发送Authorization标头。"
 
-#: Controller/AttributesController.php:2003
+#: Controller/AttributesController.php:2010
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct accept and content type headers)."
 msgstr "在URL中指定搜索项，或者POST一个json数组/xml（根元素为“request”并指定正确的accept和content类型头）。"
 
-#: Controller/AttributesController.php:2023
+#: Controller/AttributesController.php:2030
 msgid "You don't have access to that event."
 msgstr "你无权访问该事件。"
 
-#: Controller/AttributesController.php:2086
+#: Controller/AttributesController.php:2093
 msgid "No matches."
 msgstr "没有匹配。"
 
-#: Controller/AttributesController.php:2108;2117
+#: Controller/AttributesController.php:2115;2124
 msgid "Invalid attribute or no authorisation to view it."
 msgstr "无效属性或者无权查看。"
 
-#: Controller/AttributesController.php:2185
+#: Controller/AttributesController.php:2192
 msgid "Either specify the search terms in the url, or POST a json array / xml (with the root element being \"request\" and specify the correct headers based on content type."
 msgstr "在URL中指定搜索项，或者POST一个json数组/xml（根元素为“request”并指定正确的accept和content类型头）。"
 
-#: Controller/AttributesController.php:2249
+#: Controller/AttributesController.php:2256
 msgid "Invalid event ID format."
 msgstr "事件 ID 格式无效。"
 
-#: Controller/AttributesController.php:2358
-#: Controller/ShadowAttributesController.php:1252
+#: Controller/AttributesController.php:2365
+#: Controller/ShadowAttributesController.php:1254
 msgid "All done. "
 msgstr "全部完成!"
 
-#: Controller/AttributesController.php:2390;2437
-#: Controller/ShadowAttributesController.php:1060
+#: Controller/AttributesController.php:2397;2444
+#: Controller/ShadowAttributesController.php:1062
 msgid "Invalid field requested."
 msgstr "请求的字段无效。"
 
-#: Controller/AttributesController.php:2393;2440
+#: Controller/AttributesController.php:2400;2447
 msgid "This function can only be accessed via AJAX."
 msgstr "此功能只能通过AJAX访问。"
 
-#: Controller/AttributesController.php:2505;2513
-#: Controller/EventsController.php:3550;3699
+#: Controller/AttributesController.php:2512;2520
+#: Controller/EventsController.php:3736;3885
 msgid "Event not found or you don't have permissions to create attributes"
 msgstr "未找到事件或您没有创建属性的权限"
 
-#: Controller/AttributesController.php:2534
+#: Controller/AttributesController.php:2541
 msgid "This action can only be accessed via AJAX."
 msgstr "此动作只能通过AJAX访问。"
 
-#: Controller/AttributesController.php:2543;2794;2808;2819
-#: Controller/ServersController.php:618;686
+#: Controller/AttributesController.php:2550;2801;2815;2826
+#: Controller/ServersController.php:619;687
 msgid "You are not authorised to do that."
 msgstr "您无权执行此操作。"
 
-#: Controller/AttributesController.php:2648
-#: Controller/EventsController.php:4213
+#: Controller/AttributesController.php:2655
+#: Controller/EventsController.php:4402
 msgid "This functionality requires API key access."
 msgstr "此功能需要API密钥访问权限。"
 
-#: Controller/AttributesController.php:2656
+#: Controller/AttributesController.php:2663
 msgid "This action is for the API only. Please refer to the automation page for information on how to use it."
 msgstr "此操作仅适用于API。 有关如何使用它的信息，请参阅自动化页面。"
 
-#: Controller/AttributesController.php:2668
+#: Controller/AttributesController.php:2675
 msgid "No hash or event ID received. You need to set at least one of the two."
 msgstr "未收到任何哈希或事件ID。你需要至少设置其中一个。"
 
-#: Controller/AttributesController.php:2829
+#: Controller/AttributesController.php:2836
 msgid "Invalid script."
 msgstr "无效脚本。"
 
-#: Controller/AttributesController.php:2894
+#: Controller/AttributesController.php:2901
 msgid "No valid enrichment options found for this attribute."
 msgstr "找不到此属性的有效富集选项。"
 
-#: Controller/AttributesController.php:2957
+#: Controller/AttributesController.php:2964
 msgid "Invalid type requested."
 msgstr "无效请求类型。"
 
-#: Controller/AttributesController.php:3233
-#: Controller/EventsController.php:5013
+#: Controller/AttributesController.php:3239
+#: Controller/EventsController.php:5257
 msgid "Disabling the correlation is not permitted on this instance."
 msgstr "此实例不允许禁用关联。"
 
-#: Controller/AttributesController.php:3237;3252
+#: Controller/AttributesController.php:3243;3258
 #: Controller/ShadowAttributesController.php:677
 msgid "Invalid Attribute."
 msgstr "无效属性。"
 
-#: Controller/AttributesController.php:3240;3255
-#: Controller/EventsController.php:5020;5034
+#: Controller/AttributesController.php:3246;3261
+#: Controller/EventsController.php:5264;5278
 msgid "You don't have permission to do that."
 msgstr "无权执行此操作。"
 
@@ -301,286 +301,286 @@ msgstr "无权执行此操作。"
 msgid "Event Blacklisting is not currently enabled on this instance."
 msgstr "此实例当前未启用事件黑名单。"
 
-#: Controller/EventsController.php:820
+#: Controller/EventsController.php:848
 msgid "No x509 certificate or GnuPG key set in your profile. To receive emails, submit your public certificate or GnuPG key in your profile."
 msgstr "您的个人资料中没有设置x509证书或GnuPG密钥。要接收电子邮件，请在个人资料中提交公共证书或GnuPG密钥。"
 
-#: Controller/EventsController.php:822
+#: Controller/EventsController.php:850
 msgid "No GnuPG key set in your profile. To receive emails, submit your public key in your profile."
 msgstr "您的个人资料中没有设置GnuPG密钥。要接收电子邮件，请在您的个人资料中提交您的公钥。"
 
-#: Controller/EventsController.php:828
+#: Controller/EventsController.php:856
 msgid "No x509 certificate or GnuPG key set in your profile. To receive attributes in emails, submit your public certificate or GnuPG key in your profile."
 msgstr "您的个人资料中没有设置x509证书或GnuPG密钥。要在电子邮件中接收属性，请在个人资料中提交公共证书或GnuPG密钥。"
 
-#: Controller/EventsController.php:830
+#: Controller/EventsController.php:858
 msgid "No GnuPG key set in your profile. To receive attributes in emails, submit your public key in your profile."
 msgstr "您的个人资料中没有设置GnuPG密钥。要在电子邮件中接收属性，请在个人资料中提交您的公钥。"
 
-#: Controller/EventsController.php:1445
+#: Controller/EventsController.php:1559
 msgid "You are currently logged in as a site administrator and editing an event not belonging to your organisation, which goes against the sharing model of MISP. Please only use this as a last resort and use normal user account for day to day work."
 msgstr ""
 
-#: Controller/EventsController.php:1577
+#: Controller/EventsController.php:1769
 msgid "You don't have permissions to create events"
 msgstr "您没有权限创建事件"
 
-#: Controller/EventsController.php:1583
+#: Controller/EventsController.php:1775
 msgid "No valid event data received."
 msgstr "未收到有效的事件数据。"
 
-#: Controller/EventsController.php:1619
+#: Controller/EventsController.php:1811
 msgid "Invalid Sharing Group or not authorised (Sync user is not contained in the Sharing group)."
 msgstr "无效的共享组或未授权（同步用户未包含在共享组中）。"
 
-#: Controller/EventsController.php:1623;1627
+#: Controller/EventsController.php:1815;1819
 msgid "Invalid Sharing Group or not authorised."
 msgstr "无效的共享组或未授权。"
 
-#: Controller/EventsController.php:1651
+#: Controller/EventsController.php:1843
 msgid "Event blocked by local blacklist."
 msgstr "事件被本地黑名单阻止。"
 
-#: Controller/EventsController.php:1664;1746;2014
+#: Controller/EventsController.php:1856;1933;2197
 msgid "The event has been saved"
 msgstr "事件已保存"
 
-#: Controller/EventsController.php:1672
+#: Controller/EventsController.php:1864
 msgid "Event already exists, if you would like to edit it, use the url in the location header."
 msgstr "事件已存在，如果要对其进行编辑，请使用位置标头中的url。"
 
-#: Controller/EventsController.php:1683
+#: Controller/EventsController.php:1870
 msgid "A blacklist entry is blocking you from creating any events. Please contact the administration team of this instance"
 msgstr "黑名单条目阻止您创建任何事件。请联系此实例的管理团队"
 
-#: Controller/EventsController.php:1685;2017
+#: Controller/EventsController.php:1872;2200
 msgid "The event could not be saved. Please, try again."
 msgstr "该事件无法保存。请再试一次。"
 
-#: Controller/EventsController.php:1725
+#: Controller/EventsController.php:1912
 msgid "The event created will be visible to the organisations having an account on this platform, but not synchronised to other MISP instances until it is published."
 msgstr ""
 
-#: Controller/EventsController.php:1772
+#: Controller/EventsController.php:1959
 msgid "You may only upload MISP XML or MISP JSON files."
 msgstr "您只能上传MISP XML或MISP JSON文件。"
 
-#: Controller/EventsController.php:1773
+#: Controller/EventsController.php:1960
 msgid "File upload failed or file does not have the expected extension (.xml / .json)."
 msgstr "文件上载失败或文件没有预期的扩展名（.xml / .json）。"
 
-#: Controller/EventsController.php:1822
+#: Controller/EventsController.php:2009
 msgid "STIX document imported, event's created: "
 msgstr "STIX文档已导入，事件已创建："
 
-#: Controller/EventsController.php:1825
+#: Controller/EventsController.php:2012
 msgid "STIX document imported."
 msgstr "STIX文档已导入。"
 
-#: Controller/EventsController.php:1828
+#: Controller/EventsController.php:2015
 msgid "Could not import STIX document: "
 msgstr "无法导入STIX文档："
 
-#: Controller/EventsController.php:1835
+#: Controller/EventsController.php:2022
 msgid "File upload failed. Make sure that you select a stix file to be uploaded and that the file doesn't exceed the maximum file size of "
 msgstr "文件上传失败。确保选择要上载的stix文件，并且文件大小不超过"
 
-#: Controller/EventsController.php:1859;1944
+#: Controller/EventsController.php:2046;2131
 msgid "You are not authorised to do that. Please consider using the 'propose attribute' feature."
 msgstr "无权执行此操作。请考虑使用“建议属性”功能。"
 
-#: Controller/EventsController.php:1867
+#: Controller/EventsController.php:2054
 msgid "Invalid event ID entered."
 msgstr "输入的事件ID无效。"
 
-#: Controller/EventsController.php:1872
+#: Controller/EventsController.php:2059
 msgid "You are not authorised to read the selected event."
 msgstr "无权阅读所选事件。"
 
-#: Controller/EventsController.php:2166;2204;2267
+#: Controller/EventsController.php:2349;2387;2450
 msgid "You don't have the permission to do that."
 msgstr "您无权执行此操作。"
 
-#: Controller/EventsController.php:2175
+#: Controller/EventsController.php:2358
 msgid "Event unpublished."
 msgstr ""
 
-#: Controller/EventsController.php:2354
+#: Controller/EventsController.php:2537
 msgid "Email sent to the reporter."
 msgstr "邮件发送给reporter。"
 
-#: Controller/EventsController.php:2356
+#: Controller/EventsController.php:2539
 msgid "Sending of email failed"
 msgstr "邮件发送失败"
 
-#: Controller/EventsController.php:2495
+#: Controller/EventsController.php:2678
 msgid "This feature is currently disabled"
 msgstr "当前功能已禁用"
 
-#: Controller/EventsController.php:2537;3800
+#: Controller/EventsController.php:2720;3986
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\")."
 msgstr "在url中指定搜索项，或POST一个xml（根元素为“request”）。"
 
-#: Controller/EventsController.php:2573
+#: Controller/EventsController.php:2756
 msgid "Invalid Event ID."
 msgstr "无效事件id。"
 
-#: Controller/EventsController.php:2620
+#: Controller/EventsController.php:2803
 msgid "No events found that match the passed parameters."
 msgstr "找不到与参数传递匹配的事件。"
 
-#: Controller/EventsController.php:2645
+#: Controller/EventsController.php:2828
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters. Valid filters: id (event ID), tags (list of tags), from (from date in YYYY-MM-DD format), to (to date in YYYY-MM-DD format), last (events with a published timestamp newer than - valid options are in time + unit format such as 6d or 2w, etc)"
 msgstr "在URL中指定搜索项，或者使用过滤器参数POST一个json或xml。有效过滤器：id（事件ID），tags（标签列表），from（从YYYY-MM-DD格式的日期），to（到YYYY-MM-DD格式的日期），last（发布的时间戳事件更新于 - 有效选项是time+单位格式，如6d或2w等）"
 
-#: Controller/EventsController.php:2720
+#: Controller/EventsController.php:2903
 msgid "Either specify the search terms in the url, or POST a json or xml with the filter parameters."
 msgstr "在URL中指定搜索项，或者使用过滤器参数POST json或xml。"
 
-#: Controller/EventsController.php:2739
-#: Model/Attribute.php:1966
+#: Controller/EventsController.php:2922
+#: Model/Attribute.php:1972
 msgid "Invalid hash type."
 msgstr "无效hash类型。"
 
-#: Controller/EventsController.php:2842
+#: Controller/EventsController.php:3025
 msgid "Filename not allowed."
 msgstr "文件名称不被允许。"
 
-#: Controller/EventsController.php:2862
+#: Controller/EventsController.php:3045
 msgid "Problem with writing the ioc file. Please report to administrator."
 msgstr "编写 ioc 文件出现问题。请向管理员报告。"
 
-#: Controller/EventsController.php:2956
+#: Controller/EventsController.php:3139
 msgid "This is not a valid MISP XML file."
 msgstr "这不是一个有效的MISP XML文件。"
 
-#: Controller/EventsController.php:3105
+#: Controller/EventsController.php:3291
 msgid "Not yet implemented"
 msgstr "尚未实现"
 
-#: Controller/EventsController.php:3123;3127
+#: Controller/EventsController.php:3309;3313
 msgid "Invalid event or not authorised."
 msgstr "无效事件或未授权。"
 
-#: Controller/EventsController.php:3147;3217
+#: Controller/EventsController.php:3333;3403
 msgid "You don't have the privileges to access this."
 msgstr "没有访问权限。"
 
-#: Controller/EventsController.php:3424
+#: Controller/EventsController.php:3610
 #: Controller/TagCollectionsController.php:307
 msgid "Invalid Tag."
 msgstr ""
 
-#: Controller/EventsController.php:3440
+#: Controller/EventsController.php:3626
 #: Controller/TagCollectionsController.php:323
 msgid "Tag is already attached to this event."
 msgstr ""
 
-#: Controller/EventsController.php:3451;3457
+#: Controller/EventsController.php:3637;3643
 #: Controller/TagCollectionsController.php:330
 msgid "Tag(s) added."
 msgstr ""
 
-#: Controller/EventsController.php:3453
+#: Controller/EventsController.php:3639
 msgid "Tag could not be added."
 msgstr ""
 
-#: Controller/EventsController.php:3459
+#: Controller/EventsController.php:3645
 #: Controller/TagCollectionsController.php:338
 msgid "All tags are already present, nothing to add."
 msgstr ""
 
-#: Controller/EventsController.php:3703;4854;5294;5298
-#: Controller/ObjectsController.php:46;140;144;448
+#: Controller/EventsController.php:3889;5098;5538;5542
+#: Controller/ObjectsController.php:46;140;144;450
 msgid "Invalid event."
 msgstr "无效事件。"
 
-#: Controller/EventsController.php:3732
+#: Controller/EventsController.php:3918
 msgid "Either specify the search terms in the url, or POST an xml (with the root element being \"request\"."
 msgstr ""
 
-#: Controller/EventsController.php:3860;3890;3906
+#: Controller/EventsController.php:4049;4079;4095
 msgid "You do not have the permission to do that."
 msgstr "你无权执行此操作。"
 
-#: Controller/EventsController.php:3971;4111
+#: Controller/EventsController.php:4160;4300
 msgid "Invalid ID"
 msgstr "无效ID"
 
-#: Controller/EventsController.php:3975;4115
+#: Controller/EventsController.php:4164;4304
 msgid "Event not found or you are not authorised to view it."
 msgstr "事件未找到或您无权查看。"
 
-#: Controller/EventsController.php:4216;4223
+#: Controller/EventsController.php:4405;4412
 msgid "Please POST the samples as described on the automation page."
 msgstr "请按照自动化页面的说明POST样本。"
 
-#: Controller/EventsController.php:4252
+#: Controller/EventsController.php:4441
 msgid "No samples received, or samples not in the correct format. Please refer to the API documentation on the automation page."
 msgstr "未收到样本，或样本格式不正确。请参阅自动化页面上的API文档。"
 
-#: Controller/EventsController.php:4260
+#: Controller/EventsController.php:4449
 msgid "Event not found"
 msgstr "找不到事件。"
 
-#: Controller/EventsController.php:4283
+#: Controller/EventsController.php:4472
 msgid "Event not found."
 msgstr "找不到事件。"
 
-#: Controller/EventsController.php:4293
+#: Controller/EventsController.php:4482
 msgid "Distribution level 5 is not supported when uploading a sample without passing an event ID. Distribution level 5 is meant to take on the distribution level of an existing event."
 msgstr "在未传递事件ID的情况下上载样本时，不支持分发级别5。分发级别5旨在呈现现有事件的分布级别。"
 
-#: Controller/EventsController.php:4318
+#: Controller/EventsController.php:4507
 msgid "The creation of a new event with the supplied information has failed."
 msgstr "使用提供的信息创建新事件失败。"
 
-#: Controller/EventsController.php:4457;4479;4508;4533;4558;4588;4609
+#: Controller/EventsController.php:4646;4668;4697;4722;4747;4777;4798
 msgid "Invalid type."
 msgstr "无效类型。"
 
-#: Controller/EventsController.php:4670
+#: Controller/EventsController.php:4906
 msgid "Invalid method."
 msgstr "无效方法。"
 
-#: Controller/EventsController.php:4745
+#: Controller/EventsController.php:4989
 msgid "%s services are not enabled."
 msgstr "%s 服务未启用。"
 
-#: Controller/EventsController.php:4749
+#: Controller/EventsController.php:4993
 msgid "Attribute not found or you are not authorised to see it."
 msgstr "属性未找到或您无权查看。"
 
-#: Controller/EventsController.php:4755
+#: Controller/EventsController.php:4999
 msgid "No valid %s options found for this attribute."
 msgstr "找不到此属性的有效%s选项。"
 
-#: Controller/EventsController.php:4772
+#: Controller/EventsController.php:5016
 msgid "no valid %s options found for this attribute."
 msgstr "找不到此属性的有效%s选项。"
 
-#: Controller/EventsController.php:4794
+#: Controller/EventsController.php:5038
 msgid "%s service not reachable."
 msgstr "%s服务无法访问。"
 
-#: Controller/EventsController.php:4806
+#: Controller/EventsController.php:5050
 msgid ": Enriched via the %s"
 msgstr ": 通过%s丰富"
 
-#: Controller/EventsController.php:4940
+#: Controller/EventsController.php:5184
 msgid "Import service not reachable."
 msgstr "导入服务无法访问"
 
-#: Controller/EventsController.php:5107
+#: Controller/EventsController.php:5351
 msgid "Invalid ID."
 msgstr "无效ID。"
 
-#: Controller/EventsController.php:5155
+#: Controller/EventsController.php:5399
 #: Controller/ShadowAttributesController.php:311;316;532
 msgid "Invalid Event"
 msgstr "无效事件"
 
-#: Controller/EventsController.php:5176
+#: Controller/EventsController.php:5420
 msgid "Enrichment task queued for background processing. Check back later to see the results."
 msgstr "已将任务追加至队列进行后台处理。请稍后再检查结果。"
 
@@ -588,135 +588,135 @@ msgstr "已将任务追加至队列进行后台处理。请稍后再检查结果
 msgid "You don't have the required privileges to do that."
 msgstr "你没有执行此操作的权限。"
 
-#: Controller/FeedsController.php:202;300
+#: Controller/FeedsController.php:205;303
 msgid "Feed added."
 msgstr "Feed已添加。"
 
-#: Controller/FeedsController.php:210
+#: Controller/FeedsController.php:213
 msgid "Feed could not be added. Invalid field: %s"
 msgstr "Feed无法添加。无效条目：%s"
 
-#: Controller/FeedsController.php:235;335;357;479;514;697
+#: Controller/FeedsController.php:238;338;360;482;517;721
 msgid "Invalid feed."
 msgstr "无效feed。"
 
-#: Controller/FeedsController.php:308
+#: Controller/FeedsController.php:311
 msgid "Feed could not be updated. Invalid fields: %s"
 msgstr "Feed无法更新。无效条目：%s"
 
-#: Controller/FeedsController.php:331
+#: Controller/FeedsController.php:334
 msgid "This action requires a post request."
 msgstr "此操作需要post请求。"
 
-#: Controller/FeedsController.php:364;483
+#: Controller/FeedsController.php:367;486
 msgid "Feed is currently not enabled. Make sure you enable it."
 msgstr "Feed目前尚未生效。请激活。"
 
-#: Controller/FeedsController.php:377;443
+#: Controller/FeedsController.php:380;446
 msgid "Starting fetch from Feed."
 msgstr "开始下载Feed。"
 
-#: Controller/FeedsController.php:388
+#: Controller/FeedsController.php:391
 msgid "Pull queued for background execution."
 msgstr "从队列中导入并执行后台操作。"
 
-#: Controller/FeedsController.php:393;395
+#: Controller/FeedsController.php:396;398
 msgid "Fetching the feed has failed."
 msgstr "获取更新失败。"
 
-#: Controller/FeedsController.php:399
+#: Controller/FeedsController.php:402
 msgid "Fetching the feed has successfuly completed."
 msgstr "feed获取完成。"
 
-#: Controller/FeedsController.php:460
+#: Controller/FeedsController.php:463
 msgid "Fetching the feed has successfully completed."
 msgstr "Feed获取完成。"
 
-#: Controller/FeedsController.php:490
+#: Controller/FeedsController.php:493
 msgid "Event added."
 msgstr "事件已添加。"
 
-#: Controller/FeedsController.php:493
+#: Controller/FeedsController.php:496
 msgid "Event already up to date."
 msgstr "该事件已是最新。"
 
-#: Controller/FeedsController.php:495
+#: Controller/FeedsController.php:498
 msgid "Event updated."
 msgstr "事件已更新。"
 
-#: Controller/FeedsController.php:499
+#: Controller/FeedsController.php:502
 msgid "Could not %s event."
 msgstr "无法%s事件。"
 
-#: Controller/FeedsController.php:502
+#: Controller/FeedsController.php:505
 msgid "Download failed."
 msgstr "下载失败。"
 
-#: Controller/FeedsController.php:573
+#: Controller/FeedsController.php:597
 msgid "Feed could not be fetched. The HTTP error code returned was: "
 msgstr "无法获取Feed。返回HTTP错误代码为： "
 
-#: Controller/FeedsController.php:612;663
+#: Controller/FeedsController.php:636;687
 msgid "Invalid feed type."
 msgstr "无效feed类型。"
 
-#: Controller/FeedsController.php:729
+#: Controller/FeedsController.php:753
 msgid "This event is blocked by the Feed filters."
 msgstr "此事件被Feed筛选器阻止。"
 
-#: Controller/FeedsController.php:731
+#: Controller/FeedsController.php:755
 msgid "Could not download the selected Event"
 msgstr "无法下载选定事件。"
 
-#: Controller/FeedsController.php:767;771
+#: Controller/FeedsController.php:791;795
 msgid "Invalid Feed."
 msgstr "无效Feed。"
 
-#: Controller/FeedsController.php:792
+#: Controller/FeedsController.php:816
 msgid "Only POST requests are allowed."
 msgstr "只允许POST请求。"
 
-#: Controller/FeedsController.php:796
+#: Controller/FeedsController.php:820
 msgid "Feed not found."
 msgstr "无法找到Feed。"
 
-#: Controller/FeedsController.php:805
+#: Controller/FeedsController.php:829
 msgid "Data pulled."
 msgstr "数据已导入。"
 
-#: Controller/FeedsController.php:807
+#: Controller/FeedsController.php:831
 msgid "Could not pull the selected data. Reason: %s"
 msgstr "无法提取所选数据。原因：%s"
 
-#: Controller/FeedsController.php:824
+#: Controller/FeedsController.php:848
 msgid "Starting feed caching."
 msgstr "启动feed缓存。"
 
-#: Controller/FeedsController.php:839
+#: Controller/FeedsController.php:863
 msgid "Caching the feeds has failed."
 msgstr "缓存feed失败。"
 
-#: Controller/FeedsController.php:842
+#: Controller/FeedsController.php:866
 msgid "Caching the feeds has successfully completed."
 msgstr "缓存feed成功。"
 
-#: Controller/FeedsController.php:876
+#: Controller/FeedsController.php:900
 msgid "Invalid feed list received."
 msgstr "接收无效feed列表。"
 
-#: Controller/GalaxiesController.php:112
+#: Controller/GalaxiesController.php:92
 msgid "All clusters"
 msgstr ""
 
-#: Controller/GalaxiesController.php:161
+#: Controller/GalaxiesController.php:135
 msgid "All namespaces"
 msgstr ""
 
-#: Controller/GalaxiesController.php:274
+#: Controller/GalaxiesController.php:250
 msgid "Failed to parse request."
 msgstr ""
 
-#: Controller/GalaxiesController.php:277
+#: Controller/GalaxiesController.php:253
 msgid "No clusters picked."
 msgstr ""
 
@@ -740,34 +740,15 @@ msgstr "无效对象引用"
 msgid "All Objects"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:82
-#: View/Elements/templateElements/templateRowAttribute.ctp:30
-#: View/Elements/templateElements/templateRowFile.ctp:30
-#: View/Events/resolved_attributes.ctp:47
-#: View/Events/show_i_o_c_results.ctp:11
-#: View/Feeds/freetext_index.ctp:31
-#: View/Objects/add.ctp:95
-#: View/Objects/revise_object.ctp:44
-#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
-#: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
-#: View/ShadowAttributes/index.ctp:48
-#: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
-#: View/TemplateElements/ajax/template_element_add_file.ctp:28
-#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
-#: View/TemplateElements/ajax/template_element_edit_file.ctp:28
-#: View/Templates/populate_event_from_template_attributes.ctp:6
-msgid "Category"
-msgstr ""
-
-#: Controller/ObjectTemplatesController.php:106
+#: Controller/ObjectTemplatesController.php:99
 msgid "Invalid object template"
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:110
+#: Controller/ObjectTemplatesController.php:103
 msgid "Invalid object template id."
 msgstr ""
 
-#: Controller/ObjectTemplatesController.php:150
+#: Controller/ObjectTemplatesController.php:143
 msgid "ObjectTemplate deleted"
 msgstr "对象模板已被删除。"
 
@@ -788,23 +769,23 @@ msgstr "你无权创建对象。"
 msgid "Invalid template."
 msgstr "无效模板。"
 
-#: Controller/ObjectsController.php:309
+#: Controller/ObjectsController.php:311
 msgid "You don't have permissions to edit objects."
 msgstr "你无权编辑对象。"
 
-#: Controller/ObjectsController.php:323;334;437
+#: Controller/ObjectsController.php:325;336;439
 msgid "Invalid object."
 msgstr "无效对象。"
 
-#: Controller/ObjectsController.php:431
+#: Controller/ObjectsController.php:433
 msgid "You don't have permissions to delete objects."
 msgstr "你无权删除对象。"
 
-#: Controller/ObjectsController.php:541;548;552
+#: Controller/ObjectsController.php:543;550;554
 msgid "Object not found or not authorised."
 msgstr "对象未找到或未授权。"
 
-#: Controller/ObjectsController.php:809
+#: Controller/ObjectsController.php:811
 msgid "%s objects successfully reconstructed."
 msgstr "%s对象成功重构。"
 
@@ -892,7 +873,7 @@ msgstr ""
 msgid "The server could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ServersController.php:392;588;613;622;682;1468
+#: Controller/ServersController.php:392;589;614;623;683;1360
 msgid "Invalid server"
 msgstr ""
 
@@ -900,63 +881,59 @@ msgstr ""
 msgid "Couldn't save the new organisation, are you sure that the uuid is in the correct format?."
 msgstr ""
 
-#: Controller/ServersController.php:595
+#: Controller/ServersController.php:596
 msgid "Server deleted"
 msgstr ""
 
-#: Controller/ServersController.php:598
+#: Controller/ServersController.php:599
 msgid "Server was not deleted"
 msgstr ""
 
-#: Controller/ServersController.php:625
+#: Controller/ServersController.php:626
 msgid "Pull setting not enabled for this server."
 msgstr ""
 
-#: Controller/ServersController.php:658
+#: Controller/ServersController.php:659
 msgid "Pull queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:695
+#: Controller/ServersController.php:696
 msgid "The remote server is too outdated to initiate a push towards it. Please notify the hosting organisation of the remote instance."
 msgstr ""
 
-#: Controller/ServersController.php:708
+#: Controller/ServersController.php:709
 msgid "Push complete. %s events pushed, %s events could not be pushed."
 msgstr ""
 
-#: Controller/ServersController.php:733
+#: Controller/ServersController.php:734
 msgid "Push queued for background execution. Job ID: %s"
 msgstr ""
 
-#: Controller/ServersController.php:1327
-msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
-msgstr ""
-
-#: Controller/ServersController.php:1365
+#: Controller/ServersController.php:1257
 msgid "File not found."
 msgstr ""
 
-#: Controller/ServersController.php:1371
+#: Controller/ServersController.php:1263
 msgid "File could not be deleted."
 msgstr ""
 
-#: Controller/ServersController.php:1394;1410
+#: Controller/ServersController.php:1286;1302
 msgid "Upload failed."
 msgstr ""
 
-#: Controller/ServersController.php:1402
+#: Controller/ServersController.php:1294
 msgid "File already exists. If you would like to replace it, remove the old one first."
 msgstr ""
 
-#: Controller/ServersController.php:1856
+#: Controller/ServersController.php:1748
 msgid "Starting server caching."
 msgstr ""
 
-#: Controller/ServersController.php:1871
+#: Controller/ServersController.php:1763
 msgid "Caching the servers has failed."
 msgstr ""
 
-#: Controller/ServersController.php:1874
+#: Controller/ServersController.php:1766
 msgid "Caching the servers has successfully completed."
 msgstr ""
 
@@ -1016,23 +993,23 @@ msgstr ""
 msgid "The ShadowAttribute could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:892;902
+#: Controller/ShadowAttributesController.php:894;904
 msgid "Invalid proposal."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:946
+#: Controller/ShadowAttributesController.php:948
 msgid "No proposals found or invalid event."
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:978;1014
+#: Controller/ShadowAttributesController.php:980;1016
 msgid "This feature is only available using the API to Sync users"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:981
+#: Controller/ShadowAttributesController.php:983
 msgid "Invalid UUID"
 msgstr ""
 
-#: Controller/ShadowAttributesController.php:1017
+#: Controller/ShadowAttributesController.php:1019
 msgid "This feature is only available using POST requests"
 msgstr ""
 
@@ -1060,15 +1037,15 @@ msgstr ""
 msgid "Attribute not found"
 msgstr ""
 
-#: Controller/SightingsController.php:175
+#: Controller/SightingsController.php:176
 msgid "Invalid request."
 msgstr ""
 
-#: Controller/SightingsController.php:184
+#: Controller/SightingsController.php:185
 msgid "Sighting added."
 msgstr ""
 
-#: Controller/SightingsController.php:186
+#: Controller/SightingsController.php:187
 msgid "Sighting could not be added"
 msgstr ""
 
@@ -1149,7 +1126,7 @@ msgstr ""
 msgid "Taxonomy Library"
 msgstr ""
 
-#: Controller/TagsController.php:772
+#: Controller/TagsController.php:756
 msgid "Includes: "
 msgstr ""
 
@@ -1161,15 +1138,15 @@ msgstr ""
 msgid "Event populated, but "
 msgstr ""
 
-#: Controller/UsersController.php:42;221
+#: Controller/UsersController.php:42;247
 msgid "Invalid user or not authorised."
 msgstr ""
 
-#: Controller/UsersController.php:54;430;657;903
+#: Controller/UsersController.php:54;456;683;929
 msgid "Invalid user"
 msgstr ""
 
-#: Controller/UsersController.php:119;564;728
+#: Controller/UsersController.php:119;590;754
 msgid "Invalid e-mail domain. Your user is restricted to creating users for the following domain(s): "
 msgstr ""
 
@@ -1181,67 +1158,75 @@ msgstr ""
 msgid "The profile could not be updated. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:198
+#: Controller/UsersController.php:184
+msgid "Invalid password. Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:193
+msgid "Please enter your current password to continue."
+msgstr ""
+
+#: Controller/UsersController.php:213
 msgid "Password Changed."
 msgstr ""
 
-#: Controller/UsersController.php:203
+#: Controller/UsersController.php:222
 msgid "The password could not be updated. Make sure you meet the minimum password length / complexity requirements."
 msgstr ""
 
-#: Controller/UsersController.php:575
+#: Controller/UsersController.php:601
 msgid "The user could not be saved. Invalid organisation."
 msgstr ""
 
-#: Controller/UsersController.php:597
+#: Controller/UsersController.php:623
 msgid "The user has been saved."
 msgstr ""
 
-#: Controller/UsersController.php:606;839
+#: Controller/UsersController.php:632;865
 msgid "The user could not be saved. Please, try again."
 msgstr ""
 
-#: Controller/UsersController.php:831
+#: Controller/UsersController.php:857
 msgid "The user has been saved"
 msgstr ""
 
-#: Controller/UsersController.php:911
+#: Controller/UsersController.php:937
 msgid "User deleted"
 msgstr ""
 
-#: Controller/UsersController.php:915
+#: Controller/UsersController.php:941
 msgid "User was not deleted"
 msgstr ""
 
-#: Controller/UsersController.php:993
+#: Controller/UsersController.php:1019
 msgid "Invalid username or password, try again"
 msgstr ""
 
-#: Controller/UsersController.php:1076
+#: Controller/UsersController.php:1106
 msgid "Good-Bye"
 msgstr ""
 
-#: Controller/UsersController.php:1117
+#: Controller/UsersController.php:1147
 msgid "New authkey generated."
 msgstr ""
 
-#: Controller/UsersController.php:1226
+#: Controller/UsersController.php:1256
 msgid "You accepted the Terms and Conditions."
 msgstr ""
 
-#: Controller/UsersController.php:1408
+#: Controller/UsersController.php:1438
 msgid "Recipient email not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1413
+#: Controller/UsersController.php:1443
 msgid "Recipient organisation not provided"
 msgstr ""
 
-#: Controller/UsersController.php:1450
+#: Controller/UsersController.php:1480
 msgid "E-mails sent, but failed to deliver the messages to the following recipients: "
 msgstr ""
 
-#: Controller/UsersController.php:1452
+#: Controller/UsersController.php:1482
 msgid "E-mails sent."
 msgstr ""
 
@@ -1289,1004 +1274,1020 @@ msgstr ""
 msgid "Could not remove the blacklist entry"
 msgstr ""
 
-#: Model/Attribute.php:588
+#: Model/Attribute.php:591
 msgid "Composite type, but value not explodable"
 msgstr ""
 
-#: Model/Attribute.php:700
+#: Model/Attribute.php:703
 msgid "Delete of file attachment failed. Please report to administrator."
 msgstr ""
 
-#: Model/Attribute.php:825
+#: Model/Attribute.php:828
 msgid "The entered string is too long and would get truncated. Please consider adding the data as an attachment instead"
 msgstr ""
 
-#: Model/Attribute.php:950
+#: Model/Attribute.php:953
 msgid "Checksum has an invalid length or format (expected: %s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:957
+#: Model/Attribute.php:960
 msgid "Checksum has an invalid length or format (expected: at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:964
+#: Model/Attribute.php:967
 msgid "The input doesn't match the expected sha1 format (expected: 40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:975
+#: Model/Attribute.php:978
 msgid "Invalid SSDeep hash. The format has to be blocksize:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:986
+#: Model/Attribute.php:989
 msgid "Invalid impfuzzy format. The format has to be imports:hash:hash"
 msgstr ""
 
-#: Model/Attribute.php:993
+#: Model/Attribute.php:996
 msgid "The input doesn't match the expected format (expected: 40 or more hexadecimal characters)"
 msgstr ""
 
-#: Model/Attribute.php:1008
+#: Model/Attribute.php:1011
 msgid "The input doesn't match the expected filename|sha1 format (expected: filename|40 hexadecimal characters). Keep in mind that MISP currently only supports SHA1 for PEhashes, if you would like to get the support extended to other hash types, make sure to create a github ticket about it at https://github.com/MISP/MISP!"
 msgstr ""
 
-#: Model/Attribute.php:1026
+#: Model/Attribute.php:1029
 msgid "Checksum has an invalid length or format (expected: filename|%s hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1031
+#: Model/Attribute.php:1034
 msgid "Invalid composite type. The format has to be %s."
 msgstr ""
 
-#: Model/Attribute.php:1042
+#: Model/Attribute.php:1045
 msgid "Invalid SSDeep hash (expected: blocksize:hash:hash)."
 msgstr ""
 
-#: Model/Attribute.php:1050
+#: Model/Attribute.php:1053
 msgid "Checksum has an invalid length or format (expected: filename|at least 35 hexadecimal characters). Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1061
+#: Model/Attribute.php:1064
 msgid "Invalid CIDR notation value found."
 msgstr ""
 
-#: Model/Attribute.php:1068;1119
+#: Model/Attribute.php:1071;1122
 msgid "IP address has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1073
+#: Model/Attribute.php:1076
 msgid "Port numbers have to be positive integers between 1 and 65535."
 msgstr ""
 
-#: Model/Attribute.php:1102
+#: Model/Attribute.php:1105
 msgid " name has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1122
+#: Model/Attribute.php:1125
 msgid "Domain name has an invalid format."
 msgstr ""
 
-#: Model/Attribute.php:1135
+#: Model/Attribute.php:1138
 msgid "Email address has an invalid format. Please double check the value or select type \"other\"."
 msgstr ""
 
-#: Model/Attribute.php:1143
+#: Model/Attribute.php:1146
 msgid "Invalid format. Expected: CVE-xxxx-xxxx..."
 msgstr ""
 
-#: Model/Attribute.php:1154
+#: Model/Attribute.php:1157
 msgid "Invalid format. Only values shorter than 256 characters that don't include any forward or backward slashes are allowed."
 msgstr ""
 
-#: Model/Attribute.php:1267
+#: Model/Attribute.php:1272
 msgid "Datetime has to be in the ISO 8601 format."
 msgstr ""
 
-#: Model/Attribute.php:1273
+#: Model/Attribute.php:1278
 msgid "The value has to be a number greater or equal 0."
 msgstr ""
 
-#: Model/Attribute.php:1280
+#: Model/Attribute.php:1285
 msgid "The value has to be a number between 0 and 10."
 msgstr ""
 
-#: Model/Attribute.php:1962;2030
+#: Model/Attribute.php:1968;2036
 msgid "Could not read user."
 msgstr ""
 
-#: Model/Attribute.php:2610
+#: Model/Attribute.php:2616
 msgid "This field is mandatory."
 msgstr ""
 
-#: Model/Attribute.php:3062
+#: Model/Attribute.php:3069
 msgid "Something went wrong. Received a non-numeric event ID while trying to create a zip archive of an uploaded malware sample."
 msgstr ""
 
-#: Model/AttributeTag.php:131;160
-msgid "Invalid attributes"
-msgstr ""
-
-#: Model/Event.php:5198
+#: Model/Event.php:5392
 msgid "Issues while loading the stix file. "
 msgstr ""
 
-#: Model/Event.php:5200
+#: Model/Event.php:5394
 msgid "Issues with the maec library. "
 msgstr ""
 
-#: Model/Event.php:5202
+#: Model/Event.php:5396
 msgid "Issues executing the ingestion script or invalid input. "
 msgstr ""
 
-#: Model/Event.php:5205
+#: Model/Event.php:5399
 msgid "Please ask your administrator to "
 msgstr ""
 
-#: Model/Event.php:5207
+#: Model/Event.php:5401
 msgid "Please "
 msgstr ""
 
-#: Model/Event.php:5209
+#: Model/Event.php:5403
 msgid "check whether the dependencies for STIX are met via the diagnostic tool."
 msgstr ""
 
-#: Model/Event.php:5241
+#: Model/Event.php:5435
 msgid "#"
 msgstr ""
 
-#: Model/Event.php:5250
+#: Model/Event.php:5444
 msgid "%s not set"
 msgstr ""
 
-#: Model/Event.php:5471
+#: Model/Event.php:5667
 msgid "Could not add tags."
 msgstr "无法添加标签。"
 
-#: Model/Galaxy.php:199;256;266;280
+#: Model/Galaxy.php:219;276;286;300
 msgid "Invalid %s."
 msgstr ""
 
-#: Model/Server.php:119
+#: Model/Galaxy.php:402
+msgid "Galaxy cannot be represented as a matrix"
+msgstr ""
+
+#: Model/Server.php:121
 msgid "Certain administrative tasks are exposed to the API, these help with maintaining and configuring MISP in an automated way / via external tools."
 msgstr ""
 
-#: Model/Server.php:120
+#: Model/Server.php:122
 msgid "Administering MISP via the CLI"
 msgstr ""
 
-#: Model/Server.php:130
+#: Model/Server.php:132
 msgid "If you would like to automate tasks such as caching feeds or pulling from server instances, you can do it using the following command line tools. Simply execute the given commands via the command line / create cron jobs easily out of them."
 msgstr ""
 
-#: Model/Server.php:131
+#: Model/Server.php:133
 #: View/Tasks/index.ctp:6
 msgid "Automating certain console tasks"
 msgstr ""
 
-#: Model/Server.php:140
+#: Model/Server.php:142
 msgid "The base url of the application (in the format https://www.mymispinstance.com). Several features depend on this setting being correctly set to function."
 msgstr ""
 
-#: Model/Server.php:142
+#: Model/Server.php:144
 msgid "The currenty set baseurl does not match the URL through which you have accessed the page. Disregard this if you are accessing the page via an alternate URL (for example via IP address)."
 msgstr ""
 
-#: Model/Server.php:148
+#: Model/Server.php:150
+msgid "The base url of the application (in the format https://www.mymispinstance.com) as visible externally/by other MISPs. MISP will encode this URL in sharing groups when including itself. If this value is not set, the baseurl is used as a fallback."
+msgstr ""
+
+#: Model/Server.php:158
 msgid "Unless set to true, the instance will only be accessible by site admins."
 msgstr ""
 
-#: Model/Server.php:156
+#: Model/Server.php:166
 msgid "Select the language MISP should use. The default is english."
 msgstr ""
 
-#: Model/Server.php:166
+#: Model/Server.php:176
 msgid "Enable some performance heavy correlations (currently CIDR correlation)"
 msgstr ""
 
-#: Model/Server.php:175
+#: Model/Server.php:185
 msgid "It is highly recommended to install all the python dependencies in a virtualenv. The recommended location is: %s/venv"
 msgstr ""
 
-#: Model/Server.php:185
+#: Model/Server.php:195
 msgid "In some cases, a heavily used MISP instance can generate unwanted blackhole errors due to a high number of requests hitting the server. Disable the auto logout functionality to ease the burden on the system."
 msgstr ""
 
-#: Model/Server.php:194
+#: Model/Server.php:204
 msgid "Set the ssdeep score at which to consider two ssdeep hashes as correlating [1-100]"
 msgstr ""
 
-#: Model/Server.php:202
+#: Model/Server.php:212
 msgid "Sets the maximum number of correlations that can be fetched with a single event. For extreme edge cases this can prevent memory issues. The default value is 5k."
 msgstr ""
 
-#: Model/Server.php:211
+#: Model/Server.php:221
 msgid "The message that users will see if the instance is not live."
 msgstr ""
 
-#: Model/Server.php:213
+#: Model/Server.php:223
 msgid "If this is not set the default value will be used."
 msgstr ""
 
-#: Model/Server.php:219;227;245;269;277;285;293;350;398;406;472
+#: Model/Server.php:229;237;255;279;287;295;303;360;408;416;482
 msgid "This setting is deprecated and can be safely removed."
 msgstr ""
 
-#: Model/Server.php:235
+#: Model/Server.php:245
 msgid "Cached exports can take up a considerable amount of space and can be disabled instance wide using this setting. Disabling the cached exports is not recommended as it's a valuable feature, however, if your server is having free space issues it might make sense to take this step."
 msgstr ""
 
-#: Model/Server.php:253
+#: Model/Server.php:263
 msgid "Footer text prepending the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:261
+#: Model/Server.php:271
 msgid "Footer text following the \"Powered by MISP\" text."
 msgstr ""
 
-#: Model/Server.php:301
+#: Model/Server.php:311
 msgid "If set, this setting allows you to display a logo on the right side of the footer. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:309
+#: Model/Server.php:319
 msgid "If set, this setting allows you to display a logo as the home icon. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:317
+#: Model/Server.php:327
 msgid "If set, the image specified here will replace the main MISP logo on the login screen. Upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:325
+#: Model/Server.php:335
 msgid "The organisation tag of the hosting organisation. This is used in the e-mail subjects."
 msgstr ""
 
-#: Model/Server.php:333
+#: Model/Server.php:343
 msgid "The hosting organisation of this instance. If this is not selected then replication instances cannot be added."
 msgstr ""
 
-#: Model/Server.php:342
+#: Model/Server.php:352
 msgid "The MISP instance UUID. This UUID is used to identify this instance."
 msgstr ""
 
-#: Model/Server.php:344
+#: Model/Server.php:354
 msgid "No valid UUID set"
 msgstr ""
 
-#: Model/Server.php:358
+#: Model/Server.php:368
 msgid "Setting this setting to 'false' will hide all organisation names / logos."
 msgstr ""
 
-#: Model/Server.php:366
+#: Model/Server.php:376
 msgid "Put the event threat level in the notification E-mail subject."
 msgstr ""
 
-#: Model/Server.php:374
+#: Model/Server.php:384
 msgid "This is the TLP string for e-mails when email_subject_tag is not found."
 msgstr ""
 
-#: Model/Server.php:382
+#: Model/Server.php:392
 msgid "If this tag is set on an event it's value will be sent in the E-mail subject. If the tag is not set the email_subject_TLP_string will be used."
 msgstr ""
 
-#: Model/Server.php:390
+#: Model/Server.php:400
 msgid "Include in name of the email_subject_tag in the subject. When false only the tag value is used."
 msgstr ""
 
-#: Model/Server.php:414
+#: Model/Server.php:424
 msgid "Enables the use of MISP's background processing."
 msgstr ""
 
-#: Model/Server.php:422
+#: Model/Server.php:432
 msgid "Directory where attachments are stored. MISP will NOT migrate the existing data if you change this setting. The only safe way to change this setting is in config.php, when MISP is not running, and after having moved/copied the existing data to the new location. This directory must already exist and be writable and readable by the MISP application."
 msgstr ""
 
-#: Model/Server.php:431
+#: Model/Server.php:441
 msgid "Allow the XML caches to include the encoded attachments."
 msgstr ""
 
-#: Model/Server.php:439
+#: Model/Server.php:449
 msgid "Always download attachments when loaded by a user in a browser"
 msgstr ""
 
-#: Model/Server.php:447
+#: Model/Server.php:457
 msgid "The e-mail address that MISP should use for all notifications"
 msgstr ""
 
-#: Model/Server.php:455
+#: Model/Server.php:465
 msgid "You can disable all e-mailing using this setting. When enabled, no outgoing e-mails will be sent by MISP."
 msgstr ""
 
-#: Model/Server.php:464
+#: Model/Server.php:474
 msgid "The e-mail address that MISP should include as a contact address for the instance's support team."
 msgstr ""
 
-#: Model/Server.php:480
+#: Model/Server.php:490
 msgid "Turn Vulnerability type attributes into links linking to the provided CVE lookup"
 msgstr ""
 
-#: Model/Server.php:488
+#: Model/Server.php:498
 msgid "This setting controls whether notification e-mails will be sent when an event is created via the REST interface. It might be a good idea to disable this setting when first setting up a link to another instance to avoid spamming your users during the initial pull. Quick recap: True = Emails are NOT sent, False = Emails are sent on events published via sync / REST."
 msgstr ""
 
-#: Model/Server.php:496
+#: Model/Server.php:506
 msgid "enabling this flag will allow the event description to be transmitted in the alert e-mail's subject. Be aware that this is not encrypted by GnuPG, so only enable it if you accept that part of the event description will be sent out in clear-text."
 msgstr ""
 
-#: Model/Server.php:504
+#: Model/Server.php:514
 msgid "The default distribution setting for events (0-3)."
 msgstr ""
 
-#: Model/Server.php:513
+#: Model/Server.php:523
 msgid "The default distribution setting for attributes, set it to 'event' if you would like the attributes to default to the event distribution level. (0-3 or \"event\")"
 msgstr ""
 
-#: Model/Server.php:522
+#: Model/Server.php:532
 msgid "The default threat level setting when creating events."
 msgstr ""
 
-#: Model/Server.php:531
+#: Model/Server.php:541
 msgid "The tag collection to be applied to all events created manually."
 msgstr ""
 
-#: Model/Server.php:540
+#: Model/Server.php:550
 msgid "Enable the tagging feature of MISP. This is highly recommended."
 msgstr ""
 
-#: Model/Server.php:548
+#: Model/Server.php:558
 msgid "Show the full tag names on the event index."
 msgstr ""
 
-#: Model/Server.php:557
+#: Model/Server.php:567
 msgid "Used on the login page, before the MISP logo"
 msgstr ""
 
-#: Model/Server.php:565
+#: Model/Server.php:575
 msgid "Used on the login page, after the MISP logo"
 msgstr ""
 
-#: Model/Server.php:573
+#: Model/Server.php:583
 msgid "Used on the login page, to the left of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:581
+#: Model/Server.php:591
 msgid "Used on the login page, to the right of the MISP logo, upload it as a custom image in the file management tool."
 msgstr ""
 
-#: Model/Server.php:589
+#: Model/Server.php:599
 msgid "Used in the page title, after the name of the page"
 msgstr ""
 
-#: Model/Server.php:597
+#: Model/Server.php:607
 msgid "Allows users to take ownership of an event uploaded via the \"Add MISP XML\" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences."
 msgstr ""
 
-#: Model/Server.php:605
+#: Model/Server.php:615
 msgid "Choose whether the terms and conditions should be displayed inline (false) or offered as a download (true)"
 msgstr ""
 
-#: Model/Server.php:613
+#: Model/Server.php:623
 msgid "The filename of the terms and conditions file. Make sure that the file is located in your MISP/app/files/terms directory"
 msgstr ""
 
-#: Model/Server.php:621
+#: Model/Server.php:631
 msgid "True enables the alternate org fields for the event index (source org and member org) instead of the traditional way of showing only an org field. This allows users to see if an event was uploaded by a member organisation on their MISP instance, or if it originated on an interconnected instance."
 msgstr ""
 
-#: Model/Server.php:629
+#: Model/Server.php:639
 msgid "True will deny access to unpublished events to users outside the organization of the submitter except site admins."
 msgstr ""
 
-#: Model/Server.php:638
+#: Model/Server.php:648
 msgid "The message sent to the user after account creation (has to be sent manually from the administration interface). Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $org = the organisation that the instance belongs to, as set in MISP.org, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:647
+#: Model/Server.php:657
 msgid "The message sent to the users when a password reset is triggered. Use \\n for line-breaks. The following variables will be automatically replaced in the text: $password = a new temporary password that MISP generates, $username = the user's e-mail address, $misp = the url of this instance, $contact = the e-mail address used to contact the support team, as set in MISP.contact. For example, \"the password for $username is $password\" would appear to a user with the e-mail address user@misp.org as \"the password for user@misp.org is hNamJae81\"."
 msgstr ""
 
-#: Model/Server.php:655
+#: Model/Server.php:665
 msgid "Since version 2.3.107 you can start blacklisting event UUIDs to prevent them from being pushed to your instance. This functionality will also happen silently whenever an event is deleted, preventing a deleted event from being pushed back from another instance."
 msgstr ""
 
-#: Model/Server.php:662
+#: Model/Server.php:672
 msgid "Blacklisting organisation UUIDs to prevent the creation of any event created by the blacklisted organisation."
 msgstr ""
 
-#: Model/Server.php:669
+#: Model/Server.php:679
 msgid "If enabled, all log entries will include the IP address of the user."
 msgstr ""
 
-#: Model/Server.php:678
+#: Model/Server.php:688
 msgid "If enabled, MISP will log all successful authentications using API keys. The requested URLs are also logged."
 msgstr ""
 
-#: Model/Server.php:686
+#: Model/Server.php:696
 msgid "This feature allows users to create org only events and ask another organisation to take ownership of the event. This allows organisations to remain anonymous by asking a partner to publish an event for them."
 msgstr ""
 
-#: Model/Server.php:695
+#: Model/Server.php:705
 msgid "When enabled, the number of correlations visible to the currently logged in user will be visible on the event index UI. This comes at a performance cost but can be very useful to see correlating events at a glance."
 msgstr ""
 
-#: Model/Server.php:704
+#: Model/Server.php:714
 msgid "When enabled, the number of proposals for the events are shown on the index."
 msgstr ""
 
-#: Model/Server.php:713
+#: Model/Server.php:723
 msgid "When enabled, the aggregate number of attribute sightings within the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:722
+#: Model/Server.php:732
 msgid "When enabled, the aggregate number of discussion posts for the event becomes visible to the currently logged in user on the event index UI."
 msgstr ""
 
-#: Model/Server.php:731
+#: Model/Server.php:741
 msgid "When enabled only Org and Site admins can edit a user's profile."
 msgstr ""
 
-#: Model/Server.php:741
+#: Model/Server.php:751
 msgid "Enable this setting to start blocking alert e-mails for events with a certain tag. Define the tag in MISP.block_event_alert_tag."
 msgstr ""
 
-#: Model/Server.php:750
+#: Model/Server.php:760
 msgid "If the MISP.block_event_alert setting is set, alert e-mails for events tagged with the tag defined by this setting will be blocked."
 msgstr ""
 
-#: Model/Server.php:759
+#: Model/Server.php:769
 msgid "Enable this setting to start blocking alert e-mails for old events. The exact timing of what constitutes an old event is defined by MISP.block_old_event_alert_age."
 msgstr ""
 
-#: Model/Server.php:768
+#: Model/Server.php:778
 msgid "If the MISP.block_old_event_alert setting is set, this setting will control how old an event can be for it to be alerted on. The \"Date\" field of the event is used. Expected format: integer, in days"
 msgstr ""
 
-#: Model/Server.php:777
+#: Model/Server.php:787
 msgid "Please indicate the temp directory you wish to use for certain functionalities in MISP. By default this is set to /tmp and will be used among others to store certain temporary files extracted from imports during the import process."
 msgstr ""
 
-#: Model/Server.php:786
+#: Model/Server.php:796
 msgid "If you would like to customise the css, simply drop a css file in the /var/www/MISP/app/webroot/css directory and enter the name here."
 msgstr ""
 
-#: Model/Server.php:795
+#: Model/Server.php:805
 msgid "Enable this setting to allow blocking attributes from to_ids sensitive exports if a proposal has been made to it to remove the IDS flag or to remove the attribute altogether. This is a powerful tool to deal with false-positives efficiently."
 msgstr ""
 
-#: Model/Server.php:804
+#: Model/Server.php:814
 msgid "Enable this settings if new tags synced / added via incoming events from any source should not be selectable by users by default."
 msgstr ""
 
-#: Model/Server.php:813
+#: Model/Server.php:823
 msgid "*WARNING* This setting will completely disable the correlation on this instance and remove any existing saved correlations. Enabling this will trigger a full recorrelation of all data which is an extremely long and costly procedure. Only enable this if you know what you're doing."
 msgstr ""
 
-#: Model/Server.php:823
+#: Model/Server.php:833
 msgid "*WARNING* This setting will give event creators the possibility to disable the correlation of individual events / attributes that they have created."
 msgstr ""
 
-#: Model/Server.php:832
+#: Model/Server.php:842
 msgid "The host running the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:840
+#: Model/Server.php:850
 msgid "The port used by the redis server to be used for generic MISP tasks such as caching. This is not to be confused by the redis server used by the background processing."
 msgstr ""
 
-#: Model/Server.php:848
+#: Model/Server.php:858
 msgid "The database on the redis server to be used for generic MISP tasks. If you run more than one MISP instance, please make sure to use a different database on each instance."
 msgstr ""
 
-#: Model/Server.php:856
+#: Model/Server.php:866
 msgid "The password on the redis server (if any) to be used for generic MISP tasks."
 msgstr ""
 
-#: Model/Server.php:865
+#: Model/Server.php:875
 msgid "Specify which fields to filter on when you search on the event view. Default values are : \"id, uuid, value, comment, type, category, Tag.name\""
 msgstr ""
 
-#: Model/Server.php:873
+#: Model/Server.php:883
 msgid "Set this to false if you would like to disable MISP managing its own worker processes (for example, if you are managing the workers with a systemd unit)."
 msgstr ""
 
-#: Model/Server.php:881
+#: Model/Server.php:891
 msgid "Only enable this if you have some tools using MISP with extreme high concurency. General performance will be lower as normal as certain transactional queries are avoided in favour of shorter table locks."
 msgstr ""
 
-#: Model/Server.php:893
+#: Model/Server.php:903
 msgid "The location of the GnuPG executable. If you would like to use a different GnuPG executable than /usr/bin/gpg, you can set it here. If the default is fine, just keep the setting suggested by MISP."
 msgstr ""
 
-#: Model/Server.php:901
+#: Model/Server.php:911
 msgid "Allow (false) unencrypted e-mails to be sent to users that don't have a GnuPG key."
 msgstr ""
 
-#: Model/Server.php:909
+#: Model/Server.php:919
 msgid "Allow (false) the body of unencrypted e-mails to contain details about the event."
 msgstr ""
 
-#: Model/Server.php:917
+#: Model/Server.php:927
 msgid "Enable the signing of GnuPG emails. By default, GnuPG emails are signed"
 msgstr ""
 
-#: Model/Server.php:925
+#: Model/Server.php:935
 msgid "The e-mail address that the instance's GnuPG key is tied to."
 msgstr ""
 
-#: Model/Server.php:933
+#: Model/Server.php:943
 msgid "The password (if it is set) of the GnuPG key of the instance."
 msgstr ""
 
-#: Model/Server.php:942
+#: Model/Server.php:952
 msgid "The location of the GnuPG homedir."
 msgstr ""
 
-#: Model/Server.php:953
+#: Model/Server.php:963
 msgid "Enable SMIME encryption. The encryption posture of the GnuPG.onlyencrypted and GnuPG.bodyonlyencrypted settings are inherited if SMIME is enabled."
 msgstr ""
 
-#: Model/Server.php:961
+#: Model/Server.php:971
 msgid "The e-mail address that the instance's SMIME key is tied to."
 msgstr ""
 
-#: Model/Server.php:969
+#: Model/Server.php:979
 msgid "The location of the public half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:977
+#: Model/Server.php:987
 msgid "The location of the private half of the signing certificate."
 msgstr ""
 
-#: Model/Server.php:985
+#: Model/Server.php:995
 msgid "The password (if it is set) of the SMIME key of the instance."
 msgstr ""
 
-#: Model/Server.php:997
+#: Model/Server.php:1007
 msgid "The hostname of an HTTP proxy for outgoing sync requests. Leave empty to not use a proxy."
 msgstr ""
 
-#: Model/Server.php:1005
+#: Model/Server.php:1015
 msgid "The TCP port for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1013
+#: Model/Server.php:1023
 msgid "The authentication method for the HTTP proxy. Currently supported are Basic or Digest. Leave empty for no proxy authentication."
 msgstr ""
 
-#: Model/Server.php:1021
+#: Model/Server.php:1031
 msgid "The authentication username for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1029
+#: Model/Server.php:1039
 msgid "The authentication password for the HTTP proxy."
 msgstr ""
 
-#: Model/Server.php:1040
+#: Model/Server.php:1050
 msgid "The salt used for the hashed passwords. You cannot reset this from the GUI, only manually from the settings.php file. Keep in mind, this will invalidate all passwords in the database."
 msgstr ""
 
-#: Model/Server.php:1049
+#: Model/Server.php:1059
 msgid "Enable this setting to pass all audit log entries directly to syslog. Keep in mind, this is verbose and will include user, organisation, event data."
 msgstr ""
 
-#: Model/Server.php:1058
+#: Model/Server.php:1068
 msgid "Password length requirement. If it is not set or it is set to 0, then the default value is assumed (12)."
 msgstr ""
 
-#: Model/Server.php:1066
+#: Model/Server.php:1076
 msgid "Password complexity requirement. Leave it empty for the default setting (3 out of 4, with either a digit or a special char) or enter your own regex. Keep in mind that the length is checked in another key. Default (simple 3 out of 4 or minimum 16 characters): /^((?=.*\\d)|(?=.*\\W+))(?![\\n])(?=.*[A-Z])(?=.*[a-z]).*$|.{16,}/"
 msgstr ""
 
-#: Model/Server.php:1074
+#: Model/Server.php:1084
 msgid "Enabling this setting will require users to submit their current password on any edits to their profile (including a triggered password change). For administrators, the confirmation will be required when changing the profile of any user. Could potentially mitigate an attacker trying to change a compromised user's password in order to establish persistance, however, enabling this feature will be highly annoying to users."
 msgstr ""
 
-#: Model/Server.php:1083
+#: Model/Server.php:1093
 msgid "Enabling this setting will sanitise the contents of an attribute on a soft delete"
 msgstr ""
 
-#: Model/Server.php:1092
+#: Model/Server.php:1102
 msgid "Enabling this setting will block the organisation index from being visible to anyone besides site administrators on the current instance. Keep in mind that users can still see organisations that produce data via events, proposals, event history log entries, etc."
 msgstr ""
 
-#: Model/Server.php:1101
+#: Model/Server.php:1111
 msgid "Allows passing the API key via the named url parameter \"apikey\" - highly recommended not to enable this, but if you have some dodgy legacy tools that cannot pass the authorization header it can work as a workaround. Again, only use this as a last resort."
 msgstr ""
 
-#: Model/Server.php:1103
+#: Model/Server.php:1113
 msgid "You have enabled the passing of API keys via URL parameters. This is highly recommended against, do you really want to reveal APIkeys in your logs?..."
 msgstr ""
 
-#: Model/Server.php:1113
+#: Model/Server.php:1120
+msgid "Allow cross-origin requests to this instance, matching origins given in Security.cors_origins. Set to false to totally disable"
+msgstr ""
+
+#: Model/Server.php:1129
+msgid "Set the origins from which MISP will allow cross-origin requests. Useful for external integration. Comma seperate if you need more than one."
+msgstr ""
+
+#: Model/Server.php:1141
 msgid "The number of tries a user can try to login and fail before the bruteforce protection kicks in."
 msgstr ""
 
-#: Model/Server.php:1121
+#: Model/Server.php:1149
 msgid "The duration (in seconds) of how long the user will be locked out when the allowed number of login attempts are exhausted."
 msgstr ""
 
-#: Model/Server.php:1132
+#: Model/Server.php:1160
 msgid "Set to true to automatically regenerate sessions after x number of requests. This might lead to the user getting de-authenticated and is frustrating in general, so only enable it if you really need to regenerate sessions. (Not recommended)"
 msgstr ""
 
-#: Model/Server.php:1140
+#: Model/Server.php:1168
 msgid "Set to true to check for the user agent string in each request. This can lead to occasional logouts (not recommended)."
 msgstr ""
 
-#: Model/Server.php:1148
+#: Model/Server.php:1176
 msgid "The session type used by MISP. The default setting is php, which will use the session settings configured in php.ini for the session data (supported options: php, database). The recommended option is php and setting your PHP up to use redis sessions via your php.ini. Just add 'session.save_handler = redis' and \"session.save_path = 'tcp://localhost:6379'\" (replace the latter with your redis connection) to "
 msgstr ""
 
-#: Model/Server.php:1157
+#: Model/Server.php:1185
 msgid "The timeout duration of sessions (in MINUTES). 0 does not mean infinite for the PHP session handler, instead sessions will invalidate immediately."
 msgstr ""
 
-#: Model/Server.php:1165
+#: Model/Server.php:1193
 msgid "The expiration of the cookie (in MINUTES). The session timeout gets refreshed frequently, however the cookies do not. Generally it is recommended to have a much higher cookie_timeout than timeout."
 msgstr ""
 
-#: Model/Server.php:1176
+#: Model/Server.php:1204
 msgid "The default policy action for the values added to the RPZ."
 msgstr ""
 
-#: Model/Server.php:1185
+#: Model/Server.php:1213
 msgid "The default walled garden used by the RPZ export if the walled garden setting is picked for the export."
 msgstr ""
 
-#: Model/Server.php:1193
+#: Model/Server.php:1221
 msgid "The serial in the SOA portion of the zone file. (numeric, best practice is yyyymmddrr where rr is the two digit sub-revision of the file. $date will automatically get converted to the current yyyymmdd, so $date00 is a valid setting)."
 msgstr ""
 
-#: Model/Server.php:1201
+#: Model/Server.php:1229
 msgid "The refresh specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1209
+#: Model/Server.php:1237
 msgid "The retry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1217
+#: Model/Server.php:1245
 msgid "The expiry specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1225
+#: Model/Server.php:1253
 msgid "The minimum TTL specified in the SOA portion of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1233
+#: Model/Server.php:1261
 msgid "The TTL of the zone file. (in seconds, or shorthand duration such as 15m)"
 msgstr ""
 
-#: Model/Server.php:1249
+#: Model/Server.php:1277
 msgid "Alternate nameserver"
 msgstr ""
 
-#: Model/Server.php:1257
+#: Model/Server.php:1285
 msgid "The e-mail address specified in the SOA portion of the zone file."
 msgstr ""
 
-#: Model/Server.php:1265
+#: Model/Server.php:1293
 msgid "Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information."
 msgstr ""
 
-#: Model/Server.php:1274
+#: Model/Server.php:1302
 msgid "The port that the pub/sub feature will use."
 msgstr ""
 
-#: Model/Server.php:1283
+#: Model/Server.php:1311
 msgid "Location of the Redis db used by MISP and the Python PUB script to queue data to be published."
 msgstr ""
 
-#: Model/Server.php:1292
+#: Model/Server.php:1320
 msgid "The port that Redis is listening on."
 msgstr ""
 
-#: Model/Server.php:1301
+#: Model/Server.php:1329
 msgid "The password, if set for Redis."
 msgstr ""
 
-#: Model/Server.php:1310
+#: Model/Server.php:1338
 msgid "The database to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1319
+#: Model/Server.php:1347
 msgid "The namespace to be used for queuing messages for the pub/sub functionality."
 msgstr ""
 
-#: Model/Server.php:1328
+#: Model/Server.php:1356
 msgid "Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output."
 msgstr ""
 
-#: Model/Server.php:1336
+#: Model/Server.php:1364
 msgid "Enables or disables the publishing of any event creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1344
+#: Model/Server.php:1372
 msgid "Enables or disables the publishing of any object creations/edits/deletions."
 msgstr ""
 
-#: Model/Server.php:1352
+#: Model/Server.php:1380
 msgid "Enables or disables the publishing of any object reference creations/deletions."
 msgstr ""
 
-#: Model/Server.php:1360
+#: Model/Server.php:1388
 msgid "Enables or disables the publishing of any attribute creations/edits/soft deletions."
 msgstr ""
 
-#: Model/Server.php:1368
+#: Model/Server.php:1396
 msgid "Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements."
 msgstr ""
 
-#: Model/Server.php:1376
+#: Model/Server.php:1404
 msgid "Enables or disables the publishing of new sightings to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1384
+#: Model/Server.php:1412
 msgid "Enables or disables the publishing of new/modified users to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1392
+#: Model/Server.php:1420
 msgid "Enables or disables the publishing of new/modified organisations to the ZMQ pubsub feed."
 msgstr ""
 
-#: Model/Server.php:1400
+#: Model/Server.php:1428
 msgid "Enables or disables the publishing of log entries to the ZMQ pubsub feed. Keep in mind, this can get pretty verbose depending on your logging settings."
 msgstr ""
 
-#: Model/Server.php:1408
+#: Model/Server.php:1436
 msgid "Enabled logging to an ElasticSearch instance"
 msgstr ""
 
-#: Model/Server.php:1416
+#: Model/Server.php:1444
 msgid "The URL(s) at which to access ElasticSearch - comma separate if you want to have more than one."
 msgstr ""
 
-#: Model/Server.php:1424
+#: Model/Server.php:1452
 msgid "The index in which to place logs"
 msgstr ""
 
-#: Model/Server.php:1432
+#: Model/Server.php:1460
 msgid "Enables or disables uploading of malware samples to S3 rather than to disk (WARNING: Get permission from amazon first!)"
 msgstr ""
 
-#: Model/Server.php:1440
+#: Model/Server.php:1468
 msgid "Bucket name to upload to"
 msgstr ""
 
-#: Model/Server.php:1448
+#: Model/Server.php:1476
 msgid "Region in which your S3 bucket resides"
 msgstr ""
 
-#: Model/Server.php:1456
+#: Model/Server.php:1484
 msgid "AWS key to use when uploading samples (WARNING: It' highly recommended that you use EC2 IAM roles if at all possible)"
 msgstr ""
 
-#: Model/Server.php:1464
+#: Model/Server.php:1492
 msgid "AWS secret key to use when uploading samples"
 msgstr ""
 
-#: Model/Server.php:1472
+#: Model/Server.php:1500
 msgid "This setting defines who will have access to seeing the reported sightings. The default setting is the event owner alone (in addition to everyone seeing their own contribution) with the other options being Sighting reporters (meaning the event owner and anyone that provided sighting data about the event) and Everyone (meaning anyone that has access to seeing the event / attribute)."
 msgstr ""
 
-#: Model/Server.php:1481
+#: Model/Server.php:1509
 msgid "Enabling the anonymisation of sightings will simply aggregate all sightings instead of showing the organisations that have reported a sighting. Users will be able to tell the number of sightings their organisation has submitted and the number of sightings for other organisations"
 msgstr ""
 
-#: Model/Server.php:1489
+#: Model/Server.php:1517
 msgid "Set the range in which sightings will be taken into account when generating graphs. For example a sighting with a sighted_date of 7 years ago might not be relevant anymore. Setting given in number of days, default is 365 days"
 msgstr ""
 
-#: Model/Server.php:1497
+#: Model/Server.php:1525
 msgid "Enable this functionality if you would like to handle the authentication via an external tool and authenticate with MISP using a custom header."
 msgstr ""
 
-#: Model/Server.php:1507
+#: Model/Server.php:1535
 msgid "Set the header that MISP should look for here. If left empty it will default to the Authorization header."
 msgstr ""
 
-#: Model/Server.php:1516
+#: Model/Server.php:1544
 msgid "Use a header namespace for the auth header - default setting is enabled"
 msgstr ""
 
-#: Model/Server.php:1525
+#: Model/Server.php:1553
 msgid "The default header namespace for the auth header - default setting is HTTP_"
 msgstr ""
 
-#: Model/Server.php:1534
+#: Model/Server.php:1562
 msgid "If this setting is enabled then the only way to authenticate will be using the custom header. Altnertatively you can run in mixed mode that will log users in via the header if found, otherwise users will be redirected to the normal login page."
 msgstr ""
 
-#: Model/Server.php:1543
+#: Model/Server.php:1571
 msgid "If you are using an external tool to authenticate with MISP and would like to only allow the tool's url as a valid point of entry then set this field. "
 msgstr ""
 
-#: Model/Server.php:1552
+#: Model/Server.php:1580
 msgid "The name of the authentication method, this is cosmetic only and will be shown on the user creation page and logs."
 msgstr ""
 
-#: Model/Server.php:1561
+#: Model/Server.php:1589
 msgid "Disable the logout button for users authenticate with the external auth mechanism."
 msgstr ""
 
-#: Model/Server.php:1569
+#: Model/Server.php:1597
 msgid "Enable/disable the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1577
+#: Model/Server.php:1605
 msgid "Set a timeout for the enrichment services"
 msgstr ""
 
-#: Model/Server.php:1585;1697
+#: Model/Server.php:1613;1725
 msgid "Enable/disable the import services"
 msgstr ""
 
-#: Model/Server.php:1593;1714
+#: Model/Server.php:1621;1742
 msgid "Set a timeout for the import services"
 msgstr ""
 
-#: Model/Server.php:1601
+#: Model/Server.php:1629
 msgid "The url used to access the import services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1609
+#: Model/Server.php:1637
 msgid "The port used to access the import services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1617
+#: Model/Server.php:1645
 msgid "The url used to access the export services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1625
+#: Model/Server.php:1653
 msgid "The port used to access the export services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1633
+#: Model/Server.php:1661
 msgid "Enable/disable the export services"
 msgstr ""
 
-#: Model/Server.php:1641
+#: Model/Server.php:1669
 msgid "Set a timeout for the export services"
 msgstr ""
 
-#: Model/Server.php:1649
+#: Model/Server.php:1677
 msgid "Enable/disable the hover over information retrieved from the enrichment modules"
 msgstr ""
 
-#: Model/Server.php:1657
+#: Model/Server.php:1685
 msgid "Set a timeout for the hover services"
 msgstr ""
 
-#: Model/Server.php:1665
+#: Model/Server.php:1693
 msgid "The url used to access the enrichment services. By default, it is accessible at http://127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1673
+#: Model/Server.php:1701
 msgid "The port used to access the enrichment services. By default, it is accessible at 127.0.0.1:6666"
 msgstr ""
 
-#: Model/Server.php:1681
+#: Model/Server.php:1709
 msgid "The url used to access Cortex. By default, it is accessible at http://cortex-url"
 msgstr ""
 
-#: Model/Server.php:1689
+#: Model/Server.php:1717
 msgid "The port used to access Cortex. By default, this is port 9000"
 msgstr ""
 
-#: Model/Server.php:1705
+#: Model/Server.php:1733
 msgid "Set an authentication key to be passed to Cortex"
 msgstr ""
 
-#: Model/Server.php:1722
+#: Model/Server.php:1750
 msgid "Set to false to disable SSL verification. This is not recommended."
 msgstr ""
 
-#: Model/Server.php:1731
+#: Model/Server.php:1759
 msgid "Set to false if you wish to ignore hostname match errors when validating certificates."
 msgstr ""
 
-#: Model/Server.php:1740
+#: Model/Server.php:1768
 msgid "Set to true to enable self-signed certificates to be accepted. This requires Cortex_ssl_verify_peer to be enabled."
 msgstr ""
 
-#: Model/Server.php:1749
+#: Model/Server.php:1777
 msgid "Set to the absolute path of the Certificate Authority file that you wish to use for verifying SSL certificates."
 msgstr ""
 
-#: Model/Server.php:1758
+#: Model/Server.php:1786
 msgid "Provide your custom authentication users with an external URL to the authentication system to reset their passwords."
 msgstr ""
 
-#: Model/Server.php:1767
+#: Model/Server.php:1795
 msgid "Provide a custom logout URL for your users that will log them out using the authentication system you use."
 msgstr ""
 
-#: Model/Server.php:1777
+#: Model/Server.php:1805
 msgid "The debug level of the instance, always use 0 for production instances."
 msgstr ""
 
-#: Model/Server.php:1786
+#: Model/Server.php:1814
 msgid "The debug level of the instance for site admins. This feature allows site admins to run debug mode on a live instance without exposing it to other users. The most verbose option of debug and site_admin_debug is used for site admins."
 msgstr ""
 
-#: Model/Server.php:1919
+#: Model/Server.php:1947
 msgid "Blocked an edit to an event that was created locally. This can happen if a synchronised event that was created on this instance was modified by an administrator on the remote side."
 msgstr ""
 
-#: Model/Server.php:2026
+#: Model/Server.php:2054
 msgid "Not authorised. This is either due to an invalid auth key, or due to the sync user not having authentication permissions enabled on the remote server. Another reason could be an incorrect sync server setting."
 msgstr ""
 
-#: Model/Server.php:2028
+#: Model/Server.php:2056
 msgid "Sorry, this is not yet implemented"
 msgstr ""
 
-#: Model/Server.php:2029
+#: Model/Server.php:2057
 msgid "Something went wrong while trying to pull"
 msgstr ""
 
-#: Model/Server.php:2041;2043
+#: Model/Server.php:2069;2071
 msgid "Unknown issue."
 msgstr ""
 
-#: Model/Server.php:2507
+#: Model/Server.php:2535
 msgid "Enable or disable the %s module."
 msgstr ""
 
-#: Model/Server.php:2510
+#: Model/Server.php:2538
 msgid "Restrict the %s module to the given organisation."
 msgstr ""
 
-#: Model/Server.php:2518
+#: Model/Server.php:2546
 msgid "Set this required module specific setting."
 msgstr ""
 
-#: Model/Server.php:2633
+#: Model/Server.php:2661
 msgid "Value not set."
 msgstr ""
 
-#: Model/Server.php:3319
+#: Model/Server.php:3347
+msgid "Something went wrong. MISP tried to save a malformed config file. Setting change reverted."
+msgstr ""
+
+#: Model/Server.php:3475
 msgid "Organisation logos"
 msgstr ""
 
-#: Model/Server.php:3320
+#: Model/Server.php:3476
 msgid "The logo used by an organisation on the event index, event view, discussions, proposals, etc. Make sure that the filename is in the org.png format, where org is the case-sensitive organisation name."
 msgstr ""
 
-#: Model/Server.php:3322
+#: Model/Server.php:3478
 msgid "48x48 pixel .png files"
 msgstr ""
 
-#: Model/Server.php:3325;3340
+#: Model/Server.php:3481;3496
 msgid "Filename must be in the following format: *.png"
 msgstr ""
 
-#: Model/Server.php:3329
+#: Model/Server.php:3485
 msgid "Additional image files"
 msgstr ""
 
-#: Model/Server.php:3330
+#: Model/Server.php:3486
 msgid "Image files uploaded into this directory can be used for various purposes, such as for the login page logos"
 msgstr ""
 
-#: Model/Server.php:3337
+#: Model/Server.php:3493
 msgid "text/html if served inline, anything that conveys the terms of use if served as download"
 msgstr ""
 
-#: Model/Server.php:3509
+#: Model/Server.php:3665
 msgid "Error: Server didn't send the expected response. This may be because the remote server version is outdated."
 msgstr ""
 
-#: Model/Server.php:3959
+#: Model/Server.php:4115
 msgid "Removing a dead worker."
 msgstr ""
 
-#: Model/Server.php:3960
+#: Model/Server.php:4116
 msgid "Removing dead worker data. Worker was of type %s with pid %s"
 msgstr ""
 
-#: Model/Server.php:3964
+#: Model/Server.php:4120
 msgid "Stopping a worker."
 msgstr ""
 
-#: Model/Server.php:3965
+#: Model/Server.php:4121
 msgid "Stopping a worker. Worker was of type %s with pid %s"
 msgstr ""
 
@@ -2310,7 +2311,7 @@ msgstr ""
 
 #: View/Attributes/add.ctp:7
 #: View/Elements/eventattributecreation.ctp:9
-#: View/Elements/side_menu.ctp:54
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:58
 #: View/Pages/doc/using_the_system.ctp:84
 msgid "Add Attribute"
 msgstr ""
@@ -2394,19 +2395,19 @@ msgstr ""
 #: View/Attributes/attribute_replace.ctp:38
 #: View/Attributes/ajax/attributeEditMassForm.ctp:80
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
-#: View/Elements/view_mitre_attack_matrix.ctp:17
+#: View/Elements/view_galaxy_matrix.ctp:76;199
 #: View/Events/contact.ctp:29
 #: View/Events/edit.ctp:59
 #: View/Events/free_text_import.ctp:27
 #: View/News/edit.ctp:34
-#: View/ObjectReferences/ajax/add.ctp:78
+#: View/ObjectReferences/ajax/add.ctp:130
 #: View/Objects/add.ctp:147
 #: View/Objects/revise_object.ctp:85
 #: View/Organisations/admin_add.ctp:49
 #: View/Organisations/admin_edit.ctp:60
 #: View/Servers/add.ctp:115
 #: View/Servers/edit.ctp:162
-#: View/SharingGroups/add.ctp:75
+#: View/SharingGroups/add.ctp:115
 #: View/TagCollections/add.ctp:21
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:91
 #: View/TemplateElements/ajax/template_element_add_file.ctp:67
@@ -2427,13 +2428,14 @@ msgstr ""
 #: View/Attributes/add.ctp:92
 #: View/Attributes/attribute_replace.ctp:44
 #: View/Attributes/ajax/attributeEditMassForm.ctp:84
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/exportSearch.ctp:32
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
 #: View/Elements/eventattributecreation.ctp:89
 #: View/Elements/flashErrorMessage.ctp:5
-#: View/Elements/view_mitre_attack_matrix.ctp:127
+#: View/Elements/view_galaxy_matrix.ctp:200
 #: View/Elements/serverRuleElements/pull.ctp:70
 #: View/Elements/serverRuleElements/push.ctp:72
 #: View/EventDelegations/ajax/accept_delegation.ctp:17
@@ -2442,7 +2444,7 @@ msgstr ""
 #: View/EventDelegations/ajax/view.ctp:24
 #: View/Events/filter_event_index.ctp:171
 #: View/Events/free_text_import.ctp:33
-#: View/Events/ajax/enrich_event.ctp:21
+#: View/Events/ajax/enrich_event.ctp:22
 #: View/Events/ajax/enrichmentChoice.ctp:15
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:31
@@ -2452,7 +2454,7 @@ msgstr ""
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:25
 #: View/Jobs/ajax/error.ctp:34
 #: View/Noticelists/ajax/delete_confirmation.ctp:25
-#: View/ObjectReferences/ajax/add.ctp:82
+#: View/ObjectReferences/ajax/add.ctp:134
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/add.ctp:153
 #: View/Objects/revise_object.ctp:87
@@ -2468,10 +2470,12 @@ msgstr ""
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
 #: View/Sightings/ajax/advanced.ctp:17
-#: View/Sightings/ajax/quickAddConfirmationForm.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:97
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:6
 #: View/TemplateElements/ajax/template_element_add_file.ctp:73
@@ -2520,8 +2524,6 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:4
 #: View/Pages/doc/administration.ctp:90;119;182;196;227
 #: View/Pages/doc/using_the_system.ctp:161;205;268;280
-#: View/Users/admin_view.ctp:14
-#: View/Users/view.ctp:14
 msgid "Org"
 msgstr ""
 
@@ -2536,7 +2538,7 @@ msgid "Event date"
 msgstr ""
 
 #: View/Attributes/alternate_search_result.ctp:10
-#: View/Events/view.ctp:404
+#: View/Events/view.ctp:446
 msgid "Event graph"
 msgstr ""
 
@@ -2564,7 +2566,7 @@ msgstr ""
 
 #: View/Attributes/attribute_replace.ctp:26
 #: View/Noticelists/view.ctp:36
-#: View/Warninglists/view.ctp:54
+#: View/Warninglists/view.ctp:35
 msgid "Values"
 msgstr ""
 
@@ -2611,7 +2613,7 @@ msgstr ""
 
 #: View/Attributes/index.ctp:2
 #: View/Elements/histogram.ctp:4
-#: View/Events/view.ctp:413
+#: View/Events/view.ctp:455
 #: View/Objects/orphaned_object_diagnostics.ctp:44
 #: View/Pages/doc/using_the_system.ctp:242
 #: View/Users/statistics.ctp:16
@@ -2652,46 +2654,46 @@ msgid "Results for all attributes"
 msgstr ""
 
 #: View/Attributes/index.ctp:39;132
-#: View/Elements/eventattribute.ctp:60;267
+#: View/Elements/eventattribute.ctp:60;229
 #: View/Elements/eventdiscussion.ctp:15;126
 #: View/Elements/generic_table.ctp:16
 #: View/Elements/generic_table_row.ctp:16
 #: View/Elements/Feeds/eventattribute.ctp:20;86
 #: View/Elements/Servers/eventattribute.ctp:20;86
 #: View/EventBlacklists/index.ctp:13;54
-#: View/Events/index.ctp:12;89
+#: View/Events/index.ctp:12;115
 #: View/Events/proposal_event_index.ctp:12;95
 #: View/Events/ajax/index.ctp:13;39
 #: View/Feeds/freetext_index.ctp:22;86
-#: View/Feeds/index.ctp:20;232
-#: View/Feeds/preview_index.ctp:14;82
+#: View/Feeds/index.ctp:20;282
+#: View/Feeds/preview_index.ctp:14;89
 #: View/Galaxies/index.ctp:13;53
 #: View/GalaxyClusters/ajax/index.ctp:11;97
 #: View/GalaxyElements/ajax/index.ctp:11;44
-#: View/Jobs/index.ctp:33;162
-#: View/Logs/admin_index.ctp:37;111
+#: View/Jobs/index.ctp:33;197
+#: View/Logs/admin_index.ctp:37;127
 #: View/Logs/event_index.ctp:17;61
 #: View/News/index.ctp:39
 #: View/Noticelists/index.ctp:13;83
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:11;72
-#: View/ObjectTemplates/index.ctp:13;126
+#: View/ObjectTemplates/index.ctp:13;137
 #: View/OrgBlacklists/index.ctp:13;52
-#: View/Organisations/index.ctp:42;138
+#: View/Organisations/index.ctp:42;159
 #: View/Regexp/admin_index.ctp:13;51
 #: View/Regexp/index.ctp:13;45
 #: View/Roles/admin_index.ctp:13;82
 #: View/Roles/index.ctp:13;55
 #: View/Servers/index.ctp:13;156
-#: View/Servers/preview_index.ctp:15;164
-#: View/ShadowAttributes/index.ctp:12;108
-#: View/SharingGroups/index.ctp:13;86
+#: View/Servers/preview_index.ctp:15;190
+#: View/ShadowAttributes/index.ctp:12;118
+#: View/SharingGroups/index.ctp:13;105
 #: View/Tags/index.ctp:21;141
 #: View/Tasks/index.ctp:18;106
 #: View/Taxonomies/index.ctp:13;63
-#: View/Taxonomies/view.ctp:53;171
+#: View/Taxonomies/view.ctp:53;181
 #: View/Templates/index.ctp:13;61
 #: View/Threads/index.ctp:13;98
-#: View/Users/admin_index.ctp:12;56
+#: View/Users/admin_index.ctp:12;86
 #: View/Users/ajax/admin_index.ctp:13;32
 #: View/Warninglists/index.ctp:13;76
 #: View/Whitelists/admin_index.ctp:14;47
@@ -2700,46 +2702,46 @@ msgid "previous"
 msgstr ""
 
 #: View/Attributes/index.ctp:41;134
-#: View/Elements/eventattribute.ctp:62;269
+#: View/Elements/eventattribute.ctp:62;231
 #: View/Elements/eventdiscussion.ctp:17;128
 #: View/Elements/generic_table.ctp:18
 #: View/Elements/generic_table_row.ctp:18
 #: View/Elements/Feeds/eventattribute.ctp:22;88
 #: View/Elements/Servers/eventattribute.ctp:22;88
 #: View/EventBlacklists/index.ctp:15;56
-#: View/Events/index.ctp:14;91
+#: View/Events/index.ctp:14;117
 #: View/Events/proposal_event_index.ctp:14;97
 #: View/Events/ajax/index.ctp:15;41
 #: View/Feeds/freetext_index.ctp:24;88
-#: View/Feeds/index.ctp:22;234
-#: View/Feeds/preview_index.ctp:16;84
+#: View/Feeds/index.ctp:22;284
+#: View/Feeds/preview_index.ctp:16;91
 #: View/Galaxies/index.ctp:15;55
 #: View/GalaxyClusters/ajax/index.ctp:13;99
 #: View/GalaxyElements/ajax/index.ctp:13;46
-#: View/Jobs/index.ctp:35;164
-#: View/Logs/admin_index.ctp:39;113
+#: View/Jobs/index.ctp:35;199
+#: View/Logs/admin_index.ctp:39;129
 #: View/Logs/event_index.ctp:19;63
 #: View/News/index.ctp:41
 #: View/Noticelists/index.ctp:15;85
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:13;74
-#: View/ObjectTemplates/index.ctp:15;128
+#: View/ObjectTemplates/index.ctp:15;139
 #: View/OrgBlacklists/index.ctp:15;54
-#: View/Organisations/index.ctp:44;140
+#: View/Organisations/index.ctp:44;161
 #: View/Regexp/admin_index.ctp:15;53
 #: View/Regexp/index.ctp:15;47
 #: View/Roles/admin_index.ctp:15;84
 #: View/Roles/index.ctp:15;57
 #: View/Servers/index.ctp:15;158
-#: View/Servers/preview_index.ctp:17;166
-#: View/ShadowAttributes/index.ctp:14;110
-#: View/SharingGroups/index.ctp:15;88
+#: View/Servers/preview_index.ctp:17;192
+#: View/ShadowAttributes/index.ctp:14;120
+#: View/SharingGroups/index.ctp:15;107
 #: View/Tags/index.ctp:23;143
 #: View/Tasks/index.ctp:20;108
 #: View/Taxonomies/index.ctp:15;65
-#: View/Taxonomies/view.ctp:55;173
+#: View/Taxonomies/view.ctp:55;183
 #: View/Templates/index.ctp:15;63
 #: View/Threads/index.ctp:15;100
-#: View/Users/admin_index.ctp:14;58
+#: View/Users/admin_index.ctp:14;88
 #: View/Users/ajax/admin_index.ctp:15;34
 #: View/Warninglists/index.ctp:15;78
 #: View/Whitelists/admin_index.ctp:16;49
@@ -2748,17 +2750,17 @@ msgid "next"
 msgstr ""
 
 #: View/Attributes/index.ctp:53
-#: View/Elements/eventattribute.ctp:190
+#: View/Elements/eventattribute.ctp:152
 #: View/Elements/Events/eventIndexTable.ctp:37
 #: View/Elements/Feeds/eventattribute.ctp:45
 #: View/Elements/Servers/eventattribute.ctp:45
 #: View/Events/resolved_attributes.ctp:52
-#: View/Events/view.ctp:121
+#: View/Events/view.ctp:117
 #: View/Feeds/preview_event.ctp:16
 #: View/Noticelists/view.ctp:43
 #: View/Pages/doc/using_the_system.ctp:164;207;318
 #: View/Servers/preview_event.ctp:27
-#: View/Servers/preview_index.ctp:68
+#: View/Servers/preview_index.ctp:94
 #: View/Tags/index.ctp:10
 #: View/Templates/add.ctp:12
 #: View/Templates/edit.ctp:12
@@ -2767,24 +2769,24 @@ msgid "Tags"
 msgstr ""
 
 #: View/Attributes/index.ctp:54
-#: View/Elements/eventattribute.ctp:197
-#: View/Elements/global_menu.ctp:57
-#: View/Events/view.ctp:425
+#: View/Elements/eventattribute.ctp:159
+#: View/Elements/global_menu.ctp:90
+#: View/Events/view.ctp:467
 #: View/Events/ajax/ajaxGalaxies.ctp:6
 #: View/Galaxies/index.ctp:2
 msgid "Galaxies"
 msgstr ""
 
 #: View/Attributes/index.ctp:56
-#: View/Elements/eventattribute.ctp:199
+#: View/Elements/eventattribute.ctp:161
 msgid "Correlate"
 msgstr ""
 
 #: View/Attributes/index.ctp:57
-#: View/Elements/eventattribute.ctp:200
+#: View/Elements/eventattribute.ctp:162
 #: View/Elements/Feeds/eventattribute.ctp:47
 #: View/Elements/Servers/eventattribute.ctp:47
-#: View/Events/view.ctp:272
+#: View/Events/view.ctp:314
 #: View/Feeds/preview_event.ctp:73
 #: View/Pages/doc/using_the_system.ctp:235
 #: View/Servers/preview_event.ctp:95
@@ -2792,27 +2794,27 @@ msgid "Related Events"
 msgstr ""
 
 #: View/Attributes/index.ctp:58
-#: View/Elements/eventattribute.ctp:201
+#: View/Elements/eventattribute.ctp:163
 #: View/Elements/Feeds/eventattribute.ctp:48
 #: View/Elements/Servers/eventattribute.ctp:48
 msgid "Feed hits"
 msgstr ""
 
 #: View/Attributes/index.ctp:61
-#: View/Elements/eventattribute.ctp:204
-#: View/Events/view.ctp:207
+#: View/Elements/eventattribute.ctp:166
+#: View/Events/view.ctp:229
 msgid "Sightings"
 msgstr ""
 
 #: View/Attributes/index.ctp:62
-#: View/Elements/eventattribute.ctp:205
-#: View/Events/view.ctp:214
+#: View/Elements/eventattribute.ctp:167
+#: View/Events/view.ctp:239
 #: View/Tags/index.ctp:73
 msgid "Activity"
 msgstr ""
 
 #: View/Attributes/index.ctp:63
-#: View/Elements/eventattribute.ctp:206
+#: View/Elements/eventattribute.ctp:168
 #: View/Elements/Users/userIndexTable.ctp:26
 #: View/Elements/healthElements/files.ctp:33
 #: View/Elements/healthElements/workers.ctp:60
@@ -2822,22 +2824,22 @@ msgstr ""
 #: View/EventBlacklists/index.ctp:27
 #: View/Events/export.ctp:31
 #: View/Events/resolved_attributes.ctp:53
-#: View/Feeds/index.ctp:61
-#: View/Feeds/preview_index.ctp:38
+#: View/Feeds/index.ctp:111
+#: View/Feeds/preview_index.ctp:45
 #: View/GalaxyClusters/ajax/index.ctp:51
 #: View/Noticelists/index.ctp:37
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:28
-#: View/ObjectTemplates/index.ctp:55
+#: View/ObjectTemplates/index.ctp:66
 #: View/OrgBlacklists/index.ctp:26
-#: View/Organisations/index.ctp:81
+#: View/Organisations/index.ctp:102
 #: View/Pages/doc/using_the_system.ctp:187;238;286;382
 #: View/Regexp/admin_index.ctp:25
 #: View/Roles/admin_index.ctp:35
 #: View/Servers/index.ctp:37
-#: View/Servers/preview_index.ctp:80
-#: View/SharingGroups/add.ctp:34;54
-#: View/SharingGroups/edit.ctp:34;62
-#: View/SharingGroups/index.ctp:30
+#: View/Servers/preview_index.ctp:106
+#: View/SharingGroups/add.ctp:74;94
+#: View/SharingGroups/edit.ctp:74;102
+#: View/SharingGroups/index.ctp:47
 #: View/Sightings/ajax/list_sightings.ctp:11
 #: View/Tags/index.ctp:76
 #: View/Taxonomies/index.ctp:27
@@ -2853,38 +2855,38 @@ msgstr ""
 #: View/Elements/generic_table.ctp:53
 #: View/Elements/generic_table_row.ctp:45
 #: View/EventBlacklists/index.ctp:47
-#: View/Events/index.ctp:82
+#: View/Events/index.ctp:108
 #: View/Events/proposal_event_index.ctp:88
 #: View/Events/ajax/index.ctp:32
-#: View/Feeds/index.ctp:225
-#: View/Feeds/preview_index.ctp:74
+#: View/Feeds/index.ctp:275
+#: View/Feeds/preview_index.ctp:81
 #: View/Galaxies/index.ctp:46
 #: View/GalaxyClusters/ajax/index.ctp:91
 #: View/GalaxyElements/ajax/index.ctp:38
-#: View/Jobs/index.ctp:155
-#: View/Logs/admin_index.ctp:104
+#: View/Jobs/index.ctp:190
+#: View/Logs/admin_index.ctp:120
 #: View/Logs/event_index.ctp:54
 #: View/News/index.ctp:33
 #: View/Noticelists/index.ctp:76
 #: View/ObjectTemplateElements/ajax/view_elements.ctp:66
-#: View/ObjectTemplates/index.ctp:119
+#: View/ObjectTemplates/index.ctp:130
 #: View/OrgBlacklists/index.ctp:45
-#: View/Organisations/index.ctp:131
+#: View/Organisations/index.ctp:152
 #: View/Regexp/admin_index.ctp:43
 #: View/Regexp/index.ctp:38
 #: View/Roles/admin_index.ctp:75
 #: View/Roles/index.ctp:48
 #: View/Servers/index.ctp:149
-#: View/Servers/preview_index.ctp:156
-#: View/ShadowAttributes/index.ctp:101
-#: View/SharingGroups/index.ctp:79
+#: View/Servers/preview_index.ctp:182
+#: View/ShadowAttributes/index.ctp:111
+#: View/SharingGroups/index.ctp:98
 #: View/Tags/index.ctp:134
 #: View/Tasks/index.ctp:99
 #: View/Taxonomies/index.ctp:56
-#: View/Taxonomies/view.ctp:164
+#: View/Taxonomies/view.ctp:174
 #: View/Templates/index.ctp:54
 #: View/Threads/index.ctp:91
-#: View/Users/admin_index.ctp:49
+#: View/Users/admin_index.ctp:79
 #: View/Users/ajax/admin_index.ctp:25
 #: View/Warninglists/index.ctp:69
 #: View/Whitelists/admin_index.ctp:40
@@ -2964,16 +2966,16 @@ msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Elements/eventdiscussion.ctp:90
-#: View/Elements/side_menu.ctp:392
-#: View/Elements/Events/eventIndexTable.ctp:225
+#: View/Elements/Events/eventIndexTable.ctp:229
 #: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:540
 #: View/Elements/healthElements/files.ctp:73
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/view_graph.ctp:30
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:265
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Pages/doc/using_the_system.ctp:192
 #: View/Roles/admin_index.ctp:67
 #: View/Servers/index.ctp:138
@@ -2983,6 +2985,7 @@ msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:16
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
 #: View/Attributes/ajax/attributeRestorationForm.ctp:11
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:12
 #: View/Attributes/ajax/toggle_correlation.ctp:20
@@ -2996,7 +2999,6 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:14
 #: View/Events/export.ctp:56
 #: View/Events/filter_event_index.ctp:25;112;179;180;205;207
-#: View/Events/view.ctp:174
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:20
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:26
 #: View/Events/ajax/handleSelected.ctp:17
@@ -3006,26 +3008,27 @@ msgstr ""
 #: View/ObjectReferences/ajax/delete.ctp:32
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:19
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:79
 #: View/Servers/ajax/update.ctp:11
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:11
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:11
-#: View/Sightings/ajax/quickAddConfirmationForm.ctp:13
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:11
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:16
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:11
 #: View/Templates/view.ctp:41
-#: View/Users/admin_view.ctp:32;37;104;114;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:27
 msgid "Yes"
 msgstr ""
 
 #: View/Attributes/ajax/attributeConfirmationForm.ctp:21
 #: View/Attributes/ajax/attributeEditMassForm.ctp:31
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:33
 #: View/Attributes/ajax/attributeRestorationForm.ctp:16
 #: View/Attributes/ajax/tagRemoveConfirmation.ctp:17
 #: View/Attributes/ajax/toggle_correlation.ctp:25
@@ -3039,7 +3042,6 @@ msgstr ""
 #: View/EventGraph/ajax/eventGraph_delete_form.ctp:19
 #: View/Events/export.ctp:58;176
 #: View/Events/filter_event_index.ctp:25;112;180;205;207
-#: View/Events/view.ctp:166
 #: View/Events/ajax/eventDeleteConfirmationForm.ctp:25
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:31
 #: View/Events/ajax/handleSelected.ctp:22
@@ -3050,20 +3052,20 @@ msgstr ""
 #: View/ObjectReferences/ajax/delete.ctp:37
 #: View/Objects/revise_object.ctp:67
 #: View/Objects/ajax/delete.ctp:24
-#: View/Organisations/index.ctp:106
+#: View/Organisations/index.ctp:127
 #: View/Servers/preview_event.ctp:89
 #: View/Servers/ajax/update.ctp:16
 #: View/ShadowAttributes/ajax/deletionProposalConfirmationForm.ctp:16
 #: View/ShadowAttributes/ajax/shadowAttributeConfirmationForm.ctp:16
-#: View/Sightings/ajax/quickAddConfirmationForm.ctp:17
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:18
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:16
 #: View/Taxonomies/view.ctp:26
 #: View/Taxonomies/ajax/taxonomy_delete_confirmation.ctp:25
 #: View/Taxonomies/ajax/taxonomy_mass_confirmation.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:24
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:24
 #: View/TemplateElements/ajax/templateElementConfirmationForm.ctp:16
 #: View/Templates/view.ctp:42
-#: View/Users/admin_view.ctp:32;37;106;116;127
-#: View/Users/view.ctp:57
 #: View/Users/ajax/passwordResetConfirmationForm.ctp:32
 #: View/Warninglists/ajax/delete_confirmation.ctp:25
 msgid "No"
@@ -3072,7 +3074,6 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:5
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:5
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:5
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:5
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:5
 #: View/Attributes/ajax/attributeEditValueForm.ctp:6
 msgid "Accept change"
@@ -3081,7 +3082,6 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditCategoryForm.ctp:6
 #: View/Attributes/ajax/attributeEditCommentForm.ctp:6
 #: View/Attributes/ajax/attributeEditDistributionForm.ctp:6
-#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:6
 #: View/Attributes/ajax/attributeEditTypeForm.ctp:6
 #: View/Attributes/ajax/attributeEditValueForm.ctp:7
 msgid "Discard change"
@@ -3098,7 +3098,7 @@ msgstr ""
 #: View/Attributes/ajax/attributeEditMassForm.ctp:15
 #: View/Elements/eventattributecreation.ctp:30
 #: View/Events/resolved_attributes.ctp:50
-#: View/Events/view.ctp:143
+#: View/Events/view.ctp:145
 #: View/Feeds/add.ctp:167
 #: View/Feeds/edit.ctp:164
 #: View/Feeds/freetext_index.ctp:36
@@ -3136,6 +3136,34 @@ msgstr ""
 msgid "Clusters to <b>add</b>"
 msgstr ""
 
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+msgid "Toggle IDS flag %s "
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "on"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:13
+#: View/Attributes/ajax/toggle_correlation.ctp:6
+#: View/Events/ajax/toggle_correlation.ctp:6
+msgid "off"
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:18
+msgid "Set the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:20
+msgid "Unset the IDS flag for this attribute."
+msgstr ""
+
+#: View/Attributes/ajax/attributeEditTo_idsForm.ctp:28
+msgid "Toggle IDS flag for attribute"
+msgstr ""
+
 #: View/Attributes/ajax/attributeRestorationForm.ctp:5
 msgid "Attribute Restoration"
 msgstr ""
@@ -3173,16 +3201,6 @@ msgstr ""
 msgid "Toggle Correlation %s "
 msgstr ""
 
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "on"
-msgstr ""
-
-#: View/Attributes/ajax/toggle_correlation.ctp:6
-#: View/Events/ajax/toggle_correlation.ctp:6
-msgid "off"
-msgstr ""
-
 #: View/Attributes/ajax/toggle_correlation.ctp:11
 msgid "Re-enable the correlation for this attribute."
 msgstr ""
@@ -3220,139 +3238,33 @@ msgstr ""
 msgid "Add a tag"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:71;278
+#: View/Elements/eventattribute.ctp:71;240
 #: View/Elements/Feeds/eventattribute.ctp:28;31;94;97
 #: View/Elements/Servers/eventattribute.ctp:28;31;94;97
 msgid "view all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:117
-#: View/Pages/doc/using_the_system.ctp:86
-msgid "Add attribute"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:118
-msgid "Edit selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:119
-msgid "Tag selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:120
-msgid "Add new cluster to selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:121
-msgid "Delete selected Attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:122
-msgid "Accept selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:123
-msgid "Discard selected Proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:124
-msgid "Sightings display for selected attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:128
-msgid "Populate using a template"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:130
-msgid "Populate using the freetext import tool"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:132
-msgid "Replace all attributes of a category/type combination within the event"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:141;161
-msgid "Show all attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:145
-msgid "Only show %s related attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:149
-msgid "Only show proposals"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:149
-#: View/Logs/event_index.ctp:44
-msgid "Proposal"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:150
-msgid "Only show correlating attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:151
-msgid "Only show potentially false positive attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:151
-msgid "Warnings"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:153
-msgid "Include deleted attributes"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:153
-msgid "Deleted"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:155
-msgid "Show attribute context fields"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:155
-msgid "Context"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:156
-msgid "Also display the tags derived from correlations"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:156;193
-msgid "Related Tags"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:159
-msgid "Filter on attributes value"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:161
-#: View/Events/index.ctp:41
-#: View/Servers/preview_index.ctp:42
-#: View/Tags/index.ctp:52
-#: View/Users/admin_index.ctp:37
-msgid "Remove filters"
-msgstr ""
-
-#: View/Elements/eventattribute.ctp:172
+#: View/Elements/eventattribute.ctp:134
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:172
+#: View/Elements/eventattribute.ctp:134
 msgid "Select all attributes/proposals on current page"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:247
+#: View/Elements/eventattribute.ctp:155
+msgid "Related Tags"
+msgstr ""
+
+#: View/Elements/eventattribute.ctp:209
 msgid "Attribute warning: This event doesn't have any attributes visible to you. Either the owner of the event decided to have\n"
 "a specific distribution scheme per attribute and wanted to still distribute the event alone either for notification or potential contribution with attributes without such restriction. Or the owner forgot to add the\n"
 "attributes or the appropriate distribution level. If you think there is a mistake or you can contribute attributes based on the event meta-information, feel free to make a proposal"
 msgstr ""
 
-#: View/Elements/eventattribute.ctp:251
+#: View/Elements/eventattribute.ctp:213
 msgid "Attribute warning: This event doesn't contain any attribute. It's strongly advised to populate the event with attributes (indicators, observables or information) to provide a meaningful event"
 msgstr ""
 
@@ -3360,6 +3272,140 @@ msgstr ""
 msgid "Create multiple attributes one per line"
 msgstr ""
 
+#: View/Elements/eventattributetoolbar.ctp:5
+msgid "Show all attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:6
+#: View/Elements/Events/eventIndexTable.ctp:210
+#: View/Jobs/index.ctp:15;98
+#: View/ObjectTemplates/index.ctp:40
+#: View/Regexp/admin_edit.ctp:18
+#: View/Sightings/ajax/advanced.ctp:5
+msgid "All"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:15
+msgid "Only show %s related attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:24
+msgid "Only show proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:25
+#: View/Logs/event_index.ctp:44
+msgid "Proposal"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:32
+msgid "Only show correlating attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:33
+#: View/Events/view.ctp:283
+msgid "Correlation"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:40
+msgid "Only show potentially false positive attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:41
+#: View/Elements/healthElements/workers.ctp:5
+msgid "Warning"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:52
+#: View/Pages/doc/using_the_system.ctp:86
+msgid "Add attribute"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:59
+msgid "Edit selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:67
+msgid "Tag selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:75
+msgid "Add new cluster to selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:83
+msgid "Delete selected Attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:91
+msgid "Accept selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:99
+msgid "Discard selected Proposals"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:107
+msgid "Sightings display for selected attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:118
+msgid "Populate using a template"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:126
+msgid "Populate using the freetext import tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:133
+msgid "Replace all attributes of a category/type combination within the event"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:147
+msgid "Use a list of simple scopes to filter the data"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:148
+msgid "Scope toggle"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:153
+msgid "Include deleted attributes"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:155
+msgid "Deleted"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:163
+msgid "Show attribute context fields"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:165
+msgid "Context"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:170
+msgid "Advanced filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:174
+msgid "Filtering tool"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:178
+msgid "%s active rule(s)"
+msgstr ""
+
+#: View/Elements/eventattributetoolbar.ctp:197
+#: View/Events/index.ctp:65
+#: View/Logs/admin_index.ctp:62
+#: View/Servers/preview_index.ctp:57
+#: View/Tags/index.ctp:52
+#: View/Users/admin_index.ctp:54
+msgid "Remove filters"
+msgstr ""
+
 #: View/Elements/eventdiscussion.ctp:34
 msgid "Date: "
 msgstr ""
@@ -3369,7 +3415,7 @@ msgid "Deactivated user"
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:89;97
-#: View/Elements/Events/eventIndexTable.ctp:222
+#: View/Elements/Events/eventIndexTable.ctp:226
 #: View/Elements/Events/View/row_attribute.ctp:380
 #: View/Elements/Users/userIndexTable.ctp:90
 #: View/Feeds/edit.ctp:193
@@ -3404,12 +3450,12 @@ msgid "Insert a link to an event - just enter the event ID between the [event][/
 msgstr ""
 
 #: View/Elements/eventdiscussion.ctp:142
-#: View/Events/view.ctp:189;200
+#: View/Events/view.ctp:196;207
 #: View/Objects/orphaned_object_diagnostics.ctp:21
 #: View/Pages/doc/administration.ctp:167
 #: View/Pages/doc/using_the_system.ctp:200;279
 #: View/Posts/add.ctp:33
-#: View/ShadowAttributes/index.ctp:31
+#: View/ShadowAttributes/index.ctp:41
 msgid "Event"
 msgstr ""
 
@@ -3468,8 +3514,8 @@ msgstr ""
 #: View/Elements/footer.ctp:15
 #: View/Users/admin_add.ctp:70
 #: View/Users/admin_edit.ctp:64
-#: View/Users/admin_view.ctp:67
-#: View/Users/view.ctp:60
+#: View/Users/admin_view.ctp:61
+#: View/Users/view.ctp:31
 msgid "GnuPG key"
 msgstr ""
 
@@ -3495,6 +3541,10 @@ msgstr ""
 msgid "View all events containing this cluster."
 msgstr ""
 
+#: View/Elements/galaxyQuickView.ctp:24
+msgid "detach"
+msgstr ""
+
 #: View/Elements/galaxyQuickView.ctp:24
 msgid "Are you sure you want to detach %s from this event?"
 msgstr ""
@@ -3527,113 +3577,113 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:178
+#: View/Elements/generic_picker.ctp:205
 msgid "Due to the large number of options, no contextual information is provided."
 msgstr ""
 
-#: View/Elements/generic_picker.ctp:225
+#: View/Elements/generic_picker.ctp:273
 msgid "Nothing to pick"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:20
+#: View/Elements/global_menu.ctp:11
 #: View/Pages/doc/general.ctp:20
 msgid "Event Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:24
-#: View/Elements/side_menu.ctp:178;221
+#: View/Elements/global_menu.ctp:14
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:191;234
 #: View/Events/export_alternate.ctp:87
 #: View/Pages/doc/general.ctp:34
 msgid "List Events"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:26
-#: View/Elements/side_menu.ctp:183;227
+#: View/Elements/global_menu.ctp:18
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:196;240
 #: View/Events/add.ctp:4
 #: View/Events/export_alternate.ctp:89
 #: View/Pages/doc/general.ctp:35
 msgid "Add Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:28
-#: View/Elements/side_menu.ctp:246
+#: View/Elements/global_menu.ctp:23
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:259
 #: View/Events/export_alternate.ctp:92
 #: View/Pages/doc/general.ctp:36
 msgid "List Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:29
-#: View/Elements/side_menu.ctp:251
+#: View/Elements/global_menu.ctp:27
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:264
 #: View/Events/export_alternate.ctp:93
 #: View/Pages/doc/general.ctp:37
 msgid "Search Attributes"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:30
-#: View/Elements/side_menu.ctp:239
+#: View/Elements/global_menu.ctp:31
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:252
 #: View/Servers/rest.ctp:20
 msgid "REST client"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:32
-#: View/Elements/side_menu.ctp:266
+#: View/Elements/global_menu.ctp:38
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:280
 #: View/Pages/doc/general.ctp:38
 msgid "View Proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:33
-#: View/Elements/side_menu.ctp:270
+#: View/Elements/global_menu.ctp:42
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:285
 #: View/Pages/doc/general.ctp:39
 msgid "Events with proposals"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:35
-#: View/Elements/side_menu.ctp:492
+#: View/Elements/global_menu.ctp:49
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:773
 #: View/Pages/doc/general.ctp:40
 msgid "List Tags"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:36
-#: View/Elements/side_menu.ctp:191
+#: View/Elements/global_menu.ctp:53
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:204
 msgid "List Tag Collections"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:38
-#: View/Elements/side_menu.ctp:496
+#: View/Elements/global_menu.ctp:57
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:778
 #: View/Pages/doc/general.ctp:41
 #: View/Tags/add.ctp:4
 #: View/Tags/edit.ctp:4
 msgid "Add Tag"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:40
-#: View/Elements/side_menu.ctp:517
+#: View/Elements/global_menu.ctp:62
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:807
 msgid "List Taxonomies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:42
-#: View/Elements/side_menu.ctp:531
+#: View/Elements/global_menu.ctp:66
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:835
 #: View/Pages/doc/general.ctp:42
 msgid "List Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:44
-#: View/Elements/side_menu.ctp:533
+#: View/Elements/global_menu.ctp:70
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:840
 #: View/Pages/doc/general.ctp:43
 msgid "Add Template"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:47
-#: View/Elements/side_menu.ctp:275
+#: View/Elements/global_menu.ctp:78
 #: View/Elements/view_event_graph.ctp:15
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:290
 #: View/Events/export.ctp:2
 #: View/Events/export_alternate.ctp:2;95
 #: View/Pages/doc/general.ctp:44
 msgid "Export"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:49
-#: View/Elements/side_menu.ctp:281
+#: View/Elements/global_menu.ctp:82
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:296
 #: View/Events/automation.ctp:2
 #: View/Events/export_alternate.ctp:97
 #: View/Events/legacy_automation.ctp:2
@@ -3642,17 +3692,17 @@ msgstr ""
 msgid "Automation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:61
-#: View/Elements/side_menu.ctp:610
+#: View/Elements/global_menu.ctp:94
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:931
 msgid "List Galaxies"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:68
+#: View/Elements/global_menu.ctp:101
 #: View/Pages/doc/general.ctp:21
 msgid "Input Filters"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:73;77
+#: View/Elements/global_menu.ctp:104;109
 #: View/Pages/doc/administration.ctp:12;64
 #: View/Pages/doc/general.ctp:50
 #: View/Pages/doc/user_management.ctp:69
@@ -3661,7 +3711,7 @@ msgstr ""
 msgid "Import Regexp"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:74;78
+#: View/Elements/global_menu.ctp:114;119
 #: View/Pages/doc/administration.ctp:13
 #: View/Pages/doc/general.ctp:51
 #: View/Pages/doc/user_management.ctp:70
@@ -3670,91 +3720,88 @@ msgstr ""
 msgid "Signature Whitelist"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:80
-#: View/Elements/side_menu.ctp:302
+#: View/Elements/global_menu.ctp:124
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:343
 msgid "List Warninglists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:81
-#: View/Elements/side_menu.ctp:311
+#: View/Elements/global_menu.ctp:128
 msgid "List Noticelists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:87
+#: View/Elements/global_menu.ctp:135
 #: View/Pages/doc/general.ctp:22;54
 msgid "Global Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:91
+#: View/Elements/global_menu.ctp:139
 #: View/News/index.ctp:2
 #: View/Pages/doc/general.ctp:56
 #: View/Pages/doc/user_management.ctp:51
 msgid "News"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:92
-#: View/Elements/side_menu.ctp:339
+#: View/Elements/global_menu.ctp:143
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:422
 #: View/Pages/doc/general.ctp:57
 msgid "My Profile"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:93;207
-#: View/Elements/side_menu.ctp:340
+#: View/Elements/global_menu.ctp:147
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:426
 #: View/Users/dashboard.ctp:2
 msgid "Dashboard"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:97
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/Elements/global_menu.ctp:151
+#: View/SharingGroups/add.ctp:19
+#: View/SharingGroups/edit.ctp:19
 #: View/SharingGroups/view.ctp:39
 #: View/Users/statistics.ctp:27
 #: View/Users/statistics_data.ctp:34
 msgid "Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:101
-#: View/Elements/side_menu.ctp:353
+#: View/Elements/global_menu.ctp:156
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:445
 #: View/Pages/doc/general.ctp:59
 msgid "Role Permissions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:103
-#: View/Elements/side_menu.ctp:633
+#: View/Elements/global_menu.ctp:163
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:975
 msgid "List Object Templates"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:105
-#: View/Elements/side_menu.ctp:359
+#: View/Elements/global_menu.ctp:170
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:462
 msgid "List Sharing Groups"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:107
-#: View/Elements/side_menu.ctp:360
+#: View/Elements/global_menu.ctp:174
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:468
 msgid "Add Sharing Group"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:110
-#: View/Elements/side_menu.ctp:362
+#: View/Elements/global_menu.ctp:182
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:475
 #: View/Events/legacy_automation.ctp:42
 #: View/Pages/doc/general.ctp:60
 #: View/Pages/doc/user_management.ctp:53
 msgid "User Guide"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:111
+#: View/Elements/global_menu.ctp:186
 msgid "Categories & Types"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:112
-#: View/Elements/side_menu.ctp:363
-#: View/Pages/doc/general.ctp:61
-#: View/Pages/doc/user_management.ctp:54
-msgid "Terms &amp; Conditions"
+#: View/Elements/global_menu.ctp:190
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:479
+msgid "Terms & Conditions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:113
-#: View/Elements/side_menu.ctp:364
+#: View/Elements/global_menu.ctp:194
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:483
 #: View/Pages/doc/general.ctp:62
 #: View/Pages/doc/user_management.ctp:55
 #: View/Users/statistics.ctp:7
@@ -3767,33 +3814,33 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:115
+#: View/Elements/global_menu.ctp:201
 #: View/Pages/doc/general.ctp:92
 msgid "List Discussions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:116
+#: View/Elements/global_menu.ctp:205
 #: View/Pages/doc/general.ctp:93
 msgid "Start Discussion"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:123
+#: View/Elements/global_menu.ctp:212
 #: View/Pages/doc/general.ctp:23;66
 msgid "Sync Actions"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:128
-#: View/Elements/side_menu.ctp:397
+#: View/Elements/global_menu.ctp:216
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:546
 #: View/Pages/doc/general.ctp:68
 msgid "List Servers"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:131
-#: View/Elements/side_menu.ctp:550
+#: View/Elements/global_menu.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:862
 msgid "List Feeds"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:140
+#: View/Elements/global_menu.ctp:229
 #: View/Pages/doc/administration.ctp:8
 #: View/Pages/doc/concepts.ctp:8
 #: View/Pages/doc/general.ctp:8;24;71
@@ -3803,106 +3850,100 @@ msgstr ""
 msgid "Administration"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:144
-#: View/Elements/side_menu.ctp:422
+#: View/Elements/global_menu.ctp:234
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:608
 #: View/Pages/doc/general.ctp:74
 msgid "List Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:145
-#: View/Elements/side_menu.ctp:421
+#: View/Elements/global_menu.ctp:238
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:603
 msgid "Add User"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:146
-#: View/Elements/side_menu.ctp:425
+#: View/Elements/global_menu.ctp:242
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:615
 #: View/Pages/doc/general.ctp:77
 msgid "Contact Users"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:148
-#: View/Elements/side_menu.ctp:344;437
+#: View/Elements/global_menu.ctp:249
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:432;655
 msgid "List Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:150
-#: View/Elements/side_menu.ctp:429
-msgid "Add Organisation"
+#: View/Elements/global_menu.ctp:253
+msgid "Add Organisations"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:153
-#: View/Elements/side_menu.ctp:441
+#: View/Elements/global_menu.ctp:260
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:667
 #: View/Pages/doc/general.ctp:76
 msgid "List Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:155
-#: View/Elements/side_menu.ctp:439
-#: View/Roles/admin_add.ctp:4
-msgid "Add Role"
+#: View/Elements/global_menu.ctp:264
+msgid "Add Roles"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:159
-#: View/Pages/doc/general.ctp:79
-msgid "Server Settings"
+#: View/Elements/global_menu.ctp:273
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:673
+#: View/Servers/server_settings.ctp:5
+msgid "Server Settings & Maintenance"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:159
-msgid "Maintenance"
-msgstr ""
-
-#: View/Elements/global_menu.ctp:162
-#: View/Elements/side_menu.ctp:447
+#: View/Elements/global_menu.ctp:282
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:680
 #: View/Jobs/index.ctp:2
 #: View/Pages/doc/general.ctp:80
 msgid "Jobs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:164
-#: View/Elements/side_menu.ctp:449
+#: View/Elements/global_menu.ctp:291
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:686
 #: View/Pages/doc/concepts.ctp:36
 #: View/Pages/doc/general.ctp:81
 #: View/Tasks/index.ctp:3
 msgid "Scheduled Tasks"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:168
+#: View/Elements/global_menu.ctp:300
 msgid "Blacklist Event"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:169
-#: View/Elements/side_menu.ctp:453
+#: View/Elements/global_menu.ctp:305
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:698
 msgid "Manage Event Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:173
+#: View/Elements/global_menu.ctp:314
 msgid "Blacklist Organisation"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:174
-#: View/Elements/side_menu.ctp:457
+#: View/Elements/global_menu.ctp:319
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:710
 msgid "Manage Org Blacklists"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:184
+#: View/Elements/global_menu.ctp:327
 #: View/Pages/doc/general.ctp:25;84
 msgid "Audit"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:188
-#: View/Elements/side_menu.ctp:463
+#: View/Elements/global_menu.ctp:331
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:719
 #: View/Pages/doc/general.ctp:86
 msgid "List Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:189
-#: View/Elements/side_menu.ctp:464
+#: View/Elements/global_menu.ctp:335
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:723
 #: View/Logs/admin_search.ctp:4
 #: View/Pages/doc/general.ctp:87
 msgid "Search Logs"
 msgstr ""
 
-#: View/Elements/global_menu.ctp:211;213
+#: View/Elements/global_menu.ctp:362;367
 #: View/Pages/doc/general.ctp:28;63
 msgid "Log out"
 msgstr ""
@@ -3923,407 +3964,8 @@ msgstr ""
 msgid "Attributes per organization"
 msgstr ""
 
-#: View/Elements/side_menu.ctp:17;74
-msgid "Populate From Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:24
-msgid "Freetext Import Result"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:31
-msgid "View Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:36;511;621
-msgid "View Correlation Graph"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:41
-msgid "View Event History"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:48
-#: View/Events/edit.ctp:8
-msgid "Edit Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:50
-msgid "Delete Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:50;295;326;392;417
-#: View/Elements/Events/eventIndexTable.ctp:225
-#: View/Servers/index.ctp:138
-msgid "Are you sure you want to delete # %s?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:57
-msgid "Add Object"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:62
-msgid "Add Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:69
-msgid "Populate from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:82
-#: View/Events/ajax/enrich_event.ctp:2
-msgid "Enrich Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:87
-msgid "Merge attributes from..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:94
-msgid "Propose Attribute"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:99
-#: View/ShadowAttributes/add_attachment.ctp:4
-msgid "Propose Attachment"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:111
-#: View/Elements/Events/eventIndexTable.ctp:217
-msgid "Publish Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:119
-msgid "Publish (no email)"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:127
-msgid "Unpublish"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:136
-msgid "Delegate Publishing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:147
-#: View/EventDelegations/ajax/accept_delegation.ctp:2
-msgid "Accept Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:155
-msgid "Discard Delegation Request"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:161
-msgid "Publish event to ZMQ"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:166
-msgid "Contact Reporter"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:173;260
-msgid "Download as..."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:196;201
-#: View/TagCollections/add.ctp:6
-msgid "Add Tag Collection"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:208
-msgid "Export Tag Collections"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:213
-msgid "Import Tag Collections"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:234
-msgid "Import from…"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:287
-msgid "List Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:289
-msgid "New Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:290
-msgid "Perform on existing"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:294
-msgid "Edit Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:295
-msgid "Delete Regexp"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:301
-msgid "View Warninglist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:304
-msgid "Update Warninglists"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:310
-msgid "View Noticelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:313
-msgid "Update Noticelists"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:319
-msgid "List Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:321
-msgid "New Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:325
-msgid "Edit Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:326
-msgid "Delete Whitelist"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:333
-#: View/Users/edit.ctp:4
-msgid "Edit My Profile"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:334
-#: View/Pages/doc/administration.ctp:126
-#: View/Users/admin_edit.ctp:70
-#: View/Users/change_pw.ctp:4
-msgid "Change Password"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:349;435
-msgid "View Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:356
-#: View/SharingGroups/edit.ctp:3
-msgid "Edit Sharing Group"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:357
-msgid "View Sharing Group"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:372;385
-msgid "Explore Remote Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:373
-msgid "Explore Remote Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:379
-msgid "Fetch This Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:379
-#: View/Feeds/preview_index.ctp:65
-#: View/Servers/preview_index.ctp:147
-msgid "Are you sure you want to fetch and save this event on your instance?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:391
-#: View/Servers/edit.ctp:4
-msgid "Edit Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:402
-msgid "New Server"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:409
-msgid "View User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:410
-msgid "Reset Password"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:411
-msgid "Edit User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:412
-msgid "Delete User"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:412
-#: View/Elements/Users/userIndexTable.ctp:91
-msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
-msgstr ""
-
-#: View/Elements/side_menu.ctp:416
-#: View/Roles/admin_edit.ctp:4
-msgid "Edit Role"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:417
-msgid "Delete Role"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:431
-#: View/Organisations/admin_edit.ctp:4
-msgid "Edit Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:432
-#: View/Organisations/ajax/merge.ctp:5
-msgid "Merge Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:444
-#: View/Servers/server_settings.ctp:5
-msgid "Server Settings & Maintenance"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:452
-msgid "Blacklists Event"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:456
-msgid "Blacklists Organisation"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:472;479
-msgid "View Thread"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:473
-#: View/Posts/add.ctp:4
-msgid "Add Post"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:480
-#: View/Posts/edit.ctp:4
-msgid "Edit Post"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:485
-msgid "List Threads"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:486
-msgid "New Thread"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:491
-msgid "List Favourite Tags"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:501
-msgid "Edit Tag"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:507;519
-msgid "View Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:520
-msgid "Delete Taxonomy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:538
-msgid "View Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:540
-#: View/Templates/edit.ctp:6
-msgid "Edit Template"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:556
-msgid "Add Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:561
-msgid "Import Feeds from JSON"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:567
-#: View/Feeds/compare_feeds.ctp:7
-msgid "Feed overlap analysis matrix"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:572
-msgid "Export Feed settings"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:576
-msgid "Edit Feed"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:582
-msgid "PreviewIndex"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:590
-msgid "PreviewEvent"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:597
-msgid "View News"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:601
-#: View/News/add.ctp:6
-msgid "Add News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:603
-#: View/News/edit.ctp:6
-msgid "Edit News Item"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:614
-msgid "Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:614
-msgid "Are you sure you want to reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:615
-msgid "Force Update Galaxies"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:615
-msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:619;627
-msgid "View Galaxy"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:620
-msgid "View Cluster"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:637
-msgid "Update Objects"
-msgstr ""
-
-#: View/Elements/side_menu.ctp:642
-msgid "View Object Template"
-msgstr ""
-
 #: View/Elements/view_event_distribution_graph.ctp:9
-#: View/Layouts/default.ctp:86
+#: View/Layouts/default.ctp:87
 #: View/Layouts/graph.ctp:84
 msgid "Loading"
 msgstr ""
@@ -4358,8 +4000,11 @@ msgid "Display"
 msgstr ""
 
 #: View/Elements/view_event_graph.ctp:14
-#: View/Jobs/index.ctp:62
+#: View/Events/index.ctp:58
+#: View/Jobs/index.ctp:97
 #: View/Pages/doc/using_the_system.ctp:197
+#: View/Servers/preview_index.ctp:50
+#: View/Users/admin_index.ctp:47
 msgid "Filters"
 msgstr ""
 
@@ -4372,12 +4017,12 @@ msgstr ""
 msgid "Toggle fullscreen"
 msgstr ""
 
-#: View/Elements/view_mitre_attack_matrix.ctp:30
+#: View/Elements/view_galaxy_matrix.ctp:91
 msgid "Show all"
 msgstr ""
 
 #: View/Elements/Events/eventIndexTable.ctp:5
-#: View/Feeds/index.ctp:39
+#: View/Feeds/index.ctp:89
 msgid "Select all events on current page"
 msgstr ""
 
@@ -4417,51 +4062,58 @@ msgstr ""
 msgid "#Posts"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:82;86;228
+#: View/Elements/Events/eventIndexTable.ctp:82;86;232
 #: View/Elements/Users/userIndexTable.ctp:94
 #: View/Elements/dashboard/dashboard_events.ctp:4;5
 #: View/Elements/dashboard/dashboard_notifications.ctp:4;5;9
 #: View/Events/proposal_event_index.ctp:45;49
-#: View/Feeds/preview_index.ctp:66
+#: View/Feeds/preview_index.ctp:73
 #: View/Noticelists/index.ctp:66
-#: View/ObjectTemplates/index.ctp:104
-#: View/Organisations/index.ctp:122
+#: View/ObjectTemplates/index.ctp:115
+#: View/Organisations/index.ctp:143
 #: View/Pages/doc/using_the_system.ctp:193
-#: View/Servers/preview_index.ctp:148
+#: View/Servers/preview_index.ctp:174
 #: View/Taxonomies/index.ctp:47
 #: View/Warninglists/index.ctp:60
 msgid "View"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:166
-msgid " correlation(s)"
+#: View/Elements/Events/eventIndexTable.ctp:138
+msgid "View cluster"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:176;181
+#: View/Elements/Events/eventIndexTable.ctp:168
+msgid " correlation(s). Show filtered event with correlation only."
+msgstr ""
+
+#: View/Elements/Events/eventIndexTable.ctp:180;185
 msgid " proposal(s)"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:186
+#: View/Elements/Events/eventIndexTable.ctp:190
 msgid "NEW"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:206
-#: View/Jobs/index.ctp:15;63
-#: View/ObjectTemplates/index.ctp:33
-#: View/Regexp/admin_edit.ctp:18
-#: View/Sightings/ajax/advanced.ctp:5
-msgid "All"
+#: View/Elements/Events/eventIndexTable.ctp:221
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:120
+msgid "Publish Event"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:217
+#: View/Elements/Events/eventIndexTable.ctp:221
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:16
 msgid "Are you sure this event is complete and everyone should be informed?"
 msgstr ""
 
-#: View/Elements/Events/eventIndexTable.ctp:218
+#: View/Elements/Events/eventIndexTable.ctp:222
 msgid "Not published"
 msgstr ""
 
+#: View/Elements/Events/eventIndexTable.ctp:229
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:53;329;396;541;595
+#: View/Servers/index.ctp:138
+msgid "Are you sure you want to delete # %s?"
+msgstr ""
+
 #: View/Elements/Events/View/attribute_correlations.ctp:7
 msgid "Show "
 msgstr ""
@@ -4471,10 +4123,25 @@ msgid " more..."
 msgstr ""
 
 #: View/Elements/Events/View/attribute_correlations.ctp:43
-#: View/Events/view.ctp:304
+#: View/Events/view.ctp:346
 msgid "Collapse…"
 msgstr ""
 
+#: View/Elements/Events/View/eventSightingValue.ctp:14
+msgid "- restricted to own organisation only."
+msgstr ""
+
+#: View/Elements/Events/View/eventSightingValue.ctp:17;18
+msgid "Advanced Sightings"
+msgstr ""
+
+#: View/Elements/Events/View/row_attribute.ctp:143
+#: View/Elements/Events/View/row_proposal.ctp:110
+#: View/Elements/Feeds/View/row_attribute.ctp:61
+#: View/Elements/Servers/View/row_attribute.ctp:68
+msgid "warning"
+msgstr ""
+
 #: View/Elements/Events/View/row_attribute.ctp:343
 msgid "Restore attribute"
 msgstr ""
@@ -4537,24 +4204,36 @@ msgid "Expand or Collapse"
 msgstr ""
 
 #: View/Elements/Events/View/row_object.ctp:69
-msgid "Meta-category: "
+#: View/ObjectTemplates/view.ctp:6
+#: View/Objects/revise_object.ctp:49
+#: View/Organisations/admin_add.ctp:22
+#: View/Organisations/admin_edit.ctp:21
+#: View/Organisations/view.ctp:24
+#: View/Organisations/ajax/merge.ctp:65
+#: View/SharingGroups/add.ctp:72
+#: View/SharingGroups/edit.ctp:72
+msgid "UUID"
 msgstr ""
 
 #: View/Elements/Events/View/row_object.ctp:70
+msgid "Meta-category: "
+msgstr ""
+
+#: View/Elements/Events/View/row_object.ctp:71
 #: View/Elements/Feeds/View/row_object.ctp:21
 msgid "Description: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:71
+#: View/Elements/Events/View/row_object.ctp:72
 #: View/Elements/Feeds/View/row_object.ctp:22
 msgid "Template: "
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Permanently delete object"
 msgstr ""
 
-#: View/Elements/Events/View/row_object.ctp:124
+#: View/Elements/Events/View/row_object.ctp:125
 msgid "Soft delete object"
 msgstr ""
 
@@ -4595,7 +4274,7 @@ msgstr ""
 #: View/Elements/Events/View/sighting_field.ctp:12
 #: View/Sightings/ajax/add_sighting.ctp:33
 #: View/Sightings/ajax/advanced.ctp:10
-#: View/Sightings/ajax/quickAddConfirmationForm.ctp:13
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:14
 msgid "Add sighting"
 msgstr ""
 
@@ -4604,7 +4283,6 @@ msgid "Mark as false-positive"
 msgstr ""
 
 #: View/Elements/Events/View/sighting_field.ctp:14
-#: View/Events/view.ctp:212
 msgid "Advanced sightings"
 msgstr ""
 
@@ -4632,7 +4310,7 @@ msgstr ""
 
 #: View/Elements/Feeds/View/row_object.ctp:20
 #: View/Elements/Servers/View/row_object.ctp:20
-#: View/ObjectTemplates/view.ctp:19
+#: View/ObjectTemplates/view.ctp:8
 #: View/Objects/revise_object.ctp:23
 msgid "Meta-category"
 msgstr ""
@@ -4647,7 +4325,7 @@ msgid "all"
 msgstr ""
 
 #: View/Elements/Servers/eventattribute.ctp:41
-#: View/Events/view.ctp:126
+#: View/Events/view.ctp:131
 #: View/Pages/doc/using_the_system.ctp:33;167;208;230;251
 #: View/Servers/preview_event.ctp:36
 #: View/Sightings/ajax/list_sightings.ctp:5
@@ -4665,7 +4343,7 @@ msgid "IDS"
 msgstr ""
 
 #: View/Elements/Servers/Module/type.ctp:11
-#: View/Elements/healthElements/diagnostics.ctp:274
+#: View/Elements/healthElements/diagnostics.ctp:276
 #: View/Pages/doc/administration.ctp:56;228
 msgid "Status"
 msgstr ""
@@ -4674,12 +4352,12 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:66;67;70
 #: View/Elements/healthElements/files.ctp:61
 #: View/Elements/healthElements/workers.ctp:66;67;68
-#: View/Events/automation.ctp:226;233;240;261;268
+#: View/Events/automation.ctp:234;241;248;269;276
 #: View/Events/export.ctp:68;88
 #: View/Events/legacy_automation.ctp:403;410;417;438;445
-#: View/Taxonomies/view.ctp:98;109;154
-#: View/Users/admin_view.ctp:83;92;122
-#: View/Users/view.ctp:62
+#: View/Taxonomies/view.ctp:108;119;164
+#: View/Users/admin_view.ctp:63;84
+#: View/Users/view.ctp:33
 msgid "N/A"
 msgstr ""
 
@@ -4688,23 +4366,24 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:12
 #: View/Elements/templateElements/templateRowText.ctp:12
 #: View/Galaxies/view.ctp:14
-#: View/ObjectTemplates/view.ctp:11
+#: View/ObjectTemplates/view.ctp:4
 #: View/Objects/revise_object.ctp:19
 #: View/Organisations/ajax/merge.ctp:57;64
 #: View/Pages/doc/using_the_system.ctp:306;317;327;340;351
-#: View/Roles/view.ctp:9
-#: View/SharingGroups/add.ctp:11;31;51
-#: View/SharingGroups/edit.ctp:11;31;59
+#: View/Roles/view.ctp:4
+#: View/SharingGroups/add.ctp:51;71;91
+#: View/SharingGroups/edit.ctp:51;71;99
 #: View/SharingGroups/view.ctp:42;67
 #: View/Templates/view.ctp:9
 #: View/Users/statistics_orgs.ctp:31
-#: View/Warninglists/view.ctp:9
+#: View/Warninglists/view.ctp:10
 msgid "Name"
 msgstr ""
 
 #: View/Elements/Servers/View/row_object.ctp:21
 #: View/Elements/healthElements/files.ctp:8
-#: View/Elements/healthElements/settings_tab.ctp:16
+#: View/Elements/healthElements/overview.ctp:17
+#: View/Elements/healthElements/settings_table.ctp:6
 #: View/Elements/templateElements/populateTemplateAttribute.ctp:10
 #: View/Elements/templateElements/populateTemplateDescription.ctp:12
 #: View/Elements/templateElements/populateTemplateFile.ctp:10
@@ -4712,19 +4391,19 @@ msgstr ""
 #: View/Elements/templateElements/templateRowFile.ctp:21
 #: View/Events/export.ctp:27
 #: View/Galaxies/view.ctp:20
-#: View/ObjectTemplates/view.ctp:21
+#: View/ObjectTemplates/view.ctp:9
 #: View/Objects/add.ctp:16;94
-#: View/Organisations/view.ctp:32;89;90
+#: View/Organisations/view.ctp:15;58;59
 #: View/Pages/doc/administration.ctp:48;241
 #: View/Pages/doc/categories_and_types.ctp:44;61
 #: View/Pages/doc/using_the_system.ctp:108;145;328;341;379
 #: View/Servers/preview_event.ctp:65
-#: View/SharingGroups/add.ctp:15
-#: View/SharingGroups/edit.ctp:15
-#: View/SharingGroups/index.ctp:28
+#: View/SharingGroups/add.ctp:55
+#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/index.ctp:45
 #: View/Taxonomies/view.ctp:14
 #: View/Templates/view.ctp:14
-#: View/Warninglists/view.ctp:14
+#: View/Warninglists/view.ctp:11
 msgid "Description"
 msgstr ""
 
@@ -4750,10 +4429,10 @@ msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
 #: View/Elements/Users/userIndexTable.ctp:5
-#: View/Roles/view.ctp:2
+#: View/Roles/view.ctp:24
 #: View/Users/admin_add.ctp:55
-#: View/Users/admin_view.ctp:19
-#: View/Users/view.ctp:19
+#: View/Users/admin_view.ctp:25
+#: View/Users/view.ctp:6
 msgid "Role"
 msgstr ""
 
@@ -4764,7 +4443,7 @@ msgstr ""
 #: View/Elements/Users/userIndexTable.ctp:17
 #: View/Pages/doc/administration.ctp:183
 #: View/Pages/doc/using_the_system.ctp:272
-#: View/ShadowAttributes/index.ctp:54
+#: View/ShadowAttributes/index.ctp:64
 msgid "Created"
 msgstr ""
 
@@ -4776,6 +4455,11 @@ msgstr ""
 msgid "Create new credentials and inform user"
 msgstr ""
 
+#: View/Elements/Users/userIndexTable.ctp:91
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:581
+msgid "Are you sure you want to delete # %s? It is highly recommended to never delete users but to disable them instead."
+msgstr ""
+
 #: View/Elements/dashboard/dashboard_events.ctp:2
 msgid "Changes since last visit"
 msgstr ""
@@ -4804,6 +4488,417 @@ msgstr ""
 msgid "Delegation requests: "
 msgstr ""
 
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:17;83
+msgid "Populate From Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:24
+msgid "Freetext Import Result"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:31
+msgid "View Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:36;799;961
+msgid "View Correlation Graph"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:41
+msgid "View Event History"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:48
+#: View/Events/edit.ctp:8
+msgid "Edit Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:52
+msgid "Delete Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:62
+msgid "Add Object"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:71
+msgid "Add Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:78
+msgid "Populate from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:91
+#: View/Events/ajax/enrich_event.ctp:2
+msgid "Enrich Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:96
+msgid "Merge attributes from..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:103
+msgid "Propose Attribute"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:108
+#: View/ShadowAttributes/add_attachment.ctp:4
+msgid "Propose Attachment"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:128
+msgid "Publish (no email)"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:136
+msgid "Unpublish"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:145
+msgid "Delegate Publishing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:156
+#: View/EventDelegations/ajax/accept_delegation.ctp:2
+msgid "Accept Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:164
+msgid "Discard Delegation Request"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:172
+msgid "Publish event to ZMQ"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:173
+msgid "Are you sure you wish to republish the current event to the ZMQ channel?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:179
+msgid "Contact Reporter"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:186;273
+msgid "Download as..."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:209;214
+#: View/TagCollections/add.ctp:6
+msgid "Add Tag Collection"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:221
+msgid "Export Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:226
+msgid "Import Tag Collections"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:247
+msgid "Import from…"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:307
+msgid "List Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:312
+msgid "New Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:316
+msgid "Perform on existing"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:317
+msgid "Are you sure you want to rerun all of the regex rules on every attribute in the database? This task will take a long while and will modify data indiscriminately based on the rules configured."
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:324
+msgid "Edit Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:328
+msgid "Delete Regexp"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:338
+msgid "View Warninglist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:349
+msgid "Update Warninglists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:350
+msgid "Are you sure you want to update all warninglists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:358
+msgid "View Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:364
+msgid "List Noticelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:368
+msgid "Update Noticelists"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:369
+msgid "Do you wish to continue and update all noticelists?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:379
+msgid "List Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:384
+msgid "New Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:391
+msgid "Edit Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:395
+msgid "Delete Whitelist"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:405
+#: View/Users/edit.ctp:4
+msgid "Edit My Profile"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:409
+#: View/Pages/doc/administration.ctp:126
+#: View/Users/admin_edit.ctp:70
+#: View/Users/change_pw.ctp:4
+msgid "Change Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:416;570
+msgid "Reset Password"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:439;649
+msgid "View Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:451
+#: View/SharingGroups/edit.ctp:3
+msgid "Edit Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:456
+msgid "View Sharing Group"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:494;524
+msgid "Explore Remote Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:502
+msgid "Explore Remote Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:513
+msgid "Fetch This Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:514
+#: View/Feeds/preview_index.ctp:72
+#: View/Servers/preview_index.ctp:173
+msgid "Are you sure you want to fetch and save this event on your instance?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:532
+#: View/Servers/edit.ctp:4
+msgid "Edit Server"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:551
+msgid "New Servers"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:563
+msgid "View User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:575
+msgid "Edit User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:580
+msgid "Delete User"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:589
+#: View/Roles/admin_edit.ctp:4
+msgid "Edit Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:594
+msgid "Delete Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:623
+msgid "Add Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:629;644
+#: View/Organisations/admin_edit.ctp:4
+msgid "Edit Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:637
+#: View/Organisations/ajax/merge.ctp:5
+msgid "Merge Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:661
+#: View/Roles/admin_add.ctp:4
+msgid "Add Role"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:693
+msgid "Blacklists Event"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:705
+msgid "Blacklists Organisation"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:732;746
+msgid "View Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:737
+#: View/Posts/add.ctp:4
+msgid "Add Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:751
+#: View/Posts/edit.ctp:4
+msgid "Edit Post"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:757
+msgid "List Threads"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:761
+msgid "New Thread"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:769
+msgid "List Favourite Tags"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:785
+msgid "Edit Tag"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:793;812
+msgid "View Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:820
+msgid "Delete Taxonomy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:827
+msgid "Update Taxonomies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:847
+msgid "View Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:853
+#: View/Templates/edit.ctp:6
+msgid "Edit Template"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:867
+msgid "Add Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:872
+msgid "Import Feeds from JSON"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:878
+#: View/Feeds/compare_feeds.ctp:7
+msgid "Feed overlap analysis matrix"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:883
+msgid "Export Feed settings"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:890
+msgid "Edit Feed"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:896
+msgid "PreviewIndex"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:902
+msgid "PreviewEvent"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:911
+msgid "View News"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:916
+#: View/News/add.ctp:6
+msgid "Add News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:922
+#: View/News/edit.ctp:6
+msgid "Edit News Item"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:937
+msgid "Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:938
+msgid "Are you sure you want to reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:943
+msgid "Force Update Galaxies"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:944
+msgid "Are you sure you want to drop and reimport all galaxies from the submodule?"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:951;967
+msgid "View Galaxy"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:956
+msgid "View Cluster"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:980
+msgid "Update Objects"
+msgstr ""
+
+#: View/Elements/genericElements/SideMenu/side_menu.ctp:986
+msgid "View Object Template"
+msgstr ""
+
 #: View/Elements/healthElements/diagnostics.ctp:5
 msgid "Incorrect database encoding setting: Your database connection is currently NOT set to UTF-8. Please make sure to uncomment the 'encoding' => 'utf8' line in "
 msgstr ""
@@ -4828,11 +4923,10 @@ msgstr ""
 msgid "Outdated version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:26;154;168;193
+#: View/Elements/healthElements/diagnostics.ctp:26;155;169;194
 #: View/Elements/healthElements/workers.ctp:23;76
 #: View/Events/add_misp_export_result.ctp:23
 #: View/Servers/ajax/zeromqstatus.ctp:11
-#: View/Users/admin_view.ctp:81
 msgid "OK"
 msgstr ""
 
@@ -4898,7 +4992,7 @@ msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:119
 #: View/Elements/healthElements/workers.ctp:83;85
-#: View/Organisations/view.ctp:66
+#: View/Organisations/view.ctp:26
 msgid "Unknown"
 msgstr ""
 
@@ -4931,251 +5025,255 @@ msgid "PHP CLI Version"
 msgstr ""
 
 #: View/Elements/healthElements/diagnostics.ctp:147
+msgid "Please note that the we will be dropping support for Python 2.7 and PHP 7.1 as of 2020-01-01 and are henceforth considered deprecated (but supported until the end of 2019). Both of these versions will by then reached End of Life and will become a liability. Furthermore, by dropping support for these outdated versions of the languages, we'll be able to phase out support for legacy code that exists solely to support them. Make sure that you plan ahead accordingly. More info: "
+msgstr ""
+
+#: View/Elements/healthElements/diagnostics.ctp:148
 msgid "The following settings might have a negative impact on certain functionalities of MISP with their current and recommended minimum settings. You can adjust these in your php.ini. Keep in mind that the recommendations are not requirements, just recommendations. Depending on usage you might want to go beyond the recommended values."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:154
+#: View/Elements/healthElements/diagnostics.ctp:155
 #: View/Events/filter_event_index.ctp:32;190
 #: View/Pages/doc/using_the_system.ctp:66;171
 msgid "Low"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:158
+#: View/Elements/healthElements/diagnostics.ctp:159
 msgid "PHP Extensions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:168
+#: View/Elements/healthElements/diagnostics.ctp:169
 msgid "Not loaded"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:173
+#: View/Elements/healthElements/diagnostics.ctp:174
 msgid "Issues reading PHP settings. This could be due to the test script not being readable."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:181
+#: View/Elements/healthElements/diagnostics.ctp:182
 msgid "Advanced attachment handler"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:182
+#: View/Elements/healthElements/diagnostics.ctp:183
 msgid "The advanced attachment tools are used by the add attachment functionality to extract additional data about the uploaded sample."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:187
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "PyMISP"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:187
+#: View/Elements/healthElements/diagnostics.ctp:188
 msgid "Not installed or version outdated."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:199
+#: View/Elements/healthElements/diagnostics.ctp:200
 msgid "STIX and Cybox libraries"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:200
+#: View/Elements/healthElements/diagnostics.ctp:201
 msgid "Mitre's STIX and Cybox python libraries have to be installed in order for MISP's STIX export to work. Make sure that you install them (as described in the MISP installation instructions) if you receive an error below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:201
+#: View/Elements/healthElements/diagnostics.ctp:202
 msgid "If you run into any issues here, make sure that both STIX and CyBox are installed as described in the INSTALL.txt file. The required versions are"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:207
+#: View/Elements/healthElements/diagnostics.ctp:209
 msgid "Other versions might work but are not tested / recommended."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:216
+#: View/Elements/healthElements/diagnostics.ctp:218
 msgid "STIX and CyBox"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:216
+#: View/Elements/healthElements/diagnostics.ctp:218
 msgid "Could not read test script (stixtest.py)."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:230
+#: View/Elements/healthElements/diagnostics.ctp:232
 msgid " library version"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:247
+#: View/Elements/healthElements/diagnostics.ctp:249
 msgid "GnuPG"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:248
+#: View/Elements/healthElements/diagnostics.ctp:250
 msgid "This tool tests whether your GnuPG is set up correctly or not."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:256
+#: View/Elements/healthElements/diagnostics.ctp:258
 msgid "GnuPG installation and settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:259
+#: View/Elements/healthElements/diagnostics.ctp:261
 msgid "ZeroMQ"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:260
+#: View/Elements/healthElements/diagnostics.ctp:262
 msgid "This tool tests whether the ZeroMQ extension is installed and functional."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:268
+#: View/Elements/healthElements/diagnostics.ctp:270
 msgid "ZeroMQ settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:272
+#: View/Elements/healthElements/diagnostics.ctp:274
 msgid "Start ZMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:272
+#: View/Elements/healthElements/diagnostics.ctp:274
 msgid "Start ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:272
+#: View/Elements/healthElements/diagnostics.ctp:274
 msgid "Start"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:273
+#: View/Elements/healthElements/diagnostics.ctp:275
 msgid "Stop ZeroMQ service"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:273
+#: View/Elements/healthElements/diagnostics.ctp:275
 msgid "Stop"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:274
+#: View/Elements/healthElements/diagnostics.ctp:276
 msgid "Check ZeroMQ service status"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:276
+#: View/Elements/healthElements/diagnostics.ctp:278
 msgid "Proxy"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:277
+#: View/Elements/healthElements/diagnostics.ctp:279
 msgid "This tool tests whether your HTTP proxy settings are correct."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:285
+#: View/Elements/healthElements/diagnostics.ctp:287
 #: View/Pages/doc/administration.ctp:35
 msgid "Proxy settings"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:288
+#: View/Elements/healthElements/diagnostics.ctp:290
 msgid "Module System"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:289
+#: View/Elements/healthElements/diagnostics.ctp:291
 msgid "This tool tests the various module systems and whether they are reachable based on the module settings."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:304
+#: View/Elements/healthElements/diagnostics.ctp:306
 msgid " module system"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:310
+#: View/Elements/healthElements/diagnostics.ctp:312
 msgid "Session table"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:311
+#: View/Elements/healthElements/diagnostics.ctp:313
 msgid "This tool checks how large your database's session table is. <br />Sessions in CakePHP rely on PHP's garbage collection for clean-up and in certain distributions this can be disabled by default resulting in an ever growing cake session table. <br />If you are affected by this, just click the clean session table button below."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:318
+#: View/Elements/healthElements/diagnostics.ctp:320
 msgid "Expired sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:324
+#: View/Elements/healthElements/diagnostics.ctp:326
 msgid "Purge sessions"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:328
+#: View/Elements/healthElements/diagnostics.ctp:330
 msgid "Clean model cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:329
+#: View/Elements/healthElements/diagnostics.ctp:331
 msgid "If you ever run into issues with missing database fields / tables, please run the following script to clean the model cache."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:330
+#: View/Elements/healthElements/diagnostics.ctp:332
 msgid "Clean cache"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:331
+#: View/Elements/healthElements/diagnostics.ctp:333
 msgid "Overwritten objects"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:332
+#: View/Elements/healthElements/diagnostics.ctp:334
 msgid "Prior to 2.4.89, due to a bug a situation could occur where objects got overwritten on a sync pull. This tool allows you to inspect whether you are affected and if yes, remedy the issue."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:334;337
+#: View/Elements/healthElements/diagnostics.ctp:336;339
 msgid "Orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:335
+#: View/Elements/healthElements/diagnostics.ctp:337
 msgid "In some rare cases attributes can remain in the database after an event is deleted becoming orphaned attributes. This means that they do not belong to any event, which can cause issues with the correlation engine (known cases include event deletion directly in the database without cleaning up the attributes and situations involving a race condition with an event deletion happening before all attributes are synchronised over)."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:337;353
+#: View/Elements/healthElements/diagnostics.ctp:339;355
 msgid "Run the test below"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:339
+#: View/Elements/healthElements/diagnostics.ctp:341
 msgid "Check for orphaned attribute"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:339
+#: View/Elements/healthElements/diagnostics.ctp:341
 msgid "Check for orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:340
+#: View/Elements/healthElements/diagnostics.ctp:342
 msgid "Remove orphaned attributes"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:341;343
+#: View/Elements/healthElements/diagnostics.ctp:343;345
 #: View/Pages/administration.ctp:17
 msgid "Verify GnuPG keys"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:342
+#: View/Elements/healthElements/diagnostics.ctp:344
 msgid "Run a full validation of all GnuPG keys within this instance's userbase. The script will try to identify possible issues with each key and report back on the results."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:343
+#: View/Elements/healthElements/diagnostics.ctp:345
 #: View/Pages/administration.ctp:17
 msgid "Check whether every user's GnuPG key is usable"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:344
+#: View/Elements/healthElements/diagnostics.ctp:346
 msgid "Database cleanup scripts"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:345
+#: View/Elements/healthElements/diagnostics.ctp:347
 msgid "If you run into an issue with an infinite upgrade loop (when upgrading from version ~2.4.50) that ends up filling your database with upgrade script log messages, run the following script."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:346
+#: View/Elements/healthElements/diagnostics.ctp:348
 msgid "Prune upgrade logs"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:347;349
+#: View/Elements/healthElements/diagnostics.ctp:349;351
 msgid "Legacy Administrative Tools"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:348
+#: View/Elements/healthElements/diagnostics.ctp:350
 msgid "Click the following button to go to the legacy administrative tools page. There should in general be no need to do this unless you are upgrading a very old MISP instance (<2.4), all updates are done automatically with more current versions."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:350
+#: View/Elements/healthElements/diagnostics.ctp:352
 msgid "Verify bad link on attachments"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:351
+#: View/Elements/healthElements/diagnostics.ctp:353
 msgid "Verify each attachment referenced in database is accessible on filesystem."
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:353
+#: View/Elements/healthElements/diagnostics.ctp:355
 msgid "Non existing attachments referenced in Database"
 msgstr ""
 
-#: View/Elements/healthElements/diagnostics.ctp:355
+#: View/Elements/healthElements/diagnostics.ctp:357
 msgid "Check bad link on attachments"
 msgstr ""
 
@@ -5213,72 +5311,35 @@ msgid "Permissions"
 msgstr ""
 
 #: View/Elements/healthElements/files.ctp:73
-#: View/Organisations/index.ctp:119
+#: View/Organisations/index.ctp:140
 #: View/Regexp/admin_index.ctp:35
 #: View/Roles/admin_index.ctp:67
-#: View/SharingGroups/index.ctp:68
+#: View/SharingGroups/index.ctp:87
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:3
 msgid "Critical, your MISP instance requires immediate attention."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:4
 msgid "Issues found, it is recommended that you resolve them."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:5
 msgid "Good, but there are some optional settings that are incorrect / not set."
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:8
+#: View/Elements/healthElements/overview.ctp:6
 msgid "In perfect health."
 msgstr ""
 
 #: View/Elements/healthElements/overview.ctp:15
-msgid "Overall health"
+msgid "Test"
 msgstr ""
 
-#: View/Elements/healthElements/overview.ctp:17
-msgid "The overall health of your instance depends on the most severe unresolved issues."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:26
-msgid " settings incorrectly or not set"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:27
-msgid " incorrect settings."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:33
-msgid "Critical issues revealed by the diagnostics"
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:34
-msgid " issues detected."
-msgstr ""
-
-#: View/Elements/healthElements/overview.ctp:35
-msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:9
-msgid "Toggle subgroup"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:13
-#: View/Pages/doc/administration.ctp:45
-msgid "Priority"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:14
-#: View/Pages/doc/administration.ctp:46
-msgid "Setting"
-msgstr ""
-
-#: View/Elements/healthElements/settings_tab.ctp:15
+#: View/Elements/healthElements/overview.ctp:16
+#: View/Elements/healthElements/settings_table.ctp:5
 #: View/Events/filter_event_index.ctp:134
 #: View/Events/resolved_attributes.ctp:45
 #: View/Events/show_i_o_c_results.ctp:13
@@ -5293,45 +5354,75 @@ msgstr ""
 msgid "Value"
 msgstr ""
 
-#: View/Elements/healthElements/settings_tab.ctp:17
+#: View/Elements/healthElements/overview.ctp:22
+msgid "Overall health"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:24
+msgid "The overall health of your instance depends on the most severe unresolved issues."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:31
+msgid " settings incorrectly or not set"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:32
+msgid "%s incorrect settings."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:39
+msgid "Critical issues revealed by the diagnostics"
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:40
+msgid "%s issues detected."
+msgstr ""
+
+#: View/Elements/healthElements/overview.ctp:41
+msgid "Issues revealed here can be due to incorrect directory permissions or not correctly installed dependencies."
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:3
+#: View/Pages/doc/administration.ctp:45
+msgid "Priority"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:4
+#: View/Pages/doc/administration.ctp:46
+msgid "Setting"
+msgstr ""
+
+#: View/Elements/healthElements/settings_table.ctp:7
 #: View/Pages/doc/administration.ctp:49
 msgid "Error Message"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:3;15;27;36
-#: View/Events/index.ctp:30;58
-#: View/Logs/admin_index.ctp:47
-#: View/Servers/preview_index.ctp:33
-#: View/Users/admin_index.ctp:28
-msgid "Modify filters"
-msgstr ""
-
-#: View/Elements/healthElements/tabs.ctp:3
+#: View/Elements/healthElements/tabs.ctp:7
 #: View/Pages/doc/administration.ctp:32
 msgid "Overview"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:28
-#: View/Pages/doc/administration.ctp:38
-msgid "Diagnostics"
+#: View/Elements/healthElements/tabs.ctp:23
+msgid "This tab reports some potential critical misconfigurations."
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:37
-#: View/Pages/doc/administration.ctp:39
-msgid "Workers"
+#: View/Elements/healthElements/tabs.ctp:34
+#: View/Pages/doc/administration.ctp:38
+msgid "Diagnostics"
 msgstr ""
 
 #: View/Elements/healthElements/tabs.ctp:45
 msgid "Manage files"
 msgstr ""
 
-#: View/Elements/healthElements/tabs.ctp:48
+#: View/Elements/healthElements/tabs.ctp:50;65
 #: View/Pages/doc/administration.ctp:40
 msgid "Download report"
 msgstr ""
 
-#: View/Elements/healthElements/workers.ctp:5
-msgid "Warning"
+#: View/Elements/healthElements/tabs.ctp:55
+#: View/Pages/doc/administration.ctp:39
+msgid "Workers"
 msgstr ""
 
 #: View/Elements/healthElements/workers.ctp:5
@@ -5377,8 +5468,8 @@ msgstr ""
 #: View/Elements/healthElements/workers.ctp:57
 #: View/Pages/doc/administration.ctp:166
 #: View/Pages/doc/using_the_system.ctp:255
-#: View/Users/admin_view.ctp:7
-#: View/Users/view.ctp:2
+#: View/Users/admin_view.ctp:94
+#: View/Users/view.ctp:58
 msgid "User"
 msgstr ""
 
@@ -5555,14 +5646,14 @@ msgstr ""
 #: View/Pages/doc/administration.ctp:237
 #: View/Pages/doc/categories_and_types.ctp:60
 #: View/Pages/doc/using_the_system.ctp:89;145;232;282;330;377
-#: View/ShadowAttributes/index.ctp:36;51
-#: View/SharingGroups/add.ctp:30
-#: View/SharingGroups/edit.ctp:30
+#: View/ShadowAttributes/index.ctp:46;61
+#: View/SharingGroups/add.ctp:70
+#: View/SharingGroups/edit.ctp:70
 #: View/Sightings/ajax/list_sightings.ctp:7
 #: View/TemplateElements/ajax/template_element_add_attribute.ctp:36
 #: View/Templates/populate_event_from_template_attributes.ctp:7
 #: View/Users/statistics_orgs.ctp:35
-#: View/Warninglists/view.ctp:24
+#: View/Warninglists/view.ctp:13
 msgid "Type"
 msgstr ""
 
@@ -5601,7 +5692,7 @@ msgid "Template Name"
 msgstr ""
 
 #: View/Elements/templateElements/populateTemplateDescription.ctp:10
-#: View/Organisations/view.ctp:60
+#: View/Organisations/view.ctp:26
 #: View/SharingGroups/view.ctp:23
 msgid "Created by"
 msgstr ""
@@ -5621,13 +5712,31 @@ msgid "s"
 msgstr ""
 
 #: View/Elements/templateElements/templateRowAttribute.ctp:4
-#: View/ObjectReferences/ajax/add.ctp:60
+#: View/ObjectReferences/ajax/add.ctp:86
 #: View/Objects/revise_object.ctp:43
 #: View/Pages/doc/administration.ctp:168
 #: View/TemplateElements/ajax/template_element_add_choices.ctp:3
 msgid "Attribute"
 msgstr ""
 
+#: View/Elements/templateElements/templateRowAttribute.ctp:30
+#: View/Elements/templateElements/templateRowFile.ctp:30
+#: View/Events/resolved_attributes.ctp:47
+#: View/Events/show_i_o_c_results.ctp:11
+#: View/Feeds/freetext_index.ctp:31
+#: View/Objects/add.ctp:95
+#: View/Objects/revise_object.ctp:44
+#: View/Pages/doc/categories_and_types.ctp:11;17;31;37;43
+#: View/Pages/doc/using_the_system.ctp:88;125;231;281;329;342
+#: View/ShadowAttributes/index.ctp:58
+#: View/TemplateElements/ajax/template_element_add_attribute.ctp:28
+#: View/TemplateElements/ajax/template_element_add_file.ctp:28
+#: View/TemplateElements/ajax/template_element_edit_attribute.ctp:28
+#: View/TemplateElements/ajax/template_element_edit_file.ctp:28
+#: View/Templates/populate_event_from_template_attributes.ctp:6
+msgid "Category"
+msgstr ""
+
 #: View/Elements/templateElements/templateRowAttribute.ctp:39
 #: View/Pages/doc/categories_and_types.ctp:57
 #: View/Pages/doc/using_the_system.ctp:109
@@ -5870,7 +5979,7 @@ msgstr ""
 
 #: View/Events/add.ctp:52
 #: View/Events/edit.ctp:43
-#: View/ShadowAttributes/index.ctp:42
+#: View/ShadowAttributes/index.ctp:52
 msgid "Event Info"
 msgstr ""
 
@@ -5934,7 +6043,7 @@ msgid "Details"
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:15
-#: View/Jobs/index.ctp:89
+#: View/Jobs/index.ctp:124
 msgid "Failed"
 msgstr ""
 
@@ -5947,7 +6056,7 @@ msgid "Event with this UUID already exists."
 msgstr ""
 
 #: View/Events/add_misp_export_result.ctp:38
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Event "
 msgstr ""
 
@@ -6032,49 +6141,46 @@ msgstr ""
 msgid "Enabling this (by passing \"1\" as the argument) will make the search ignore all of the other arguments, except for the auth key and value. MISP will return an xml / json (depending on the header sent) of all events that have a sub-string match on value in the event info, event orgc, or any of the attribute value1 / value2 fields, or in the attribute comment."
 msgstr ""
 
-#: View/Events/automation.ctp:30;143
+#: View/Events/automation.ctp:30;151
 #: View/Events/legacy_automation.ctp:37;64;91;117;140;203;254;279
 msgid "Events with the date set to a date after the one specified in the from field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:31;144
+#: View/Events/automation.ctp:31;152
 #: View/Events/legacy_automation.ctp:38;65;92;118;141;204;255;280
 msgid "Events with the date set to a date before the one specified in the to field (format: 2015-02-15). This filter will use the date of the event."
 msgstr ""
 
-#: View/Events/automation.ctp:32;145
-#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
-msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
-msgstr ""
-
-#: View/Events/automation.ctp:33
+#: View/Events/automation.ctp:32
 #: View/Events/legacy_automation.ctp:282;307
 msgid "The events that should be included / excluded from the search"
 msgstr ""
 
-#: View/Events/automation.ctp:34
+#: View/Events/automation.ctp:33
 #: View/Events/legacy_automation.ctp:283;308
 msgid "If set, encodes the attachments / zipped malware samples as base64 in the data field within each attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:35
+#: View/Events/automation.ctp:34
 #: View/Events/legacy_automation.ctp:284
 msgid "Only the metadata (event, tags, relations) is returned, attributes and proposals are omitted."
 msgstr ""
 
-#: View/Events/automation.ctp:36
+#: View/Events/automation.ctp:35
 #: View/Events/legacy_automation.ctp:285;309
 msgid "Restrict the results by uuid."
 msgstr ""
 
+#: View/Events/automation.ctp:36
+msgid "Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
+msgstr ""
+
 #: View/Events/automation.ctp:37
-#: View/Events/legacy_automation.ctp:286;310
-msgid "Restrict the results by the last publish timestamp (newer than)."
+msgid "(Deprecated synonym for publish_timestamp) Restrict the results by the timestamp of the last publishing of the event. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
 msgstr ""
 
 #: View/Events/automation.ctp:38
-#: View/Events/legacy_automation.ctp:287
-msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
 msgstr ""
 
 #: View/Events/automation.ctp:39
@@ -6103,8 +6209,7 @@ msgid "Instead of just including the event ID, also include the event UUID in ea
 msgstr ""
 
 #: View/Events/automation.ctp:44
-#: View/Events/legacy_automation.ctp:317
-msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgid "Only return attributes from events that have received a modification after the given timestamp. The input can be a timetamp or a short-hand time description (7d or 24h for example). You can also pass a list with two values to set a time range (for example [\"14d\", \"7d\"])."
 msgstr ""
 
 #: View/Events/automation.ctp:45
@@ -6144,343 +6249,356 @@ msgid "The CSV created when this setting is set to true will not contain the hea
 msgstr ""
 
 #: View/Events/automation.ctp:86
+msgid "URL parameters"
+msgstr ""
+
+#: View/Events/automation.ctp:89
+msgid "It is also possible to pass all of the above parameters via URL parameters, however this is HIGHLY discouraged. If you however have no other options, simply pass the parameters in the following fashion:"
+msgstr ""
+
+#: View/Events/automation.ctp:94
 msgid "RPZ specific parameters for the restSearch APIs"
 msgstr ""
 
-#: View/Events/automation.ctp:87
+#: View/Events/automation.ctp:95
 #: View/Events/legacy_automation.ctp:164
 msgid ">You can export RPZ zone files for DNS level firewalling by using the RPZ export functionality of MISP. The file generated will include all of the IDS flagged domain, hostname and IP-src/IP-dst attribute values that you have access to."
 msgstr ""
 
-#: View/Events/automation.ctp:90
+#: View/Events/automation.ctp:98
 #: View/Events/legacy_automation.ctp:176
 msgid "MISP will inject header values into the zone file as well as define the action taken for each of the values that can all be overriden. By default these values are either the default values shipped with the application, or ones that are overriden by your site administrator. The values are as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:94
+#: View/Events/automation.ctp:102
 #: View/Events/legacy_automation.ctp:180
 msgid "To override the above values, either use the url parameters as described below"
 msgstr ""
 
-#: View/Events/automation.ctp:96
+#: View/Events/automation.ctp:104
 #: View/Events/legacy_automation.ctp:182
 msgid "or POST an XML or JSON object with the above listed options"
 msgstr ""
 
-#: View/Events/automation.ctp:100
+#: View/Events/automation.ctp:108
 #: View/Events/legacy_automation.ctp:211
 msgid "Bro IDS export"
 msgstr ""
 
-#: View/Events/automation.ctp:101
+#: View/Events/automation.ctp:109
 #: View/Events/legacy_automation.ctp:212
 msgid "An export of all attributes of a specific bro type to a formatted plain text file. By default only published and IDS flagged attributes are exported."
 msgstr ""
 
-#: View/Events/automation.ctp:102
+#: View/Events/automation.ctp:110
 #: View/Events/legacy_automation.ctp:213
 msgid "You can configure your tools to automatically download a file one of the Bro types."
 msgstr ""
 
-#: View/Events/automation.ctp:108
+#: View/Events/automation.ctp:116
 #: View/Events/legacy_automation.ctp:219
 msgid "To restrict the results by tags, use the usual syntax. Please be aware the colons (:) cannot be used in the tag search. Use semicolons instead (the search will automatically search for colons instead). To get ip values from events tagged tag1 but not tag2 use"
 msgstr ""
 
-#: View/Events/automation.ctp:111
+#: View/Events/automation.ctp:119
 #: View/Events/legacy_automation.ctp:222
 msgid "It is possible to restrict the bro exports on based on a set of filters. POST a JSON object or an XML at the Bro API to filter the results."
 msgstr ""
 
-#: View/Events/automation.ctp:129
+#: View/Events/automation.ctp:137
 #: View/Events/legacy_automation.ctp:240
 msgid "Alternatively, it is also possible to pass the filters via the parameters in the URL, though it is highly advised to use POST requests with JSON objects instead. The format is as described below"
 msgstr ""
 
-#: View/Events/automation.ctp:131
+#: View/Events/automation.ctp:139
 #: View/Events/legacy_automation.ctp:242
 msgid "The Bro type, any valid Bro type is accepted. The mapping between Bro and MISP types is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:138
+#: View/Events/automation.ctp:146
 #: View/Events/legacy_automation.ctp:249;301
 msgid "To include a tag in the results just write its names into this parameter. To exclude a tag prepend it with a '!'.\n"
 "    You can also chain several tag commands together with the '&amp;&amp;' operator. Please be aware the colons (:) cannot be used in the tag search.\n"
 "    Use semicolons instead (the search will automatically search for colons instead)."
 msgstr ""
 
-#: View/Events/automation.ctp:141
+#: View/Events/automation.ctp:149
 #: View/Events/legacy_automation.ctp:252
 msgid "Restrict the results to the given event IDs."
 msgstr ""
 
-#: View/Events/automation.ctp:142
+#: View/Events/automation.ctp:150
 #: View/Events/legacy_automation.ctp:253
 msgid "Allow attributes to be exported that are not marked as \"to_ids\"."
 msgstr ""
 
-#: View/Events/automation.ctp:146
+#: View/Events/automation.ctp:153
+#: View/Events/legacy_automation.ctp:39;119;142;205;256;281;306
+msgid "Events published within the last x amount of time, where x can be defined in days, hours, minutes (for example 5d or 12h or 30m). This filter will use the published timestamp of the event."
+msgstr ""
+
+#: View/Events/automation.ctp:154
 #: View/Events/legacy_automation.ctp:95;120;174;206;257
 msgid "All attributes that have a hit on a warninglist will be excluded."
 msgstr ""
 
-#: View/Events/automation.ctp:148
+#: View/Events/automation.ctp:156
 #: View/Events/legacy_automation.ctp:41;70;97;122;259;290
 msgid "The keywords false or null should be used for optional empty parameters in the URL."
 msgstr ""
 
-#: View/Events/automation.ctp:149
+#: View/Events/automation.ctp:157
 #: View/Events/legacy_automation.ctp:260
 msgid "For example, to retrieve all attributes for event #5, including non IDS marked attributes too, use the following line"
 msgstr ""
 
-#: View/Events/automation.ctp:152
+#: View/Events/automation.ctp:160
 #: View/Events/legacy_automation.ctp:329
 msgid "Export attributes of event with specified type as XML"
 msgstr ""
 
-#: View/Events/automation.ctp:153
+#: View/Events/automation.ctp:161
 #: View/Events/legacy_automation.ctp:330
 msgid "If you want to export all attributes of a pre-defined type that belong to an event, use the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:155
+#: View/Events/automation.ctp:163
 #: View/Events/legacy_automation.ctp:332
 msgid "sigOnly is an optional flag that will block all attributes from being exported that don't have the IDS flag turned on.\n"
 "    It is possible to search for several types with the '&amp;&amp;' operator and to exclude values with the '!' operator.\n"
 "    For example, to get all IDS signature attributes of type md5 and sha256, but not filename|md5 and filename|sha256 from event 25, use the following"
 msgstr ""
 
-#: View/Events/automation.ctp:160
+#: View/Events/automation.ctp:168
 #: View/Events/legacy_automation.ctp:337
 msgid "Download attachment or malware sample"
 msgstr ""
 
-#: View/Events/automation.ctp:161
+#: View/Events/automation.ctp:169
 #: View/Events/legacy_automation.ctp:338
 msgid "If you know the attribute ID of a malware-sample or an attachment, you can download it with the following syntax"
 msgstr ""
 
-#: View/Events/automation.ctp:163
+#: View/Events/automation.ctp:171
 #: View/Events/legacy_automation.ctp:340
 msgid "Download malware sample by hash"
 msgstr ""
 
-#: View/Events/automation.ctp:164
+#: View/Events/automation.ctp:172
 #: View/Events/legacy_automation.ctp:341
 msgid "You can also download samples by knowing its MD5 hash. Simply pass the hash along as a JSON/XML object or in the URL (with the URL having overruling the passed objects) to receive a JSON/XML object back with the zipped sample base64 encoded along with some contextual information."
 msgstr ""
 
-#: View/Events/automation.ctp:165
+#: View/Events/automation.ctp:173
 #: View/Events/legacy_automation.ctp:342
 msgid "You can also use this API to get all samples from events that contain the passed hash. For this functionality, just pass the \"allSamples\" flag along. Note that if you are getting all samples from matching events, you can use all supported hash types (%s) for the lookup.</p>"
 msgstr ""
 
-#: View/Events/automation.ctp:166
+#: View/Events/automation.ctp:174
 #: View/Events/legacy_automation.ctp:343
 msgid "You can also get all the samples from an event with a given event ID, by passing along the eventID parameter. Make sure that either an event ID or a hash is passed along, otherwise an error message will be returned. Also, if no hash is set, the allSamples flag will get set automatically."
 msgstr ""
 
-#: View/Events/automation.ctp:168
+#: View/Events/automation.ctp:176
 #: View/Events/legacy_automation.ctp:345
 msgid "POST message payload (XML)"
 msgstr ""
 
-#: View/Events/automation.ctp:172
+#: View/Events/automation.ctp:180
 #: View/Events/legacy_automation.ctp:294;320;349
 msgid "POST message payload (json)"
 msgstr ""
 
-#: View/Events/automation.ctp:176
+#: View/Events/automation.ctp:184
 #: View/Events/legacy_automation.ctp:353
 msgid "A quick description of all the parameters in the passed object"
 msgstr ""
 
-#: View/Events/automation.ctp:177
+#: View/Events/automation.ctp:185
 #: View/Events/legacy_automation.ctp:354
 msgid "A hash in MD5 format. If allSamples is set, this can be any one of the following: %s"
 msgstr ""
 
-#: View/Events/automation.ctp:178
+#: View/Events/automation.ctp:186
 #: View/Events/legacy_automation.ctp:355
 msgid "If set, it will return all samples from events that have a match for the hash provided above."
 msgstr ""
 
-#: View/Events/automation.ctp:179
+#: View/Events/automation.ctp:187
 #: View/Events/legacy_automation.ctp:356
 msgid "If set, it will only fetch data from the given event ID."
 msgstr ""
 
-#: View/Events/automation.ctp:180
+#: View/Events/automation.ctp:188
 #: View/Events/legacy_automation.ctp:357
 msgid "Upload malware samples using the \"Upload Sample\" API"
 msgstr ""
 
-#: View/Events/automation.ctp:182
+#: View/Events/automation.ctp:190
 #: View/Events/legacy_automation.ctp:359
 msgid "This API will allow you to populate an event that you have modify rights to with malware samples (and all related hashes). Alternatively, if you do not supply an event ID, it will create a new event for you."
 msgstr ""
 
-#: View/Events/automation.ctp:183
+#: View/Events/automation.ctp:191
 #: View/Events/legacy_automation.ctp:360
 msgid "The files have to be base64 encoded and POSTed as explained below. All samples will be zipped and password protected (with the password being \"infected\"). The hashes of the original file will be captured as additional attributes."
 msgstr ""
 
-#: View/Events/automation.ctp:184
+#: View/Events/automation.ctp:192
 #: View/Events/legacy_automation.ctp:361
 msgid "The event ID is optional. MISP will accept either a JSON or an XML object posted to the above URL."
 msgstr ""
 
-#: View/Events/automation.ctp:185
+#: View/Events/automation.ctp:193
 #: View/Events/legacy_automation.ctp:362
 msgid "The general structure of the expected objects is as follows"
 msgstr ""
 
-#: View/Events/automation.ctp:194
+#: View/Events/automation.ctp:202
 #: View/Events/legacy_automation.ctp:371
 msgid "The following optional parameters are expected"
 msgstr ""
 
-#: View/Events/automation.ctp:195
+#: View/Events/automation.ctp:203
 #: View/Events/legacy_automation.ctp:372
 msgid "The Event's ID is optional. It can be either supplied via the URL or the POSTed object, but the URL has priority if both are provided. Not supplying an event ID will cause MISP to create a single new event for all of the POSTed malware samples. You can define the default settings for the event, otherwise a set of default settings will be used."
 msgstr ""
 
-#: View/Events/automation.ctp:196
+#: View/Events/automation.ctp:204
 #: View/Events/legacy_automation.ctp:373
 msgid "The distribution setting used for the attributes and for the newly created event, if relevant. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:197
+#: View/Events/automation.ctp:205
 #: View/Events/legacy_automation.ctp:374
 msgid "You can flag all attributes created during the transaction to be marked as \"to_ids\" or not."
 msgstr ""
 
-#: View/Events/automation.ctp:198
+#: View/Events/automation.ctp:206
 #: View/Events/legacy_automation.ctp:375
 msgid "The category that will be assigned to the uploaded samples. Valid options are: Payload delivery, Artefacts dropped, Payload Installation, External Analysis."
 msgstr ""
 
-#: View/Events/automation.ctp:199
+#: View/Events/automation.ctp:207
 #: View/Events/legacy_automation.ctp:376
 msgid "Used to populate the event info field if no event ID supplied. Alternatively, if not set, MISP will simply generate a message showing that it's a malware sample collection generated on the given day."
 msgstr ""
 
-#: View/Events/automation.ctp:200
+#: View/Events/automation.ctp:208
 #: View/Events/legacy_automation.ctp:377
 msgid "The analysis level of the newly created event, if applicable. [0-2]"
 msgstr ""
 
-#: View/Events/automation.ctp:201
+#: View/Events/automation.ctp:209
 #: View/Events/legacy_automation.ctp:378
 msgid "The threat level ID of the newly created event, if applicable. [0-3]"
 msgstr ""
 
-#: View/Events/automation.ctp:202
+#: View/Events/automation.ctp:210
 #: View/Events/legacy_automation.ctp:379
 msgid "This will populate the comment field of any attribute created using this API."
 msgstr ""
 
-#: View/Events/automation.ctp:203
+#: View/Events/automation.ctp:211
 #: View/Events/legacy_automation.ctp:380
 msgid "Add or remove tags from events"
 msgstr ""
 
-#: View/Events/automation.ctp:204
+#: View/Events/automation.ctp:212
 #: View/Events/legacy_automation.ctp:381
 msgid "You can add or remove an existing tag from an event in the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:207
+#: View/Events/automation.ctp:215
 #: View/Events/legacy_automation.ctp:384
 msgid "Just POST a json object in the following format (to the appropriate API depending on whether you want to add or delete a tag from an event)"
 msgstr ""
 
-#: View/Events/automation.ctp:209
+#: View/Events/automation.ctp:217
 #: View/Events/legacy_automation.ctp:386
 msgid "Where \"tag\" is the ID of the tag. You can also use the name of the tag the following way"
 msgstr ""
 
-#: View/Events/automation.ctp:211
+#: View/Events/automation.ctp:219
 #: View/Events/legacy_automation.ctp:388
 msgid "Proposals and the API"
 msgstr ""
 
-#: View/Events/automation.ctp:212
+#: View/Events/automation.ctp:220
 #: View/Events/legacy_automation.ctp:389
 msgid "You can interact with the proposals via the API directly since version 2.3.148"
 msgstr ""
 
-#: View/Events/automation.ctp:216
+#: View/Events/automation.ctp:224
 #: View/Events/legacy_automation.ctp:393
 msgid "HTTP"
 msgstr ""
 
-#: View/Events/automation.ctp:217
+#: View/Events/automation.ctp:225
 #: View/Events/legacy_automation.ctp:394
 #: View/Pages/doc/using_the_system.ctp:445
-#: View/SharingGroups/add.ctp:52
-#: View/SharingGroups/edit.ctp:60
+#: View/SharingGroups/add.ctp:92
+#: View/SharingGroups/edit.ctp:100
 msgid "URL"
 msgstr ""
 
-#: View/Events/automation.ctp:218
+#: View/Events/automation.ctp:226
 #: View/Events/legacy_automation.ctp:395
 msgid "Explanation"
 msgstr ""
 
-#: View/Events/automation.ctp:219
+#: View/Events/automation.ctp:227
 #: View/Events/legacy_automation.ctp:396
 msgid "Expected Payload"
 msgstr ""
 
-#: View/Events/automation.ctp:220
+#: View/Events/automation.ctp:228
 #: View/Events/legacy_automation.ctp:397
 #: View/Servers/rest.ctp:115
 msgid "Response"
 msgstr ""
 
-#: View/Events/automation.ctp:225
+#: View/Events/automation.ctp:233
 #: View/Events/legacy_automation.ctp:402
 msgid "View a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:227;247;248;254;255
+#: View/Events/automation.ctp:235;255;256;262;263
 #: View/Events/legacy_automation.ctp:404;424;425;431;432
 msgid "ShadowAttribute object"
 msgstr ""
 
-#: View/Events/automation.ctp:232
+#: View/Events/automation.ctp:240
 #: View/Events/legacy_automation.ctp:409
 msgid "View all proposal of my org's events"
 msgstr ""
 
-#: View/Events/automation.ctp:234;241
+#: View/Events/automation.ctp:242;249
 #: View/Events/legacy_automation.ctp:411;418
 msgid "ShadowAttribute objects"
 msgstr ""
 
-#: View/Events/automation.ctp:239
+#: View/Events/automation.ctp:247
 #: View/Events/legacy_automation.ctp:416
 msgid "View all proposals of an event"
 msgstr ""
 
-#: View/Events/automation.ctp:246
+#: View/Events/automation.ctp:254
 #: View/Events/legacy_automation.ctp:423
 msgid "Propose a new attribute to an event"
 msgstr ""
 
-#: View/Events/automation.ctp:253
+#: View/Events/automation.ctp:261
 #: View/Events/legacy_automation.ctp:430
 msgid "Propose an edit to an attribute"
 msgstr ""
 
-#: View/Events/automation.ctp:260
+#: View/Events/automation.ctp:268
 #: View/Events/legacy_automation.ctp:437
 msgid "Accept a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:262;269
+#: View/Events/automation.ctp:270;277
 #: View/Events/legacy_automation.ctp:439;446
 #: View/Noticelists/view.ctp:44
 #: View/Pages/doc/administration.ctp:226;242
@@ -6488,124 +6606,124 @@ msgstr ""
 msgid "Message"
 msgstr ""
 
-#: View/Events/automation.ctp:267
+#: View/Events/automation.ctp:275
 #: View/Events/legacy_automation.ctp:444
 msgid "Discard a proposal"
 msgstr ""
 
-#: View/Events/automation.ctp:272
+#: View/Events/automation.ctp:280
 #: View/Events/legacy_automation.ctp:449
 msgid "When posting a shadow attribute object, use the following formats"
 msgstr ""
 
-#: View/Events/automation.ctp:277
+#: View/Events/automation.ctp:285
 #: View/Events/legacy_automation.ctp:454
 msgid "None of the above fields are mandatory, but at least one of them has to be provided."
 msgstr ""
 
-#: View/Events/automation.ctp:279
+#: View/Events/automation.ctp:287
 #: View/Events/legacy_automation.ctp:456
 msgid "Filtering event metadata"
 msgstr ""
 
-#: View/Events/automation.ctp:280
+#: View/Events/automation.ctp:288
 #: View/Events/legacy_automation.ctp:457
 msgid "As described in the REST section, it is possible to retrieve a list of events along with their metadata by sending a GET request to the /events API. However, this API in particular is a bit more versatile. You can pass search parameters along to search among the events on various fields and retrieve a list of matching events (along with their metadata). Use the following URL"
 msgstr ""
 
-#: View/Events/automation.ctp:284
+#: View/Events/automation.ctp:292
 #: View/Events/legacy_automation.ctp:461
 msgid "POST a JSON object with the desired lookup fields and values to receive a JSON back.<br />\n"
 "    An example for a valid lookup"
 msgstr ""
 
-#: View/Events/automation.ctp:295
+#: View/Events/automation.ctp:303
 #: View/Events/legacy_automation.ctp:472
 msgid "The above would return any event that is published, not restricted to your organisation only that has the term \"Locky\" in its event description. You can use exclamation marks to negate a value wherever appropriate."
 msgstr ""
 
-#: View/Events/automation.ctp:296
+#: View/Events/automation.ctp:304
 #: View/Events/legacy_automation.ctp:473
 msgid "The list of valid parameters"
 msgstr ""
 
-#: View/Events/automation.ctp:297
+#: View/Events/automation.ctp:305
 #: View/Events/legacy_automation.ctp:474
 msgid "Filters on published or unpublished events [0,1] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:298
+#: View/Events/automation.ctp:306
 #: View/Events/legacy_automation.ctp:475
 msgid "Filters on strings found in the event info - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:299
+#: View/Events/automation.ctp:307
 #: View/Events/legacy_automation.ctp:476
 msgid "Filters on attached tag names - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:300
+#: View/Events/automation.ctp:308
 #: View/Events/legacy_automation.ctp:477
 msgid "Filters on specific event IDs - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:301
+#: View/Events/automation.ctp:309
 #: View/Events/legacy_automation.ctp:478
 msgid "Filters on a given event threat level [1,2,3,4] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:302
+#: View/Events/automation.ctp:310
 #: View/Events/legacy_automation.ctp:479
 msgid "Filters on the distribution level [0,1,2,3] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:303
+#: View/Events/automation.ctp:311
 #: View/Events/legacy_automation.ctp:480
 msgid "Filters on the given analysis phase of the event [0,1,2] - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:304
+#: View/Events/automation.ctp:312
 #: View/Events/legacy_automation.ctp:481
 msgid "Filters on a contained attribute value - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:305
+#: View/Events/automation.ctp:313
 #: View/Events/legacy_automation.ctp:482
 msgid "Filters on the creator organisation - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:306
+#: View/Events/automation.ctp:314
 #: View/Events/legacy_automation.ctp:483
 msgid "Filters on the creator user's email address (admin only) - negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:307
+#: View/Events/automation.ctp:315
 #: View/Events/legacy_automation.ctp:484
 msgid "Filters on the date, anything newer than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:308
+#: View/Events/automation.ctp:316
 #: View/Events/legacy_automation.ctp:485
 msgid "Filters on the date, anything older than the given date in YYYY-MM-DD format is taken - non-negatable"
 msgstr ""
 
-#: View/Events/automation.ctp:311
+#: View/Events/automation.ctp:319
 msgid "Freetext Import API"
 msgstr ""
 
-#: View/Events/automation.ctp:313
+#: View/Events/automation.ctp:321
 msgid "The freetext import tool is also exposed to the API."
 msgstr ""
 
-#: View/Events/automation.ctp:314
+#: View/Events/automation.ctp:322
 msgid "Simply POST the contents to be parsed and either directly create attributes out of them or simply return the parsing results."
 msgstr ""
 
-#: View/Events/automation.ctp:315
+#: View/Events/automation.ctp:323
 msgid "Use the boolean (0/1) adhere_to_warninglists and return_meta_attributes url parameters to filter out values tripping over a warninglist and to decide whether to save the attributes parsed or simply return them as meta attributes."
 msgstr ""
 
-#: View/Events/automation.ctp:316
+#: View/Events/automation.ctp:324
 msgid "The contents of the POST body should be the text to be parsed."
 msgstr ""
 
@@ -6802,7 +6920,7 @@ msgid "Ongoing"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:39;196
-#: View/Jobs/index.ctp:9;101
+#: View/Jobs/index.ctp:9;136
 #: View/Pages/doc/using_the_system.ctp:74;182
 msgid "Completed"
 msgstr ""
@@ -6826,7 +6944,7 @@ msgid "All communities"
 msgstr ""
 
 #: View/Events/filter_event_index.ctp:133
-#: View/Feeds/index.ctp:53
+#: View/Feeds/index.ctp:103
 #: View/Users/admin_filter_user_index.ctp:70
 msgid "Target"
 msgstr ""
@@ -6878,47 +6996,52 @@ msgstr ""
 
 #: View/Events/index.ctp:2
 #: View/Events/ajax/index.ctp:3
-#: View/Organisations/view.ctp:97;98
+#: View/Organisations/view.ctp:66;67
 #: View/Users/statistics.ctp:11
 #: View/Users/statistics_data.ctp:14
 #: View/Users/statistics_orgs.ctp:33
 msgid "Events"
 msgstr ""
 
-#: View/Events/index.ctp:30
-msgid "Filter events"
+#: View/Events/index.ctp:34
+#: View/Logs/admin_index.ctp:54
+#: View/Servers/preview_index.ctp:37
+#: View/Users/admin_index.ctp:34
+msgid "Modify filters"
 msgstr ""
 
-#: View/Events/index.ctp:31
+#: View/Events/index.ctp:45
 msgid "Delete selected Events"
 msgstr ""
 
-#: View/Events/index.ctp:44
-msgid "Quickfilter"
+#: View/Events/index.ctp:73
+msgid "My events only"
 msgstr ""
 
-#: View/Events/index.ctp:44
-#: View/Organisations/index.ctp:59
-#: View/Servers/preview_index.ctp:45
+#: View/Events/index.ctp:74
+msgid "My Events"
+msgstr ""
+
+#: View/Events/index.ctp:82
+msgid "My organisation's events only"
+msgstr ""
+
+#: View/Events/index.ctp:83
+msgid "Org Events"
+msgstr ""
+
+#: View/Events/index.ctp:94
+#: View/Organisations/index.ctp:75
+#: View/Servers/preview_index.ctp:64
 #: View/Tags/index.ctp:56
 #: View/Taxonomies/view.ctp:65
 msgid "Filter"
 msgstr ""
 
-#: View/Events/index.ctp:58
-msgid "My events only"
-msgstr ""
-
-#: View/Events/index.ctp:58
-msgid "My Events"
-msgstr ""
-
-#: View/Events/index.ctp:72
-msgid "My organisation's events only"
-msgstr ""
-
-#: View/Events/index.ctp:72
-msgid "Org Events"
+#: View/Events/index.ctp:95
+#: View/Organisations/index.ctp:76
+#: View/Servers/preview_index.ctp:65
+msgid "Enter value to search"
 msgstr ""
 
 #: View/Events/legacy_automation.ctp:3
@@ -7202,6 +7325,14 @@ msgid "To include a tag in the results just write its names into this parameter.
 "    To filter on several values for the same parameter, simply use arrays, such as in the following example"
 msgstr ""
 
+#: View/Events/legacy_automation.ctp:286;310
+msgid "Restrict the results by the last publish timestamp (newer than)."
+msgstr ""
+
+#: View/Events/legacy_automation.ctp:287
+msgid "Restrict the results by the timestamp (last edit). Any event with a timestamp newer than the given timestamp will be returned. In case you are dealing with /attributes as scope, the attribute's timestamp will be used for the lookup."
+msgstr ""
+
 #: View/Events/legacy_automation.ctp:291
 msgid "For example, to find any event with the term \"red october\" mentioned, use the following syntax (the example is shown as a POST request instead of a GET, which is highly recommended. GET requests are problematic and deprecated.)"
 msgstr ""
@@ -7222,6 +7353,10 @@ msgstr ""
 msgid "Restrict the results by the timestamp (of the attribute). Any attributes with a timestamp newer than the given timestamp will be returned."
 msgstr ""
 
+#: View/Events/legacy_automation.ctp:317
+msgid "Only return attributes from events that have received a modification after the given timestamp."
+msgstr ""
+
 #: View/Events/legacy_automation.ctp:322
 msgid "The keywords false or null should be used for optional empty parameters in the URL. Keep in mind, this is only needed if you use the deprecated URL parameters."
 msgstr ""
@@ -7258,19 +7393,19 @@ msgid "Proposals"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:25
-#: View/Events/view.ctp:93
+#: View/Events/view.ctp:106
 #: View/Pages/doc/using_the_system.ctp:206
 msgid "Contributors"
 msgstr ""
 
 #: View/Events/proposal_event_index.ctp:27
-#: View/Events/view.ctp:113
-#: View/Jobs/index.ctp:65
+#: View/Events/view.ctp:112
+#: View/Jobs/index.ctp:100
 #: View/Logs/admin_search.ctp:6
 #: View/Pages/doc/administration.ctp:87;104;116;181;195
 #: View/Pages/doc/using_the_system.ctp:166
-#: View/Users/admin_view.ctp:24
-#: View/Users/view.ctp:9
+#: View/Users/admin_view.ctp:8
+#: View/Users/view.ctp:4
 msgid "Email"
 msgstr ""
 
@@ -7348,11 +7483,8 @@ msgid "Successfully added attributes"
 msgstr ""
 
 #: View/Events/show_i_o_c_results.ctp:10;32
-#: View/Events/view.ctp:56
 #: View/Feeds/preview_event.ctp:11
 #: View/Galaxies/view.ctp:18
-#: View/ObjectTemplates/view.ctp:15
-#: View/Organisations/view.ctp:54
 #: View/Organisations/ajax/merge.ctp:58
 #: View/Pages/doc/using_the_system.ctp:204
 #: View/Servers/preview_event.ctp:17
@@ -7395,193 +7527,182 @@ msgstr ""
 msgid "Include the original imported file as attachment"
 msgstr ""
 
-#: View/Events/view.ctp:49
-msgid "Extended view"
-msgstr ""
-
-#: View/Events/view.ctp:51
+#: View/Events/view.ctp:53
 #: View/Servers/preview_event.ctp:12
 #: View/Sightings/ajax/list_sightings.ctp:9
 msgid "Event ID"
 msgstr ""
 
-#: View/Events/view.ctp:63
+#: View/Events/view.ctp:57
 msgid "Source Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:68
+#: View/Events/view.ctp:66
 msgid "Member Organisation"
 msgstr ""
 
-#: View/Events/view.ctp:83
+#: View/Events/view.ctp:76
+msgid "Creator org"
+msgstr ""
+
+#: View/Events/view.ctp:86
 msgid "Owner org"
 msgstr ""
 
-#: View/Events/view.ctp:131
+#: View/Events/view.ctp:135
 #: View/Feeds/preview_event.ctp:30
 #: View/Pages/doc/using_the_system.ctp:64;168;209
 #: View/Servers/preview_event.ctp:41
 msgid "Threat Level"
 msgstr ""
 
-#: View/Events/view.ctp:139
+#: View/Events/view.ctp:140
 #: View/Feeds/preview_event.ctp:37
 #: View/Pages/doc/using_the_system.ctp:70;177;210
 #: View/Servers/preview_event.ctp:48
 msgid "Analysis"
 msgstr ""
 
-#: View/Events/view.ctp:159
+#: View/Events/view.ctp:161
 #: View/Feeds/preview_event.ctp:42
 #: View/Pages/doc/using_the_system.ctp:185;212
 msgid "Info"
 msgstr ""
 
-#: View/Events/view.ctp:165;172
+#: View/Events/view.ctp:165
 #: View/Feeds/preview_event.ctp:55;60;65
 #: View/Pages/doc/using_the_system.ctp:160;213
 #: View/Servers/preview_event.ctp:78;88
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "Published"
 msgstr ""
 
-#: View/Events/view.ctp:178
+#: View/Events/view.ctp:173
 msgid "#Attributes"
 msgstr ""
 
-#: View/Events/view.ctp:180
+#: View/Events/view.ctp:177
+msgid "First recorded change"
+msgstr ""
+
+#: View/Events/view.ctp:181
 msgid "Last change"
 msgstr ""
 
 #: View/Events/view.ctp:185
+msgid "Modification map"
+msgstr ""
+
+#: View/Events/view.ctp:191
 msgid "Extends"
 msgstr ""
 
-#: View/Events/view.ctp:196
+#: View/Events/view.ctp:210
 msgid "Extended by"
 msgstr ""
 
-#: View/Events/view.ctp:203
-msgid "Currently in "
+#: View/Events/view.ctp:217
+msgid "extended"
 msgstr ""
 
-#: View/Events/view.ctp:211
-msgid "- restricted to own organisation only."
+#: View/Events/view.ctp:217
+msgid "atomic"
 msgstr ""
 
-#: View/Events/view.ctp:212
-msgid "Advanced Sightings"
-msgstr ""
-
-#: View/Events/view.ctp:228
-msgid "you"
-msgstr ""
-
-#: View/Events/view.ctp:229
-msgid " has"
-msgstr ""
-
-#: View/Events/view.ctp:232
-msgid "You have"
-msgstr ""
-
-#: View/Events/view.ctp:235
+#: View/Events/view.ctp:265
 msgid "Delegation request"
 msgstr ""
 
-#: View/Events/view.ctp:236
-msgid "%s requested that %s take over this event."
-msgstr ""
-
-#: View/Events/view.ctp:236
+#: View/Events/view.ctp:277
 msgid "View request details"
 msgstr ""
 
-#: View/Events/view.ctp:241
-msgid "Correlation"
-msgstr ""
-
-#: View/Events/view.ctp:247;256
-#: View/Users/admin_view.ctp:125
+#: View/Events/view.ctp:287
+#: View/Users/admin_view.ctp:86
 msgid "Disabled"
 msgstr ""
 
-#: View/Events/view.ctp:247
-msgid "enable"
-msgstr ""
-
-#: View/Events/view.ctp:251;258
-#: View/ObjectTemplates/index.ctp:32
+#: View/Events/view.ctp:287
+#: View/ObjectTemplates/index.ctp:35
 #: View/Taxonomies/view.ctp:24
-#: View/Warninglists/view.ctp:38
 msgid "Enabled"
 msgstr ""
 
-#: View/Events/view.ctp:251
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
+msgid "enable"
+msgstr ""
+
+#: View/Events/view.ctp:296
+#: View/Warninglists/view.ctp:24
 msgid "disable"
 msgstr ""
 
-#: View/Events/view.ctp:286
+#: View/Events/view.ctp:307
+msgid "Extended view"
+msgstr ""
+
+#: View/Events/view.ctp:328
 msgid "Show (%s more)"
 msgstr ""
 
-#: View/Events/view.ctp:344;373
+#: View/Events/view.ctp:386;415
 msgid "This event has "
 msgstr ""
 
-#: View/Events/view.ctp:345;374
+#: View/Events/view.ctp:387;416
 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:382
+#: View/Events/view.ctp:424
 msgid "Warning: Potential false positives"
 msgstr ""
 
-#: View/Events/view.ctp:398
+#: View/Events/view.ctp:440
 msgid "Toggle pivot graph"
 msgstr ""
 
-#: View/Events/view.ctp:398
+#: View/Events/view.ctp:440
 msgid "Pivots"
 msgstr ""
 
-#: View/Events/view.ctp:401
+#: View/Events/view.ctp:443
 msgid "Toggle galaxies"
 msgstr ""
 
-#: View/Events/view.ctp:401
+#: View/Events/view.ctp:443
 msgid "Galaxy"
 msgstr ""
 
-#: View/Events/view.ctp:404
+#: View/Events/view.ctp:446
 msgid "Toggle Event graph"
 msgstr ""
 
-#: View/Events/view.ctp:407
+#: View/Events/view.ctp:449
 msgid "Toggle Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:407
+#: View/Events/view.ctp:449
 msgid "Correlation graph"
 msgstr ""
 
-#: View/Events/view.ctp:410
+#: View/Events/view.ctp:452
 msgid "Toggle ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:410
+#: View/Events/view.ctp:452
 msgid "ATT&CK matrix"
 msgstr ""
 
-#: View/Events/view.ctp:413
+#: View/Events/view.ctp:455
 msgid "Toggle attributes"
 msgstr ""
 
-#: View/Events/view.ctp:416
+#: View/Events/view.ctp:458
 msgid "Toggle discussions"
 msgstr ""
 
-#: View/Events/view.ctp:416
+#: View/Events/view.ctp:458
 msgid "Discussion"
 msgstr ""
 
@@ -7634,7 +7755,7 @@ msgid "Publish but do NOT send alert email? Only for minor changes!"
 msgstr ""
 
 #: View/Events/ajax/eventPublishConfirmationForm.ctp:26
-#: View/Feeds/index.ctp:54
+#: View/Feeds/index.ctp:104
 #: View/Pages/doc/using_the_system.ctp:190
 #: View/Servers/ajax/update.ctp:11
 msgid "Publish"
@@ -7814,7 +7935,7 @@ msgstr ""
 
 #: View/Feeds/add.ctp:156
 #: View/Feeds/edit.ctp:153
-#: View/Feeds/index.ctp:55
+#: View/Feeds/index.ctp:105
 msgid "Delta Merge"
 msgstr ""
 
@@ -7983,140 +8104,104 @@ msgstr ""
 msgid "Fetch and store all feed data"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
+#: View/Feeds/index.ctp:33
 msgid "Enable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:27
-msgid "Enable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:28
+#: View/Feeds/index.ctp:39
 msgid "Disable selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:28
-msgid "Disable Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:29
+#: View/Feeds/index.ctp:45
 msgid "Enable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:29
-msgid "Enable Caching for Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:51
 msgid "Disable caching for selected"
 msgstr ""
 
-#: View/Feeds/index.ctp:30
-msgid "Disable Caching for  Selected"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
-msgid "Default feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:30
+#: View/Feeds/index.ctp:61
 msgid "Default feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom feeds filter"
-msgstr ""
-
-#: View/Feeds/index.ctp:31
+#: View/Feeds/index.ctp:66
 msgid "Custom feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:31
-msgid "Custom Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:32
+#: View/Feeds/index.ctp:71
 msgid "All feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:32
-msgid "All Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:33
+#: View/Feeds/index.ctp:76
 msgid "Enabled feeds"
 msgstr ""
 
-#: View/Feeds/index.ctp:33
-msgid "Enabled Feeds"
-msgstr ""
-
-#: View/Feeds/index.ctp:45
+#: View/Feeds/index.ctp:95
 msgid "Enable pulling the feed into your MISP as events/attributes."
 msgstr ""
 
-#: View/Feeds/index.ctp:46
+#: View/Feeds/index.ctp:96
 msgid "Enable caching the feed into Redis - allowing for correlations to the feed to be shown."
 msgstr ""
 
-#: View/Feeds/index.ctp:48
+#: View/Feeds/index.ctp:98
 msgid "Feed Format"
 msgstr ""
 
-#: View/Feeds/index.ctp:50
-#: View/Jobs/index.ctp:76
+#: View/Feeds/index.ctp:100
+#: View/Jobs/index.ctp:111
 #: View/Pages/doc/administration.ctp:225
 msgid "Input"
 msgstr ""
 
-#: View/Feeds/index.ctp:56
+#: View/Feeds/index.ctp:106
 msgid "Override IDS"
 msgstr ""
 
-#: View/Feeds/index.ctp:60
+#: View/Feeds/index.ctp:110
 msgid "Caching"
 msgstr ""
 
-#: View/Feeds/index.ctp:108
+#: View/Feeds/index.ctp:158
 #: View/Servers/index.ctp:74;75
 msgid "Rules"
 msgstr ""
 
-#: View/Feeds/index.ctp:135
+#: View/Feeds/index.ctp:185
 msgid "Error: Invalid event!"
 msgstr ""
 
-#: View/Feeds/index.ctp:140
+#: View/Feeds/index.ctp:190
 msgid "Fixed event %s"
 msgstr ""
 
-#: View/Feeds/index.ctp:143
+#: View/Feeds/index.ctp:193
 msgid "New fixed event"
 msgstr ""
 
-#: View/Feeds/index.ctp:195
+#: View/Feeds/index.ctp:245
 #: View/Servers/index.ctp:94
 msgid "Age: "
 msgstr ""
 
-#: View/Feeds/index.ctp:197
+#: View/Feeds/index.ctp:247
 #: View/Servers/index.ctp:102
 msgid "Not cached"
 msgstr ""
 
-#: View/Feeds/index.ctp:208
+#: View/Feeds/index.ctp:258
 msgid "Explore the events remotely"
 msgstr ""
 
-#: View/Feeds/index.ctp:210
+#: View/Feeds/index.ctp:260
 msgid "Fetch all events"
 msgstr ""
 
-#: View/Feeds/index.ctp:215
+#: View/Feeds/index.ctp:265
 msgid "Are you sure you want to permanently remove the feed (%s)?"
 msgstr ""
 
-#: View/Feeds/index.ctp:217
+#: View/Feeds/index.ctp:267
 msgid "Download feed metadata as JSON"
 msgstr ""
 
@@ -8138,12 +8223,16 @@ msgid "Namespace"
 msgstr ""
 
 #: View/Galaxies/view.ctp:22
-#: View/ObjectTemplates/view.ctp:17
+#: View/ObjectTemplates/view.ctp:7
 #: View/Taxonomies/view.ctp:19
-#: View/Warninglists/view.ctp:19
+#: View/Warninglists/view.ctp:12
 msgid "Version"
 msgstr ""
 
+#: View/Galaxies/view.ctp:29
+msgid "Kill chain order"
+msgstr ""
+
 #: View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp:9
 msgid "Galaxy Cluster Deletion"
 msgstr ""
@@ -8156,6 +8245,10 @@ msgstr ""
 msgid "Delete galaxy cluster"
 msgstr ""
 
+#: View/Helper/GenericPickerHelper.php:90
+msgid "Start the galaxy matrix picker"
+msgstr ""
+
 #: View/Jobs/index.ctp:12
 msgid "Are you sure you want to purge all completed job entries? Job entries are considered as log entries and have no impact on actual job execution."
 msgstr ""
@@ -8168,37 +8261,37 @@ msgstr ""
 msgid "Completed."
 msgstr ""
 
-#: View/Jobs/index.ctp:63
+#: View/Jobs/index.ctp:68;98
 msgid "Show all queues"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:74;99
 msgid "Show default queue"
 msgstr ""
 
-#: View/Jobs/index.ctp:64
+#: View/Jobs/index.ctp:80;100
+msgid "Show email queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:86;101
+msgid "Show cache queue"
+msgstr ""
+
+#: View/Jobs/index.ctp:99
 #: View/Roles/admin_index.ctp:22
 #: View/Roles/index.ctp:22
 msgid "Default"
 msgstr ""
 
-#: View/Jobs/index.ctp:65
-msgid "Show email queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
-msgid "Show cache queue"
-msgstr ""
-
-#: View/Jobs/index.ctp:66
+#: View/Jobs/index.ctp:101
 msgid "Cache"
 msgstr ""
 
-#: View/Jobs/index.ctp:92
+#: View/Jobs/index.ctp:127
 msgid "No worker active"
 msgstr ""
 
-#: View/Jobs/index.ctp:124
+#: View/Jobs/index.ctp:159
 msgid "View stacktrace"
 msgstr ""
 
@@ -8259,18 +8352,20 @@ msgstr ""
 msgid "from IP"
 msgstr ""
 
-#: View/Logs/admin_index.ctp:59
+#: View/Logs/admin_index.ctp:75
 #: View/Logs/admin_search.ctp:14
 msgid "Model ID"
 msgstr ""
 
 #: View/Logs/admin_search.ctp:8
-#: View/ObjectTemplates/index.ctp:50
-#: View/ObjectTemplates/view.ctp:13
+#: View/ObjectTemplates/index.ctp:61
+#: View/ObjectTemplates/view.ctp:5
 #: View/Sightings/ajax/list_sightings.ctp:6
 #: View/Templates/view.ctp:33
 #: View/Users/admin_add.ctp:51
 #: View/Users/admin_edit.ctp:51
+#: View/Users/admin_view.ctp:17
+#: View/Users/view.ctp:5
 msgid "Organisation"
 msgstr ""
 
@@ -8356,12 +8451,12 @@ msgstr ""
 msgid "Target UUID"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:53
+#: View/ObjectReferences/ajax/add.ctp:54
 #: View/Objects/orphaned_object_diagnostics.ctp:38
 msgid "Object"
 msgstr ""
 
-#: View/ObjectReferences/ajax/add.ctp:68
+#: View/ObjectReferences/ajax/add.ctp:120
 msgid "Target Details"
 msgstr ""
 
@@ -8403,25 +8498,33 @@ msgstr ""
 msgid "Object Template index"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:54
-#: View/ObjectTemplates/view.ctp:23
+#: View/ObjectTemplates/index.ctp:65
+#: View/ObjectTemplates/view.ctp:26
 msgid "Requirements"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:107
+#: View/ObjectTemplates/index.ctp:118
 msgid "Are you sure you want to force an update for template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/index.ctp:108
+#: View/ObjectTemplates/index.ctp:119
 msgid "Are you sure you want to delete template # %s?"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:7
-msgid " Object Template"
+#: View/ObjectTemplates/view.ctp:3
+#: View/Organisations/view.ctp:5
+#: View/Pages/doc/administration.ctp:180;221;236
+#: View/Roles/view.ctp:3
+#: View/Taxonomies/view.ctp:4
+#: View/Templates/view.ctp:4
+#: View/Users/admin_view.ctp:6
+#: View/Users/view.ctp:3
+#: View/Warninglists/view.ctp:9
+msgid "Id"
 msgstr ""
 
-#: View/ObjectTemplates/view.ctp:9
-msgid "Object Template ID"
+#: View/ObjectTemplates/view.ctp:33
+msgid " Object Template"
 msgstr ""
 
 #: View/Objects/add.ctp:6
@@ -8500,15 +8603,6 @@ msgstr ""
 msgid "To IDS"
 msgstr ""
 
-#: View/Objects/revise_object.ctp:49
-#: View/Organisations/admin_add.ctp:22
-#: View/Organisations/admin_edit.ctp:21
-#: View/Organisations/ajax/merge.ctp:65
-#: View/SharingGroups/add.ctp:32
-#: View/SharingGroups/edit.ctp:32
-msgid "UUID"
-msgstr ""
-
 #: View/Objects/ajax/delete.ctp:6
 msgid "Object Deletion"
 msgstr ""
@@ -8530,6 +8624,7 @@ msgid "Simply paste a list of all the organisation UUIDs that you wish to block
 msgstr ""
 
 #: View/OrgBlacklists/add.ctp:16
+#: View/Organisations/view.ctp:6
 msgid "Organisation name"
 msgstr ""
 
@@ -8654,7 +8749,7 @@ msgstr ""
 msgid "Click here"
 msgstr ""
 
-#: View/Organisations/index.ctp:5
+#: View/Organisations/index.ctp:5;67
 #: View/Users/statistics.ctp:46
 #: View/Users/statistics_data.ctp:57
 #: View/Users/statistics_orgs.ctp:13
@@ -8665,7 +8760,7 @@ msgstr ""
 msgid ", both local and remote"
 msgstr ""
 
-#: View/Organisations/index.ctp:9
+#: View/Organisations/index.ctp:9;62
 #: View/Users/statistics_orgs.ctp:12
 msgid "Known remote organisations"
 msgstr ""
@@ -8674,7 +8769,7 @@ msgstr ""
 msgid " on other instances"
 msgstr ""
 
-#: View/Organisations/index.ctp:13
+#: View/Organisations/index.ctp:13;57
 #: View/Users/statistics_orgs.ctp:11
 msgid "Local organisations"
 msgstr ""
@@ -8691,55 +8786,52 @@ msgstr ""
 msgid "View all"
 msgstr ""
 
-#: View/Organisations/index.ctp:65
+#: View/Organisations/index.ctp:86
 #: View/Users/login.ctp:8
 #: View/Users/statistics_orgs.ctp:30
 msgid "Logo"
 msgstr ""
 
-#: View/Organisations/index.ctp:76
+#: View/Organisations/index.ctp:97
 msgid "Added by"
 msgstr ""
 
-#: View/Organisations/index.ctp:117
+#: View/Organisations/index.ctp:138
 #: View/Posts/add.ctp:33
 msgid ""
 msgstr ""
 ""
 
-#: View/Organisations/view.ctp:3
-msgid "Organisation "
-msgstr ""
-
-#: View/Organisations/view.ctp:7
-#: View/Pages/doc/administration.ctp:180;221;236
-#: View/Roles/view.ctp:4
-#: View/Taxonomies/view.ctp:4
-#: View/Templates/view.ctp:4
-#: View/Users/admin_view.ctp:9
-#: View/Users/view.ctp:4
-#: View/Warninglists/view.ctp:4
-msgid "Id"
-msgstr ""
-
-#: View/Organisations/view.ctp:17
+#: View/Organisations/view.ctp:8
 msgid "Local or remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:22
+#: View/Organisations/view.ctp:12
 #: View/SharingGroups/view.ctp:43
 msgid "Local"
 msgstr ""
 
-#: View/Organisations/view.ctp:26
+#: View/Organisations/view.ctp:12
 msgid "Remote"
 msgstr ""
 
-#: View/Organisations/view.ctp:40
-msgid "E-mail domain restrictions"
+#: View/Organisations/view.ctp:22
+msgid "Domain restrictions"
 msgstr ""
 
-#: View/Organisations/view.ctp:93;94
+#: View/Organisations/view.ctp:27
+msgid "Creation time"
+msgstr ""
+
+#: View/Organisations/view.ctp:28
+msgid "Last modified"
+msgstr ""
+
+#: View/Organisations/view.ctp:39
+msgid "Organisation "
+msgstr ""
+
+#: View/Organisations/view.ctp:62;63
 msgid "Members"
 msgstr ""
 
@@ -9292,8 +9384,8 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:94;123
 #: View/Pages/doc/using_the_system.ctp:399
-#: View/Users/admin_view.ctp:40
-#: View/Users/view.ctp:34
+#: View/Users/admin_view.ctp:41
+#: View/Users/view.ctp:25
 msgid "Authkey"
 msgstr ""
 
@@ -9346,8 +9438,8 @@ msgid "The e-mail address (and login name) of the user."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:105
-#: View/Users/admin_view.ctp:29
-#: View/Users/view.ctp:24
+#: View/Users/admin_view.ctp:26
+#: View/Users/view.ctp:7
 msgid "Autoalert"
 msgstr ""
 
@@ -9368,8 +9460,6 @@ msgid "Shows the currently assigned NIDS ID."
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:109;125
-#: View/Users/admin_view.ctp:100
-#: View/Users/view.ctp:55
 msgid "Termsaccepted"
 msgstr ""
 
@@ -9378,7 +9468,7 @@ msgid "This flag indicates whether the user has accepted the terms of use or not
 msgstr ""
 
 #: View/Pages/doc/administration.ctp:110
-#: View/Users/admin_view.ctp:120
+#: View/Users/admin_view.ctp:84
 msgid "Newsread"
 msgstr ""
 
@@ -9440,7 +9530,7 @@ msgstr ""
 
 #: View/Pages/doc/administration.ctp:133;184;197
 #: View/Pages/doc/using_the_system.ctp:269
-#: View/Taxonomies/view.ctp:79
+#: View/Taxonomies/view.ctp:89
 msgid "Action"
 msgstr ""
 
@@ -10203,6 +10293,11 @@ msgstr ""
 msgid "A link to this user guide."
 msgstr ""
 
+#: View/Pages/doc/general.ctp:61
+#: View/Pages/doc/user_management.ctp:54
+msgid "Terms &amp; Conditions"
+msgstr ""
+
 #: View/Pages/doc/general.ctp:61
 msgid "View the terms &amp; conditions again."
 msgstr ""
@@ -10251,6 +10346,10 @@ msgstr ""
 msgid "Various tools, upgrade scripts that can help a site-admin run the instance."
 msgstr ""
 
+#: View/Pages/doc/general.ctp:79
+msgid "Server Settings"
+msgstr ""
+
 #: View/Pages/doc/general.ctp:79
 msgid "Set up and diagnose your MISP installation."
 msgstr ""
@@ -11980,7 +12079,7 @@ msgstr ""
 msgid "remove"
 msgstr ""
 
-#: View/Roles/view.ctp:14
+#: View/Roles/view.ctp:5
 msgid "Permission level"
 msgstr ""
 
@@ -12149,7 +12248,7 @@ msgid "Example:"
 msgstr ""
 
 #: View/Servers/filter_event_index.ctp:21
-msgid "Apply filters to the remote instance"
+msgid "Apply filters to the remote instance's index"
 msgstr ""
 
 #: View/Servers/index.ctp:2
@@ -12208,15 +12307,15 @@ msgstr ""
 msgid "You are currently viewing the event index of the remote instance %s"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "not "
 msgstr ""
 
-#: View/Servers/preview_index.ctp:86
+#: View/Servers/preview_index.ctp:112
 msgid "published"
 msgstr ""
 
-#: View/Servers/preview_index.ctp:147
+#: View/Servers/preview_index.ctp:173
 msgid "Fetch the event"
 msgstr ""
 
@@ -12260,7 +12359,11 @@ msgstr ""
 msgid "No succeeded pushes"
 msgstr ""
 
-#: View/Servers/rest.ctp:23;33
+#: View/Servers/rest.ctp:23
+msgid "HTTP method to use"
+msgstr ""
+
+#: View/Servers/rest.ctp:33
 msgid "Relative path to query"
 msgstr ""
 
@@ -12343,39 +12446,31 @@ msgstr ""
 msgid "IDS Signature?"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:21
-msgid "Only list proposals of my organisation"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:21
+#: View/ShadowAttributes/index.ctp:24
 msgid "My Org's Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:26
-msgid "List all proposals"
-msgstr ""
-
-#: View/ShadowAttributes/index.ctp:26
+#: View/ShadowAttributes/index.ctp:29
 msgid "All Events"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:33
+#: View/ShadowAttributes/index.ctp:43
 msgid "Proposal by"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:39
+#: View/ShadowAttributes/index.ctp:49
 msgid "Event creator"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:45
+#: View/ShadowAttributes/index.ctp:55
 msgid "Proposed value"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:71
+#: View/ShadowAttributes/index.ctp:81
 msgid "Attribute edit"
 msgstr ""
 
-#: View/ShadowAttributes/index.ctp:73
+#: View/ShadowAttributes/index.ctp:83
 msgid "New Attribute"
 msgstr ""
 
@@ -12403,166 +12498,166 @@ msgstr ""
 msgid "New Sharing Group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
-msgid "General tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:5
-#: View/SharingGroups/edit.ctp:5
+#: View/SharingGroups/add.ctp:10
+#: View/SharingGroups/edit.ctp:10
 msgid "General"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:6
-#: View/SharingGroups/edit.ctp:6
+#: View/SharingGroups/add.ctp:11
+#: View/SharingGroups/edit.ctp:11
+msgid "General tab"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:20
+#: View/SharingGroups/edit.ctp:20
 msgid "Organisations tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
-msgid "MISP instances tab"
-msgstr ""
-
-#: View/SharingGroups/add.ctp:7
-#: View/SharingGroups/edit.ctp:7
+#: View/SharingGroups/add.ctp:27
+#: View/SharingGroups/edit.ctp:27
 msgid "MISP Instances"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
-msgid "Sharing group summary"
+#: View/SharingGroups/add.ctp:28
+#: View/SharingGroups/edit.ctp:28
+msgid "MISP instances tab"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:8
-#: View/SharingGroups/edit.ctp:8
+#: View/SharingGroups/add.ctp:35
+#: View/SharingGroups/edit.ctp:35
 msgid "Summary and Save"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:12
-#: View/SharingGroups/edit.ctp:12
+#: View/SharingGroups/add.ctp:36
+#: View/SharingGroups/edit.ctp:36
+msgid "Sharing group summary"
+msgstr ""
+
+#: View/SharingGroups/add.ctp:52
+#: View/SharingGroups/edit.ctp:52
 msgid "Example: Multinational sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:13
-#: View/SharingGroups/edit.ctp:13
-#: View/SharingGroups/index.ctp:29
+#: View/SharingGroups/add.ctp:53
+#: View/SharingGroups/edit.ctp:53
+#: View/SharingGroups/index.ctp:46
 msgid "Releasable to"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:14
-#: View/SharingGroups/edit.ctp:14
+#: View/SharingGroups/add.ctp:54
+#: View/SharingGroups/edit.ctp:54
 msgid "Example: Community1, Organisation1, Organisation2"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:16
-#: View/SharingGroups/edit.ctp:16
+#: View/SharingGroups/add.ctp:56
+#: View/SharingGroups/edit.ctp:56
 msgid "A description of the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:18
-#: View/SharingGroups/edit.ctp:18
+#: View/SharingGroups/add.ctp:58
+#: View/SharingGroups/edit.ctp:58
 msgid "Active sharing groups can be selected by users of the local instance when creating events. Generally, sharing groups received through synchronisation will have this disabled until manually enabled."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:19
-#: View/SharingGroups/edit.ctp:19
+#: View/SharingGroups/add.ctp:59
+#: View/SharingGroups/edit.ctp:59
 msgid "Make the sharing group selectable (active)"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:21;38;59
-#: View/SharingGroups/edit.ctp:21;38;67
+#: View/SharingGroups/add.ctp:61;78;99
+#: View/SharingGroups/edit.ctp:61;78;107
 msgid "Next page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation(s) to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:25
-#: View/SharingGroups/edit.ctp:25
+#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/edit.ctp:65
 msgid "Add local organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisations to the sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:26
-#: View/SharingGroups/edit.ctp:26
+#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/edit.ctp:66
 msgid "Add remote organisation"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:33
-#: View/SharingGroups/edit.ctp:33
+#: View/SharingGroups/add.ctp:73
+#: View/SharingGroups/edit.ctp:73
 #: View/SharingGroups/view.ctp:44
 msgid "Extend"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:37;58;74
-#: View/SharingGroups/edit.ctp:37;66;82
+#: View/SharingGroups/add.ctp:77;98;114
+#: View/SharingGroups/edit.ctp:77;106;122
 msgid "Previous page"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:42
-#: View/SharingGroups/edit.ctp:50
+#: View/SharingGroups/add.ctp:82
+#: View/SharingGroups/edit.ctp:90
 msgid "Enable roaming mode for this sharing group. Roaming mode will allow the sharing group to be passed to any instance where the remote recipient is contained in the organisation list. It is preferred to list the recipient instances instead."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:43
-#: View/SharingGroups/edit.ctp:51
+#: View/SharingGroups/add.ctp:83
+#: View/SharingGroups/edit.ctp:91
 msgid "<b>Enable roaming mode</b> for this sharing group (pass the event to any connected instance where the sync connection is tied to an organisation contained in the SG organisation list)."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:47
-#: View/SharingGroups/edit.ctp:55
+#: View/SharingGroups/add.ctp:87
+#: View/SharingGroups/edit.ctp:95
 msgid "Add instance"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:53
-#: View/SharingGroups/edit.ctp:61
+#: View/SharingGroups/add.ctp:93
+#: View/SharingGroups/edit.ctp:101
 #: View/SharingGroups/view.ctp:69
 msgid "All orgs"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:63
+#: View/SharingGroups/add.ctp:103
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:64
+#: View/SharingGroups/add.ctp:104
 msgid "Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:65
+#: View/SharingGroups/add.ctp:105
 msgid "External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:66
+#: View/SharingGroups/add.ctp:106
 msgid "<span class=\"bold\">Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:67
-#: View/SharingGroups/edit.ctp:75
+#: View/SharingGroups/add.ctp:107
+#: View/SharingGroups/edit.ctp:115
 msgid "You can edit this information by going back to one of the previous pages, or if you agree with the above mentioned information, click Submit to create the Sharing group."
 msgstr ""
 
-#: View/SharingGroups/add.ctp:75
-#: View/SharingGroups/edit.ctp:83
+#: View/SharingGroups/add.ctp:115
+#: View/SharingGroups/edit.ctp:123
 msgid "Submit and create sharing group"
 msgstr ""
 
-#: View/SharingGroups/add.ctp:95
+#: View/SharingGroups/add.ctp:135
 msgid "Local instance"
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:71
+#: View/SharingGroups/edit.ctp:111
 msgid "<span class=\"bold\">General: </span>You are about to create the <span id=\"summarytitle\" class=\"red bold\"></span> sharing group, which is intended to be releasable to <span id=\"summaryreleasable\" class=\"red bold\"></span>. </p>\n"
 "                <p id=\"localText\"><span class=\"bold\">Local organisations: </span>It will be visible to <span id=\"summarylocal\" class=\"red bold\"></span>, from which <span id=\"summarylocalextend\" class=\"red bold\"></span> can extend the sharing group. </p>\n"
 "                <p id=\"externalText\"><span class=\"bold\">External organisations: </span>It will also be visible to <span id=\"summaryexternal\" class=\"red bold\"></span>, out of which <span id=\"summaryexternalextend\" class=\"red bold\"></span> can extend the sharing group."
 msgstr ""
 
-#: View/SharingGroups/edit.ctp:74
+#: View/SharingGroups/edit.ctp:114
 msgid "Synchronisation: </span>Furthermore, events are automatically pushed to: <span id=\"summaryservers\" class=\"red bold\"></span>"
 msgstr ""
 
@@ -12570,23 +12665,15 @@ msgstr ""
 msgid "Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:20
-msgid "View only active sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:20
+#: View/SharingGroups/index.ctp:26
 msgid "Active Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:21
-msgid "View only passive sharing groups"
-msgstr ""
-
-#: View/SharingGroups/index.ctp:21
+#: View/SharingGroups/index.ctp:31
 msgid "Passive Sharing Groups"
 msgstr ""
 
-#: View/SharingGroups/index.ctp:61
+#: View/SharingGroups/index.ctp:80
 msgid "Distribution List"
 msgstr ""
 
@@ -12635,7 +12722,11 @@ msgid "Add Sighting"
 msgstr ""
 
 #: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
-msgid "Add sighting (%s)?"
+msgid "Add%s sighting (%s)?"
+msgstr ""
+
+#: View/Sightings/ajax/quickAddConfirmationForm.ctp:7
+msgid "false-positive"
 msgstr ""
 
 #: View/Sightings/ajax/quickDeleteConfirmationForm.ctp:5
@@ -12753,7 +12844,8 @@ msgid "Are you sure you want to enable every tag associated to this taxonomy?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:41
-#: View/Taxonomies/view.ctp:29;145
+#: View/Taxonomies/view.ctp:29;155
+#: View/Warninglists/view.ctp:23
 msgid "Disable"
 msgstr ""
 
@@ -12763,7 +12855,8 @@ msgid "Are you sure you want to disable this taxonomy library?"
 msgstr ""
 
 #: View/Taxonomies/index.ctp:43
-#: View/Taxonomies/view.ctp:31;149
+#: View/Taxonomies/view.ctp:31;159
+#: View/Warninglists/view.ctp:23
 msgid "Enable"
 msgstr ""
 
@@ -12780,19 +12873,27 @@ msgstr ""
 msgid "Create and/or update selected tags"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:118
+#: View/Taxonomies/view.ctp:68;69
+msgid "Hide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:73;74
+msgid "Unhide selected tags"
+msgstr ""
+
+#: View/Taxonomies/view.ctp:128
 msgid "Hidden"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:127
+#: View/Taxonomies/view.ctp:137
 msgid "View graph"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:144
+#: View/Taxonomies/view.ctp:154
 msgid "Refresh"
 msgstr ""
 
-#: View/Taxonomies/view.ctp:149
+#: View/Taxonomies/view.ctp:159
 msgid "Refresh or enable"
 msgstr ""
 
@@ -12820,6 +12921,30 @@ msgstr ""
 msgid "Create / update all taxonomy entries as tags"
 msgstr ""
 
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:13
+msgid "Hide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:15
+msgid "Are you sure you want to hide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_hide.ctp:19
+msgid "Hide all selected tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:13
+msgid "Unhide Tags"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:15
+msgid "Are you sure you want to unhide all selected tags?"
+msgstr ""
+
+#: View/Taxonomies/ajax/taxonomy_mass_unhide.ctp:19
+msgid "Unhide all selected tags"
+msgstr ""
+
 #: View/TemplateElements/ajax/ajaxIndex.ctp:2
 msgid "Template Elements"
 msgstr ""
@@ -13072,6 +13197,8 @@ msgid "Admin Edit User"
 msgstr ""
 
 #: View/Users/admin_edit.ctp:69
+#: View/Users/admin_view.ctp:58
+#: View/Users/view.ctp:29
 msgid "Terms accepted"
 msgstr ""
 
@@ -13174,10 +13301,6 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: View/Users/admin_index.ctp:40
-msgid "Filter user index"
-msgstr ""
-
 #: View/Users/admin_quick_email.ctp:2
 msgid "Contact %s"
 msgstr ""
@@ -13190,42 +13313,48 @@ msgstr ""
 msgid "%s key found for user, the e-mail will be sent encrypted using this key."
 msgstr ""
 
-#: View/Users/admin_view.ctp:35
-#: View/Users/view.ctp:29
+#: View/Users/admin_view.ctp:27
+#: View/Users/view.ctp:8
 msgid "Contactalert"
 msgstr ""
 
-#: View/Users/admin_view.ctp:46
+#: View/Users/admin_view.ctp:30
+#: View/Users/view.ctp:11
+msgid "Request API access"
+msgstr ""
+
+#: View/Users/admin_view.ctp:44
 msgid "Invited By"
 msgstr ""
 
-#: View/Users/admin_view.ctp:51
-msgid "Org admin"
+#: View/Users/admin_view.ctp:56
+msgid "Org_admin"
 msgstr ""
 
-#: View/Users/admin_view.ctp:74
-#: View/Users/view.ctp:67
+#: View/Users/admin_view.ctp:57
+#: View/Users/view.ctp:28
+msgid "NIDS Start SID"
+msgstr ""
+
+#: View/Users/admin_view.ctp:59
+msgid "Password change"
+msgstr ""
+
+#: View/Users/admin_view.ctp:67
+#: View/Users/view.ctp:37
 msgid "GnuPG fingerprint"
 msgstr ""
 
-#: View/Users/admin_view.ctp:80
-#: View/Users/view.ctp:73
+#: View/Users/admin_view.ctp:72
+#: View/Users/view.ctp:42
 msgid "GnuPG status"
 msgstr ""
 
-#: View/Users/admin_view.ctp:90
-#: View/Users/view.ctp:83
+#: View/Users/admin_view.ctp:79
+#: View/Users/view.ctp:49
 msgid "SMIME Public certificate"
 msgstr ""
 
-#: View/Users/admin_view.ctp:95
-msgid "Nids Sid"
-msgstr ""
-
-#: View/Users/admin_view.ctp:110
-msgid "Password change"
-msgstr ""
-
 #: View/Users/check_and_correct_pgps.ctp:2
 msgid "Failed GnuPGs?"
 msgstr ""
@@ -13376,14 +13505,6 @@ msgstr ""
 msgid "GnuPG key validation"
 msgstr ""
 
-#: View/Users/view.ctp:45
-msgid "Request API access"
-msgstr ""
-
-#: View/Users/view.ctp:50
-msgid "NIDS Start SID"
-msgstr ""
-
 #: View/Users/ajax/emailConfirmTemplate.ctp:2
 msgid "Confirm sending"
 msgstr ""
@@ -13452,7 +13573,7 @@ msgstr ""
 msgid "Delete warninglist"
 msgstr ""
 
-#: View/Warninglists/view.ctp:29
+#: View/Warninglists/view.ctp:14;16
 msgid "Accepted attribute types"
 msgstr ""
 
diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index 191ef1e27..074529ed4 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -30,6 +30,8 @@ class AppModel extends Model
 
     public $loadedPubSubTool = false;
 
+    public $loadedKafkaPubTool = false;
+
     public $start = 0;
 
     public $inserted_ids = array();
@@ -72,7 +74,8 @@ class AppModel extends Model
         7 => false, 8 => false, 9 => false, 10 => false, 11 => false, 12 => false,
         13 => false, 14 => false, 15 => false, 18 => false, 19 => false, 20 => false,
         21 => false, 22 => false, 23 => false, 24 => false, 25 => false, 26 => false,
-        27 => false, 28 => false, 29 => false, 30 => false
+        27 => false, 28 => false, 29 => false, 30 => false, 31 => false, 32 => false,
+        33 => false
     );
 
     public function afterSave($created, $options = array())
@@ -1096,6 +1099,34 @@ class AppModel extends Model
                 $sqlArray[] = "ALTER TABLE `galaxies` MODIFY COLUMN `kill_chain_order` text";
                 $sqlArray[] = "ALTER TABLE `feeds` ADD `force_to_ids` tinyint(1) NOT NULL DEFAULT 0;";
                 break;
+            case 31:
+                $sqlArray[] = "CREATE TABLE IF NOT EXISTS `rest_client_histories` (
+                    `id` int(11) NOT NULL AUTO_INCREMENT,
+                    `org_id` int(11) NOT NULL,
+                    `user_id` int(11) NOT NULL,
+                    `headers` text,
+                    `body` text,
+                    `url` text,
+                    `http_method` varchar(255),
+                    `timestamp` int(11) NOT NULL DEFAULT 0,
+                    `use_full_path` tinyint(1) DEFAULT 0,
+                    `show_result` tinyint(1) DEFAULT 0,
+                    `skip_ssl` tinyint(1) DEFAULT 0,
+                    `outcome` int(11) NOT NULL,
+                    `bookmark` tinyint(1) NOT NULL DEFAUlT 0,
+                    `bookmark_name` varchar(255) NULL DEFAULT '',
+                    PRIMARY KEY (`id`),
+                    KEY `org_id` (`org_id`),
+                    KEY `user_id` (`user_id`),
+                    KEY `timestamp` (`timestamp`)
+                    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;";
+                break;
+            case 32:
+                $sqlArray[] = "ALTER TABLE `taxonomies` ADD `required` tinyint(1) NOT NULL DEFAULT 0;";
+                break;
+            case 33:
+                $sqlArray[] = "ALTER TABLE `roles` ADD `perm_publish_kafka` tinyint(1) NOT NULL DEFAULT 0;";
+                break;
             case 'fixNonEmptySharingGroupID':
                 $sqlArray[] = 'UPDATE `events` SET `sharing_group_id` = 0 WHERE `distribution` != 4;';
                 $sqlArray[] = 'UPDATE `attributes` SET `sharing_group_id` = 0 WHERE `distribution` != 4;';
@@ -1506,6 +1537,36 @@ class AppModel extends Model
         return $redis;
     }
 
+    public function getKafkaPubTool()
+    {
+        if (!$this->loadedKafkaPubTool) {
+            $this->loadKafkaPubTool();
+        }
+        return $this->loadedKafkaPubTool;
+    }
+
+    public function loadKafkaPubTool()
+    {
+        App::uses('KafkaPubTool', 'Tools');
+        $kafkaPubTool = new KafkaPubTool();
+        $rdkafkaIni = Configure::read('Plugin.Kafka_rdkafka_config');
+        $kafkaConf = array();
+        if (!empty($rdkafkaIni)) {
+            $kafkaConf = parse_ini_file($rdkafkaIni);
+        }
+        $brokers = Configure::read('Plugin.Kafka_brokers');
+        $kafkaPubTool->initTool($brokers, $kafkaConf);
+        $this->loadedKafkaPubTool = $kafkaPubTool;
+        return true;
+    }
+
+    public function publishKafkaNotification($topicName, $data, $action = false) {
+        $kafkaTopic = Configure::read('Plugin.Kafka_' . $topicName . '_notifications_topic');
+        if (Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_' . $topicName . '_notifications_enable') && !empty($kafkaTopic)) {
+            $this->getKafkaPubTool()->publishJson($kafkaTopic, $data, $action);
+        }
+    }
+
     public function getPubSubTool()
     {
         if (!$this->loadedPubSubTool) {
diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 4bf0df6f6..fc8f41b9f 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -645,8 +645,10 @@ class Attribute extends AppModel
         if (isset($this->data['Attribute']['type']) && $this->typeIsAttachment($this->data['Attribute']['type']) && !empty($this->data['Attribute']['data'])) {
             $result = $result && $this->saveBase64EncodedAttachment($this->data['Attribute']); // TODO : is this correct?
         }
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_attribute_notifications_enable')) {
-            $pubSubTool = $this->getPubSubTool();
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_attribute_notifications_enable');
+        $kafkaTopic = Configure::read('Plugin.Kafka_attribute_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_attribute_notifications_enable') && !empty($kafkaTopic);
+        if ($pubToZmq || $pubToKafka) {
             $attribute = $this->fetchAttribute($this->id);
             if (!empty($attribute)) {
                 $user = array(
@@ -663,10 +665,21 @@ class Attribute extends AppModel
                 if (!empty($this->data['Attribute']['deleted'])) {
                     $action = 'soft-delete';
                 }
-                if (Configure::read('Plugin.ZeroMQ_include_attachments') && $this->typeIsAttachment($attribute['Attribute']['type'])) {
-                    $attribute['Attribute']['data'] = $this->base64EncodeAttachment($attribute['Attribute']);
+                if ($pubToZmq) {
+                    if (Configure::read('Plugin.ZeroMQ_include_attachments') && $this->typeIsAttachment($attribute['Attribute']['type'])) {
+                        $attribute['Attribute']['data'] = $this->base64EncodeAttachment($attribute['Attribute']);
+                    }
+                    $pubSubTool = $this->getPubSubTool();
+                    $pubSubTool->attribute_save($attribute, $action);
+                    unset($attribute['Attribute']['data']);
+                }
+                if ($pubToKafka) {
+                    if (Configure::read('Plugin.Kafka_include_attachments') && $this->typeIsAttachment($attribute['Attribute']['type'])) {
+                        $attribute['Attribute']['data'] = $this->base64EncodeAttachment($attribute['Attribute']);
+                    }
+                    $kafkaPubTool = $this->getKafkaPubTool();
+                    $kafkaPubTool->publishJson($kafkaTopic, $attribute, $action);
                 }
-                $pubSubTool->attribute_save($attribute, $action);
             }
         }
         if (Configure::read('MISP.enable_advanced_correlations') && in_array($this->data['Attribute']['type'], array('ip-src', 'ip-dst', 'domain-ip')) && strpos($this->data['Attribute']['value'], '/')) {
@@ -712,6 +725,11 @@ class Attribute extends AppModel
                 $pubSubTool = $this->getPubSubTool();
                 $pubSubTool->attribute_save($this->data, 'delete');
             }
+            $kafkaTopic = Configure::read('Plugin.Kafka_attribute_notifications_topic');
+            if (Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_attribute_notifications_enable') && !empty($kafkaTopic)) {
+                $kafkaPubTool = $this->getKafkaPubTool();
+                $kafkaPubTool->publishJson($kafkaTopic, $this->data, 'delete');
+            }
         }
     }
 
@@ -2390,7 +2408,7 @@ class Attribute extends AppModel
                 'conditions' => $conditions, // array of conditions
                 'order' => 'Attribute.value' . $valueField . ' ASC',
                 'recursive' => -1, // int
-                'fields' => array('Attribute.id', 'Attribute.event_id', 'Attribute.type', 'Attribute.comment', 'Attribute.value' . $valueField . " as value"),
+                'fields' => array('Attribute.id', 'Attribute.event_id', 'Attribute.type', 'Attribute.category', 'Attribute.comment', 'Attribute.to_ids', 'Attribute.value', 'Attribute.value' . $valueField),
                 'contain' => array('Event' => array('fields' => array('Event.id', 'Event.threat_level_id', 'Event.orgc_id', 'Event.uuid'))),
                 'group' => array('Attribute.type', 'Attribute.value' . $valueField), // fields to GROUP BY
                 'enforceWarninglist' => $enforceWarninglist
@@ -2885,7 +2903,7 @@ class Attribute extends AppModel
                                             )
                                     )
                             ),
-                            'fields' => array('ShadowAttribute.id')
+                            'fields' => array('ShadowAttribute.id', 'ShadowAttribute.value', 'ShadowAttribute.type', 'ShadowAttribute.category', 'ShadowAttribute.to_ids')
                     )
             );
             $params['contain'] = array_merge($params['contain'], $proposalRestriction);
@@ -2999,7 +3017,7 @@ class Attribute extends AppModel
                     $results[$key]['Attribute']['event_uuid'] = $results[$key]['Event']['uuid'];
                 }
                 if ($proposals_block_attributes) {
-                    $results = $this->__blockAttributeViaProposal($results, $key);
+                    $this->__blockAttributeViaProposal($results, $key);
                 }
                 if ($options['withAttachments']) {
                     if ($this->typeIsAttachment($attribute['Attribute']['type'])) {
@@ -3007,7 +3025,9 @@ class Attribute extends AppModel
                         $results[$key]['Attribute']['data'] = $encodedFile;
                     }
                 }
-                $attributes[] = $results[$key];
+                if (!empty($results[$key])) {
+                    $attributes[] = $results[$key];
+                }
             }
             if (!empty($break)) {
                 break;
@@ -3047,8 +3067,8 @@ class Attribute extends AppModel
                 if ($sa['value'] === $attributes[$k]['Attribute']['value'] &&
                     $sa['type'] === $attributes[$k]['Attribute']['type'] &&
                     $sa['category'] === $attributes[$k]['Attribute']['category'] &&
-                    $sa['to_ids'] == 0 &&
-                    $attribute['to_ids'] == 1
+                    ($sa['to_ids'] == 0 || $sa['to_ids'] == '') &&
+                    $attributes[$k]['Attribute']['to_ids'] == 1
                 ) {
                     unset($attributes[$k]);
                 }
@@ -3056,7 +3076,6 @@ class Attribute extends AppModel
         } else {
             unset($attributes[$k]['ShadowAttribute']);
         }
-        return $attributes;
     }
 
     // Method gets and converts the contents of a file passed along as a base64 encoded string with the original filename into a zip archive
@@ -3194,13 +3213,7 @@ class Attribute extends AppModel
         }
         foreach ($attributes as $k => $attribute) {
             if (!empty($attribute['encrypt']) && $attribute['encrypt']) {
-                if (strpos($attribute['value'], '|') !== false) {
-                    $temp = explode('|', $attribute['value']);
-                    $attribute['value'] = $temp[0];
-                }
-                $result = $this->handleMaliciousBase64($attribute['event_id'], $attribute['value'], $attribute['data'], array('md5'));
-                $attribute['data'] = $result['data'];
-                $attribute['value'] = $attribute['value'] . '|' . $result['md5'];
+                $attribute = $this->onDemandEncrypt($attribute);
             }
             if (!isset($attribute['distribution'])) {
                 $attribute['distribution'] = $defaultDistribution;
@@ -3212,6 +3225,18 @@ class Attribute extends AppModel
         return true;
     }
 
+    public function onDemandEncrypt($attribute)
+    {
+        if (strpos($attribute['value'], '|') !== false) {
+            $temp = explode('|', $attribute['value']);
+            $attribute['value'] = $temp[0];
+        }
+        $result = $this->handleMaliciousBase64($attribute['event_id'], $attribute['value'], $attribute['data'], array('md5'));
+        $attribute['data'] = $result['data'];
+        $attribute['value'] = $attribute['value'] . '|' . $result['md5'];
+        return $attribute;
+    }
+
     public function saveAndEncryptAttribute($attribute, $user = false)
     {
         $hashes = array('md5' => 'malware-sample', 'sha1' => 'filename|sha1', 'sha256' => 'filename|sha256');
@@ -3580,6 +3605,9 @@ class Attribute extends AppModel
                 }
             }
         }
+        if (!empty($this->validationErrors)) {
+            $validationErrors = $this->validationErrors;
+        }
         return $attribute;
     }
 
diff --git a/app/Model/AttributeTag.php b/app/Model/AttributeTag.php
index 26954a23b..c9690be93 100644
--- a/app/Model/AttributeTag.php
+++ b/app/Model/AttributeTag.php
@@ -30,8 +30,10 @@ class AttributeTag extends AppModel
     public function afterSave($created, $options = array())
     {
         parent::afterSave($created, $options);
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_tag_notifications_enable')) {
-            $pubSubTool = $this->getPubSubTool();
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_tag_notifications_enable');
+        $kafkaTopic = Configure::read('Plugin.Kafka_tag_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_tag_notifications_enable') && !empty($kafkaTopic);
+        if ($pubToZmq || $pubToKafka) {
             $tag = $this->find('first', array(
                 'recursive' => -1,
                 'conditions' => array('AttributeTag.id' => $this->id),
@@ -40,15 +42,24 @@ class AttributeTag extends AppModel
             $tag['Tag']['attribute_id'] = $tag['AttributeTag']['attribute_id'];
             $tag['Tag']['event_id'] = $tag['AttributeTag']['event_id'];
             $tag = array('Tag' => $tag['Tag']);
-            $pubSubTool->tag_save($tag, 'attached to attribute');
+            if ($pubToZmq) {
+                $pubSubTool = $this->getPubSubTool();
+                $pubSubTool->tag_save($tag, 'attached to attribute');
+            }
+            if ($pubToKafka) {
+                $kafkaPubTool = $this->getKafkaPubTool();
+                $kafkaPubTool->publishJson($kafkaTopic, $tag, 'attached to attribute');
+            }
         }
     }
 
     public function beforeDelete($cascade = true)
     {
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_tag_notifications_enable')) {
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_tag_notifications_enable');
+        $kafkaTopic = Configure::read('Plugin.Kafka_tag_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_tag_notifications_enable') && !empty($kafkaTopic);
+        if ($pubToZmq || $pubToKafka) {
             if (!empty($this->id)) {
-                $pubSubTool = $this->getPubSubTool();
                 $tag = $this->find('first', array(
                     'recursive' => -1,
                     'conditions' => array('AttributeTag.id' => $this->id),
@@ -57,7 +68,14 @@ class AttributeTag extends AppModel
                 $tag['Tag']['attribute_id'] = $tag['AttributeTag']['attribute_id'];
                 $tag['Tag']['event_id'] = $tag['AttributeTag']['event_id'];
                 $tag = array('Tag' => $tag['Tag']);
-                $pubSubTool->tag_save($tag, 'detached from attribute');
+                if ($pubToZmq) {
+                    $pubSubTool = $this->getPubSubTool();
+                    $pubSubTool->tag_save($tag, 'detached from attribute');
+                }
+                if ($pubToKafka) {
+                    $kafkaPubTool = $this->getKafkaPubTool();
+                    $kafkaPubTool->publishJson($kafkaTopic, $tag, 'detached from attribute');
+                }
             }
         }
     }
diff --git a/app/Model/Event.php b/app/Model/Event.php
index b856812cb..484790abb 100755
--- a/app/Model/Event.php
+++ b/app/Model/Event.php
@@ -354,10 +354,33 @@ class Event extends AppModel
             $orgc = $this->Orgc->find('first', array('conditions' => array('Orgc.id' => $this->data['Event']['orgc_id']), 'recursive' => -1, 'fields' => array('Orgc.name')));
             $this->EventBlacklist->save(array('event_uuid' => $this->data['Event']['uuid'], 'event_info' => $this->data['Event']['info'], 'event_orgc' => $orgc['Orgc']['name']));
             if (!empty($this->data['Event']['id'])) {
-                if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_attribute_notifications_enable')) {
+                if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_event_notifications_enable')) {
                     $pubSubTool = $this->getPubSubTool();
                     $pubSubTool->event_save(array('Event' => $this->data['Event']), 'delete');
                 }
+                if (Configure::read('Plugin.Kafka_enable')) {
+                    $kafkaEventTopic = Configure::read('Plugin.Kafka_event_notifications_topic');
+                    if(Configure::read('Plugin.Kafka_event_notifications_enable') && !empty($kafkaEventTopic)) {
+                        $kafkaPubTool = $this->getKafkaPubTool();
+                        $kafkaPubTool->publishJson($kafkaEventTopic, array('Event' => $this->data['Event']), 'delete');
+                    }
+                    $kafkaPubTopic = Configure::read('Plugin.Kafka_event_publish_notifications_topic');
+                    if (!empty($this->data['Event']['published']) && Configure::read('Plugin.Kafka_event_publish_notifications_enable') && !empty($kafkaPubTopic)) {
+                        $hostOrg = $this->Org->find('first', array('conditions' => array('name' => Configure::read('MISP.org')), 'fields' => array('id')));
+                        if (!empty($hostOrg)) {
+                            $user = array('org_id' => $hostOrg['Org']['id'], 'Role' => array('perm_sync' => 0, 'perm_audit' => 0, 'perm_site_admin' => 0), 'Organisation' => $hostOrg['Org']);
+                            $params = array('eventid' => $this->data['Event']['id']);
+                            if (Configure::read('Plugin.Kafka_include_attachments')) {
+                                $params['includeAttachments'] = 1;
+                            }
+                            $fullEvent = $this->fetchEvent($user, $params);
+                            if (!empty($fullEvent)) {
+                                $kafkaPubTool = $this->getKafkaPubTool();
+                                $kafkaPubTool->publishJson($kafkaPubTopic, $fullEvent[0], 'delete');
+                            }
+                        }
+                    }
+                }
             }
         }
 
@@ -483,6 +506,9 @@ class Event extends AppModel
                 $pubSubTool->event_save($event, $created ? 'add' : 'edit');
             }
         }
+        if (empty($this->data['Event']['unpublishAction']) && empty($this->data['Event']['skip_kafka'])) {
+            $this->publishKafkaNotification('event', $this->quickFetchEvent($this->data['Event']['id']), $created ? 'add' : 'edit');
+        }
     }
 
     public function buildEventConditions($user)
@@ -3874,20 +3900,37 @@ class Event extends AppModel
             $event['Event']['published'] = 1;
             $event['Event']['publish_timestamp'] = time();
             $event['Event']['skip_zmq'] = 1;
+            $event['Event']['skip_kafka'] = 1;
             $this->save($event, array('fieldList' => $fieldList));
         }
-        if (Configure::read('Plugin.ZeroMQ_enable')) {
-            $pubSubTool = $this->getPubSubTool();
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable');
+        $kafkaTopic = Configure::read('Plugin.Kafka_event_publish_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_event_publish_notifications_enable') && !empty($kafkaTopic);
+        if ($pubToZmq || $pubToKafka) {
             $hostOrg = $this->Org->find('first', array('conditions' => array('name' => Configure::read('MISP.org')), 'fields' => array('id')));
             if (!empty($hostOrg)) {
                 $user = array('org_id' => $hostOrg['Org']['id'], 'Role' => array('perm_sync' => 0, 'perm_audit' => 0, 'perm_site_admin' => 0), 'Organisation' => $hostOrg['Org']);
-                $params = array('eventid' => $id);
-                if (Configure::read('Plugin.ZeroMQ_include_attachments')) {
-                    $params['includeAttachments'] = 1;
+                if ($pubToZmq) {
+                    $params = array('eventid' => $id);
+                    if (Configure::read('Plugin.ZeroMQ_include_attachments')) {
+                        $params['includeAttachments'] = 1;
+                    }
+                    $fullEvent = $this->fetchEvent($user, $params);
+                    if (!empty($fullEvent)) {
+                        $pubSubTool = $this->getPubSubTool();
+                        $pubSubTool->publishEvent($fullEvent[0], 'publish');
+                    }
                 }
-                $fullEvent = $this->fetchEvent($user, $params);
-                if (!empty($fullEvent)) {
-                    $pubSubTool->publishEvent($fullEvent[0], 'publish');
+                if ($pubToKafka) {
+                    $params = array('eventid' => $id);
+                    if (Configure::read('Plugin.Kafka_include_attachments')) {
+                        $params['includeAttachments'] = 1;
+                    }
+                    $fullEvent = $this->fetchEvent($user, $params);
+                    if (!empty($fullEvent)) {
+                        $kafkaPubTool = $this->getKafkaPubTool();
+                        $kafkaPubTool->publishJson($kafkaTopic, $fullEvent[0], 'publish');
+                    }
                 }
             }
         }
@@ -4836,7 +4879,8 @@ class Event extends AppModel
                             'name' => $object['name'],
                             'uuid' => $object['uuid'],
                             'id' => isset($object['id']) ? $object['id'] : 0,
-                            'object_type' => $object['objectType']
+                            'object_type' => $object['objectType'],
+                            'relationship_type' => $reference['relationship_type']
                         );
                     }
                 }
@@ -5702,14 +5746,20 @@ class Event extends AppModel
                 }
             }
         }
+        if ($saved == 1) {
+            $messageScopeSaved = Inflector::singularize($messageScope);
+        } else {
+            $messageScopeSaved = Inflector::pluralize($messageScope);
+        }
         if ($failed > 0) {
             if ($failed == 1) {
-                $message = $saved . ' ' . $messageScope . ' created' . $emailResult . '. ' . $failed . ' ' . $messageScope . ' could not be saved. Reason for the failure: ' . json_encode($lastError);
+                $messageScopeFailed = Inflector::singularize($messageScope);
+                $message = $saved . ' ' . $messageScopeSaved . ' created' . $emailResult . '. ' . $failed . ' ' . $messageScopeFailed . ' could not be saved. Reason for the failure: ' . json_encode($lastError);
             } else {
-                $message = $saved . ' ' . $messageScope . ' created' . $emailResult . '. ' . $failed . ' ' . $messageScope . ' could not be saved. This may be due to attributes with similar values already existing.';
+                $message = $saved . ' ' . $messageScopeSaved . ' created' . $emailResult . '. ' . $failed . ' ' . $messageScope . ' could not be saved. This may be due to attributes with similar values already existing.';
             }
         } else {
-            $message = $saved . ' ' . $messageScope . ' created' . $emailResult . '.';
+            $message = $saved . ' ' . $messageScopeSaved . ' created' . $emailResult . '.';
         }
         if ($jobId) {
             if ($i % 20 == 0) {
@@ -5990,4 +6040,47 @@ class Event extends AppModel
         }
         return true;
     }
+
+    public function getRequiredTaxonomies()
+    {
+        $this->Taxonomy = ClassRegistry::init('Taxonomy');
+        $required_taxonomies = $this->Taxonomy->find('list', array(
+            'recursive' => -1,
+            'conditions' => array('Taxonomy.required' => 1, 'Taxonomy.enabled' => 1),
+            'fields' => array('Taxonomy.namespace')
+        ));
+        return $required_taxonomies;
+    }
+
+    public function checkIfPublishable($id)
+    {
+        $required_taxonomies = $this->getRequiredTaxonomies();
+        if (!empty($required_taxonomies)) {
+            $tags = $this->EventTag->find('all', array(
+                'conditions' => array('EventTag.event_id' => $id),
+                'recursive' => -1,
+                'contain' => array('Tag')
+            ));
+            $missing = array();
+            foreach ($required_taxonomies as $required_taxonomy) {
+                $found = false;
+                foreach ($tags as $tag) {
+                    $name = explode(':', $tag['Tag']['name']);
+                    if (count($name) > 1) {
+                        if ($name[0] == $required_taxonomy) {
+                            $found = true;
+                            break;
+                        }
+                    }
+                }
+                if (!$found) {
+                    $missing[] = $required_taxonomy;
+                }
+            }
+            if (!empty($missing)) {
+                return $missing;
+            }
+        }
+        return true;
+    }
 }
diff --git a/app/Model/EventTag.php b/app/Model/EventTag.php
index 9535873bc..df15f1b22 100644
--- a/app/Model/EventTag.php
+++ b/app/Model/EventTag.php
@@ -26,8 +26,10 @@ class EventTag extends AppModel
     public function afterSave($created, $options = array())
     {
         parent::afterSave($created, $options);
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_tag_notifications_enable')) {
-            $pubSubTool = $this->getPubSubTool();
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_tag_notifications_enable');
+        $kafkaTopic = Configure::read('Plugin.Kafka_tag_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_tag_notifications_enable') && !empty($kafkaTopic);
+        if ($pubToZmq || $pubToKafka) {
             $tag = $this->find('first', array(
                 'recursive' => -1,
                 'conditions' => array('EventTag.id' => $this->id),
@@ -35,15 +37,24 @@ class EventTag extends AppModel
             ));
             $tag['Tag']['event_id'] = $tag['EventTag']['event_id'];
             $tag = array('Tag' => $tag['Tag']);
-            $pubSubTool->tag_save($tag, 'attached to event');
+            if ($pubToZmq) {
+                $pubSubTool = $this->getPubSubTool();
+                $pubSubTool->tag_save($tag, 'attached to event');
+            }
+            if ($pubToKafka) {
+                $kafkaPubTool = $this->getKafkaPubTool();
+                $kafkaPubTool->publishJson($kafkaTopic, $tag, 'attached to event');
+            }
         }
     }
 
     public function beforeDelete($cascade = true)
     {
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_tag_notifications_enable')) {
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_tag_notifications_enable');
+        $kafkaTopic = Configure::read('Plugin.Kafka_tag_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_tag_notifications_enable') && !empty($kafkaTopic);
+        if ($pubToZmq || $pubToKafka) {
             if (!empty($this->id)) {
-                $pubSubTool = $this->getPubSubTool();
                 $tag = $this->find('first', array(
                     'recursive' => -1,
                     'conditions' => array('EventTag.id' => $this->id),
@@ -51,7 +62,14 @@ class EventTag extends AppModel
                 ));
                 $tag['Tag']['event_id'] = $tag['EventTag']['event_id'];
                 $tag = array('Tag' => $tag['Tag']);
-                $pubSubTool->tag_save($tag, 'detached from event');
+                if ($pubToZmq) {
+                    $pubSubTool = $this->getPubSubTool();
+                    $pubSubTool->tag_save($tag, 'detached from event');
+                }
+                if ($pubToKafka) {
+                    $kafkaPubTool = $this->getKafkaPubTool();
+                    $kafkaPubTool->publishJson($kafkaTopic, $tag, 'detached from event');
+                }
             }
         }
     }
diff --git a/app/Model/Feed.php b/app/Model/Feed.php
index 1a227b2ed..fa1edd7cd 100644
--- a/app/Model/Feed.php
+++ b/app/Model/Feed.php
@@ -1,5 +1,6 @@
 <?php
 App::uses('AppModel', 'Model');
+App::uses('RandomTool', 'Tools');
 
 class Feed extends AppModel
 {
@@ -1393,4 +1394,112 @@ class Feed extends AppModel
         }
         return true;
     }
+
+    public function getFeedCoverage($id, $source_scope = 'feed', $dataset = 'all')
+    {
+        $redis = $this->setupRedis();
+        if ($redis === false) {
+            return 'Could not reach Redis.';
+        }
+        $this->Server = ClassRegistry::init('Server');
+        $feed_conditions = array('Feed.caching_enabled' => 1);
+        $server_conditions = array('Server.caching_enabled' => 1);
+        if ($source_scope === 'feed') {
+            $feed_conditions['NOT'] = array('Feed.id' => $id);
+        } else {
+            $server_conditions['NOT'] = array('Server.id' => $id);
+        }
+        if ($dataset !== 'all') {
+            if (empty($dataset['Feed'])) {
+                $feed_conditions['OR'] = array('Feed.id' => -1);
+            } else {
+                $feed_conditions['OR'] = array('Feed.id' => $dataset['Feed']);
+            }
+            if (empty($dataset['Server'])) {
+                $server_conditions['OR'] = array('Server.id' => -1);
+            } else {
+                $server_conditions['OR'] = array('Server.id' => $dataset['Server']);
+            }
+        }
+        $other_feeds = $this->find('list', array(
+            'recursive' => -1,
+            'conditions' => $feed_conditions,
+            'fields' => array('Feed.id', 'Feed.id')
+        ));
+        $other_servers = $this->Server->find('list', array(
+            'recursive' => -1,
+            'conditions' => $server_conditions,
+            'fields' => array('Server.id', 'Server.id')
+        ));
+        $feed_element_count = $redis->scard('misp:feed_cache:' . $id);
+        $temp_store = (new RandomTool())->random_str(false, 12);
+        $params = array('misp:feed_temp:' . $temp_store);
+        foreach ($other_feeds as $other_feed) {
+            $params[] = 'misp:feed_cache:' . $other_feed;
+        }
+        foreach ($other_servers as $other_server) {
+            $params[] = 'misp:server_cache:' . $other_server;
+        }
+        if (count($params) != 1 && $feed_element_count > 0) {
+            call_user_func_array(array($redis, 'sunionstore'), $params);
+            call_user_func_array(array($redis, 'sinterstore'), array('misp:feed_temp:' . $temp_store . '_intersect', 'misp:feed_cache:' . $id, 'misp:feed_temp:' . $temp_store));
+            $cardinality_intersect = $redis->scard('misp:feed_temp:' . $temp_store . '_intersect');
+            $coverage = round(100 * $cardinality_intersect / $feed_element_count, 2);
+            $redis->del('misp:feed_temp:' . $temp_store);
+            $redis->del('misp:feed_temp:' . $temp_store . '_intersect');
+        } else {
+            $coverage = 0;
+        }
+        return $coverage;
+    }
+
+    public function getCachedElements($feedId)
+    {
+        $redis = $this->setupRedis();
+        $cardinality = $redis->sCard('misp:feed_cache:' . $feedId);
+        return $cardinality;
+    }
+
+    public function getAllCachingEnabledFeeds($feedId, $intersectingOnly = false) {
+        if ($intersectingOnly) {
+            $redis = $this->setupRedis();
+        }
+        $result['Feed'] = $this->find('all', array(
+            'conditions' => array(
+                'Feed.id !=' => $feedId,
+                'caching_enabled' => 1
+            ),
+            'recursive' => -1,
+            'fields' => array('Feed.id', 'Feed.name', 'Feed.url')
+        ));
+        $this->Server = ClassRegistry::init('Server');
+        $result['Server'] = $this->Server->find('all', array(
+            'conditions' => array(
+                'caching_enabled' => 1
+            ),
+            'recursive' => -1,
+            'fields' => array('Server.id', 'Server.name', 'Server.url')
+        ));
+        $scopes = array('Feed', 'Server');
+        foreach ($scopes as $scope) {
+            foreach ($result[$scope] as $k => $v) {
+                $result[$scope][$k] = $v[$scope];
+            }
+        }
+        if ($intersectingOnly) {
+            foreach ($scopes as $scope) {
+                if (!empty($result[$scope])) {
+                    foreach ($result[$scope] as $k => $feed) {
+                        $intersect = $redis->sInter('misp:feed_cache:' . $feedId, 'misp:' . lcfirst($scope) . '_cache:' . $feed['id']);
+                        if (empty($intersect)) {
+                            unset($result[$scope][$k]);
+                        } else {
+                            $result[$scope][$k]['matching_values'] = count($intersect);
+                        }
+                    }
+                }
+            }
+        }
+        return $result;
+    }
 }
diff --git a/app/Model/Galaxy.php b/app/Model/Galaxy.php
index 8effaab61..a63b43195 100644
--- a/app/Model/Galaxy.php
+++ b/app/Model/Galaxy.php
@@ -177,14 +177,14 @@ class Galaxy extends AppModel
                                 $elements[] = array(
                                     $galaxyClusterId,
                                     $key,
-                                    $v
+                                    strval($v)
                                 );
                             }
                         } else {
                             $elements[] = array(
                                 $this->GalaxyCluster->id,
                                 $key,
-                                $value
+                                strval($value)
                             );
                         }
                     }
@@ -383,6 +383,20 @@ class Galaxy extends AppModel
         return empty($galaxy) ? 0 : $galaxy['Galaxy']['id'];
     }
 
+    public function getAllowedMatrixGalaxies()
+    {
+        $conditions = array(
+            'NOT' => array(
+                'kill_chain_order' => ''
+            )
+        );
+        $galaxies = $this->find('all', array(
+            'recursive' => -1,
+            'conditions' => $conditions,
+        ));
+        return $galaxies;
+    }
+
     public function getMatrix($galaxy_id)
     {
         $conditions = array('Galaxy.id' => $galaxy_id);
diff --git a/app/Model/Job.php b/app/Model/Job.php
index 7bd08e134..b5d6d881e 100644
--- a/app/Model/Job.php
+++ b/app/Model/Job.php
@@ -56,7 +56,7 @@ class Job extends AppModel
             $process_id = CakeResque::enqueue(
                     'cache',
                     $shell . 'Shell',
-                    array('cache' . $type, $user['id'], $id, $extra, $extra2),
+                    array('cachebro' . $type, $user['id'], $id, $extra, $extra2),
                     true
             );
         } else {
diff --git a/app/Model/Log.php b/app/Model/Log.php
index 9b43df05d..a46942dea 100644
--- a/app/Model/Log.php
+++ b/app/Model/Log.php
@@ -256,11 +256,13 @@ class Log extends AppModel
 
     public function logData($data)
     {
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_user_notifications_enable')) {
+        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_audit_notifications_enable')) {
             $pubSubTool = $this->getPubSubTool();
             $pubSubTool->publish($data, 'audit', 'log');
         }
 
+        $this->publishKafkaNotification('audit', $data, 'log');
+
         if (Configure::read('Plugin.ElasticSearch_logging_enable')) {
             // send off our logs to distributed /dev/null
             $logIndex = Configure::read("Plugin.ElasticSearch_log_index");
diff --git a/app/Model/MispObject.php b/app/Model/MispObject.php
index 9e388c00f..a96f007e7 100644
--- a/app/Model/MispObject.php
+++ b/app/Model/MispObject.php
@@ -92,19 +92,31 @@ class MispObject extends AppModel
 
     public function afterSave($created, $options = array())
     {
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_attribute_notifications_enable')) {
-            if (empty($this->data['Object']['skip_zmq'])) {
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') &&
+            Configure::read('Plugin.ZeroMQ_object_notifications_enable') &&
+            empty($this->data['Object']['skip_zmq']);
+        $kafkaTopic = Configure::read('Plugin.Kafka_object_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') &&
+            Configure::read('Plugin.Kafka_object_notifications_enable') &&
+            !empty($kafkaTopic) &&
+            empty($this->data['Object']['skip_kafka']);
+        if ($pubToZmq || $pubToKafka) {
+            $object = $this->find('first', array(
+                'conditions' => array('Object.id' => $this->id),
+                'recursive' => -1
+            ));
+            $action = $created ? 'add' : 'edit';
+            if (!empty($this->data['Object']['deleted'])) {
+                $action = 'soft-delete';
+            }
+            if ($pubToZmq) {
                 $pubSubTool = $this->getPubSubTool();
-                $object = $this->find('first', array(
-                    'conditions' => array('Object.id' => $this->id),
-                    'recursive' => -1
-                ));
-                $action = $created ? 'add' : 'edit';
-                if (!empty($this->data['Object']['deleted'])) {
-                    $action = 'soft-delete';
-                }
                 $pubSubTool->object_save($object, $action);
             }
+            if ($pubToKafka) {
+                $kafkaPubTool = $this->getKafkaPubTool();
+                $kafkaPubTool->publishJson($kafkaTopic, $object, $action);
+            }
         }
         return true;
     }
@@ -112,13 +124,22 @@ class MispObject extends AppModel
     public function beforeDelete($cascade = true)
     {
         if (!empty($this->data['Object']['id'])) {
-            if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_object_notifications_enable')) {
-                $pubSubTool = $this->getPubSubTool();
+            $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_object_notifications_enable');
+            $kafkaTopic = Configure::read('Plugin.Kafka_object_notifications_topic');
+            $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_object_notifications_enable') && !empty($kafkaTopic);
+            if ($pubToZmq || $pubToKafka) {
                 $object = $this->find('first', array(
                     'recursive' => -1,
                     'conditions' => array('Object.id' => $this->data['Object']['id'])
                 ));
-                $pubSubTool->object_save($object, 'delete');
+                if ($pubToZmq) {
+                    $pubSubTool = $this->getPubSubTool();
+                    $pubSubTool->object_save($object, 'delete');
+                }
+                if ($pubToKafka) {
+                    $kafkaPubTool = $this->getKafkaPubTool();
+                    $kafkaPubTool->publishJson($kafkaTopic, $object, 'delete');
+                }
             }
         }
     }
@@ -686,6 +707,7 @@ class MispObject extends AppModel
         ));
         $object['Object']['timestamp'] = $date->getTimestamp();
         $object['Object']['skip_zmq'] = 1;
+        $object['Object']['skip_kafka'] = 1;
         $result = $this->save($object);
         return $result;
     }
diff --git a/app/Model/ObjectReference.php b/app/Model/ObjectReference.php
index bf710599b..0f1f14fbe 100644
--- a/app/Model/ObjectReference.php
+++ b/app/Model/ObjectReference.php
@@ -55,8 +55,10 @@ class ObjectReference extends AppModel
 
     public function afterSave($created, $options = array())
     {
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_object_reference_notifications_enable')) {
-            $pubSubTool = $this->getPubSubTool();
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_object_reference_notifications_enable');
+        $kafkaTopic = Configure::read('Plugin.Kafka_object_reference_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_object_reference_notifications_enable') && !empty($kafkaTopic);
+        if ($pubToZmq || $pubToKafka) {
             $object_reference = $this->find('first', array(
                 'conditions' => array('ObjectReference.id' => $this->id),
                 'recursive' => -1
@@ -65,7 +67,14 @@ class ObjectReference extends AppModel
             if (!empty($this->data['ObjectReference']['deleted'])) {
                 $action = 'soft-delete';
             }
-            $pubSubTool->object_reference_save($object_reference, $action);
+            if ($pubToZmq) {
+                $pubSubTool = $this->getPubSubTool();
+                $pubSubTool->object_reference_save($object_reference, $action);
+            }
+            if ($pubToKafka) {
+                $kafkaPubTool = $this->getKafkaPubTool();
+                $kafkaPubTool->publishJson($kafkaTopic, $object_reference, $action);
+            }
         }
         return true;
     }
diff --git a/app/Model/Organisation.php b/app/Model/Organisation.php
index 43e245ebf..07f374cd3 100644
--- a/app/Model/Organisation.php
+++ b/app/Model/Organisation.php
@@ -125,6 +125,8 @@ class Organisation extends AppModel
             $pubSubTool = $this->getPubSubTool();
             $pubSubTool->modified($this->data, 'organisation');
         }
+        $action = $created ? 'add' : 'edit';
+        $this->publishKafkaNotification('organisation', $this->data, $action);
         return true;
     }
 
diff --git a/app/Model/RestClientHistory.php b/app/Model/RestClientHistory.php
new file mode 100644
index 000000000..4ece40e0f
--- /dev/null
+++ b/app/Model/RestClientHistory.php
@@ -0,0 +1,40 @@
+<?php
+App::uses('AppModel', 'Model');
+
+class RestClientHistory extends AppModel
+{
+    public $belongsTo = array(
+            'Org' => array(
+                    'className' => 'Organisation',
+                    'foreignKey' => 'org_id',
+                    'order' => array(),
+                    'fields' => array('id', 'name', 'uuid')
+            ),
+            'User' => array(
+                    'className' => 'User',
+                    'foreignKey' => 'user_id',
+                    'order' => array(),
+                    'fields' => array('id', 'email')
+            ),
+        );
+
+    public function cleanup($user_id)
+    {
+        $list = $this->find('list', array(
+            'conditions' => array(
+                'RestClientHistory.user_id' => $user_id
+            ),
+            'page' => 1,
+            'limit' => 10,
+            'order' => array('RestClientHistory.timestamp DESC'),
+            'fields' => array('RestClientHistory.id', 'RestClientHistory.timestamp')
+        ));
+        $this->deleteAll(array(
+            'RestClientHistory.user_id' => $user_id,
+            'RestClientHistory.bookmark' => 0,
+            'NOT' => array(
+                'RestClientHistory.id' => array_keys($list)
+            )
+        ));
+    }
+}
diff --git a/app/Model/Role.php b/app/Model/Role.php
index 43796bd46..e7c5999a9 100644
--- a/app/Model/Role.php
+++ b/app/Model/Role.php
@@ -140,6 +140,12 @@ class Role extends AppModel
             'text' => 'ZMQ publisher',
             'readonlyenabled' => false,
             'title' => 'Allow users to publish data to the ZMQ pubsub channel via the publish event to ZMQ button.'
+        ),
+        'perm_publish_kafka' => array(
+            'id' => 'RolePermPublishKafka',
+            'text' => 'Kafka publisher',
+            'readonlyenabled' => false,
+            'title' => 'Allow users to publish data to Kafka via the publish event to Kafka button.'
         )
     );
 
diff --git a/app/Model/Server.php b/app/Model/Server.php
index 28f2fea72..8af97dd7b 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -250,6 +250,15 @@ class Server extends AppModel
                                 'type' => 'boolean',
                                 'afterHook' => 'disableCacheAfterHook',
                         ),
+                        'disable_threat_level' => array(
+                                'level' => 1,
+                                'description' => __('Disable displaying / modifications to the threat level altogether on the instance (deprecated field).'),
+                                'value' => false,
+                                'null' => true,
+                                'errorMessage' => '',
+                                'test' => 'testBool',
+                                'type' => 'boolean'
+                        ),
                         'header' => array(
                                 'level' => 3,
                                 'description' => __('This setting is deprecated and can be safely removed.'),
@@ -1288,6 +1297,214 @@ class Server extends AppModel
                             'test' => 'testForEmpty',
                             'type' => 'string',
                         ),
+                        'Kafka_enable' => array(
+                            'level' => 2,
+                            'description' => __('Enables or disables the Kafka pub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean',
+                        ),
+                        'Kafka_brokers' => array(
+                            'level' => 2,
+                            'description' => __('A comma separated list of Kafka bootstrap brokers'),
+                            'value' => 'kafka:9092',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string',
+                        ),
+                        'Kafka_rdkafka_config' => array(
+                            'level' => 2,
+                            'description' => __('A path to an ini file with configuration options to be passed to rdkafka. Section headers in the ini file will be ignored.'),
+                            'value' => '/etc/rdkafka.ini',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string',
+                        ),
+                        'Kafka_include_attachments' => array(
+                            'level' => 2,
+                            'description' => __('Enable this setting to include the base64 encoded payloads of malware-samples/attachments in the output.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean'
+                        ),
+                        'Kafka_event_notifications_enable' => array(
+                            'level' => 2,
+                            'description' => __('Enables or disables the publishing of any event creations/edits/deletions.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean'
+                        ),
+                        'Kafka_event_notifications_topic' => array(
+                            'level' => 2,
+                            'description' => __('Topic for publishing event creations/edits/deletions.'),
+                            'value' => 'misp_event',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string'
+                        ),
+                        'Kafka_event_publish_notifications_enable' => array(
+                            'level' => 2,
+                            'description' => __('If enabled it will publish to Kafka the event at the time that the event gets published in MISP. Event actions (creation or edit) will not be published to Kafka.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean'
+                        ),
+                        'Kafka_event_publish_notifications_topic' => array(
+                            'level' => 2,
+                            'description' => __('Topic for publishing event information on publish.'),
+                            'value' => 'misp_event_publish',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string'
+                        ),
+                        'Kafka_object_notifications_enable' => array(
+                            'level' => 2,
+                            'description' => __('Enables or disables the publishing of any object creations/edits/deletions.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean'
+                        ),
+                        'Kafka_object_notifications_topic' => array(
+                            'level' => 2,
+                            'description' => __('Topic for publishing object creations/edits/deletions.'),
+                            'value' => 'misp_object',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string'
+                        ),
+                        'Kafka_object_reference_notifications_enable' => array(
+                            'level' => 2,
+                            'description' => __('Enables or disables the publishing of any object reference creations/deletions.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean'
+                        ),
+                        'Kafka_object_reference_notifications_topic' => array(
+                            'level' => 2,
+                            'description' => __('Topic for publishing object reference creations/deletions.'),
+                            'value' => 'misp_object_reference',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string'
+                        ),
+                        'Kafka_attribute_notifications_enable' => array(
+                            'level' => 2,
+                            'description' => __('Enables or disables the publishing of any attribute creations/edits/soft deletions.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean'
+                        ),
+                        'Kafka_attribute_notifications_topic' => array(
+                            'level' => 2,
+                            'description' => __('Topic for publishing attribute creations/edits/soft deletions.'),
+                            'value' => 'misp_attribute',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string'
+                        ),
+                        'Kafka_shadow_attribute_notifications_enable' => array(
+                            'level' => 2,
+                            'description' => __('Enables or disables the publishing of any proposal creations/edits/deletions.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean'
+                        ),
+                        'Kafka_shadow_attribute_notifications_topic' => array(
+                            'level' => 2,
+                            'description' => __('Topic for publishing proposal creations/edits/deletions.'),
+                            'value' => 'misp_shadow_attribute',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string'
+                        ),
+                        'Kafka_tag_notifications_enable' => array(
+                            'level' => 2,
+                            'description' => __('Enables or disables the publishing of any tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean'
+                        ),
+                        'Kafka_tag_notifications_topic' => array(
+                            'level' => 2,
+                            'description' => __('Topic for publishing tag creations/edits/deletions as well as tags being attached to / detached from various MISP elements.'),
+                            'value' => 'misp_tag',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string'
+                        ),
+                        'Kafka_sighting_notifications_enable' => array(
+                            'level' => 2,
+                            'description' => __('Enables or disables the publishing of new sightings.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean'
+                        ),
+                        'Kafka_sighting_notifications_topic' => array(
+                            'level' => 2,
+                            'description' => __('Topic for publishing sightings.'),
+                            'value' => 'misp_sighting',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string'
+                        ),
+                        'Kafka_user_notifications_enable' => array(
+                            'level' => 2,
+                            'description' => __('Enables or disables the publishing of new/modified users.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean'
+                        ),
+                        'Kafka_user_notifications_topic' => array(
+                            'level' => 2,
+                            'description' => __('Topic for publishing new/modified users.'),
+                            'value' => 'misp_user',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string'
+                        ),
+                        'Kafka_organisation_notifications_enable' => array(
+                            'level' => 2,
+                            'description' => __('Enables or disables the publishing of new/modified organisations.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean'
+                        ),
+                        'Kafka_organisation_notifications_topic' => array(
+                            'level' => 2,
+                            'description' => __('Topic for publishing new/modified organisations.'),
+                            'value' => 'misp_organisation',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string'
+                        ),
+                        'Kafka_audit_notifications_enable' => array(
+                            'level' => 2,
+                            'description' => __('Enables or disables the publishing of log entries. Keep in mind, this can get pretty verbose depending on your logging settings.'),
+                            'value' => false,
+                            'errorMessage' => '',
+                            'test' => 'testBool',
+                            'type' => 'boolean'
+                        ),
+                        'Kafka_audit_notifications_topic' => array(
+                            'level' => 2,
+                            'description' => __('Topic for publishing log entries.'),
+                            'value' => 'misp_audit',
+                            'errorMessage' => '',
+                            'test' => 'testForEmpty',
+                            'type' => 'string'
+                        ),
                         'ZeroMQ_enable' => array(
                             'level' => 2,
                             'description' => __('Enables or disables the pub/sub feature of MISP. Make sure that you install the requirements for the plugin to work. Refer to the installation instructions for more information.'),
diff --git a/app/Model/ShadowAttribute.php b/app/Model/ShadowAttribute.php
index a7bb52c62..c08b79d3d 100644
--- a/app/Model/ShadowAttribute.php
+++ b/app/Model/ShadowAttribute.php
@@ -277,6 +277,10 @@ class ShadowAttribute extends AppModel
         } else {
             $this->__afterSaveCorrelation($this->data['ShadowAttribute']);
         }
+        if (empty($this->data['ShadowAttribute']['deleted'])) {
+            $action = $created ? 'add' : 'edit';
+            $this->publishKafkaNotification('shadow_attribute', $this->data, $action);
+        }
         return $result;
     }
 
@@ -555,6 +559,7 @@ class ShadowAttribute extends AppModel
         }
         $fieldList = array('proposal_email_lock', 'id', 'info');
         $event['Event']['skip_zmq'] = 1;
+        $event['Event']['skip_kafka'] = 1;
         $this->Event->save($event, array('fieldList' => $fieldList));
     }
 
diff --git a/app/Model/Sighting.php b/app/Model/Sighting.php
index 53d6368b3..cf6bb31b0 100644
--- a/app/Model/Sighting.php
+++ b/app/Model/Sighting.php
@@ -60,8 +60,10 @@ class Sighting extends AppModel
     public function afterSave($created, $options = array())
     {
         parent::afterSave($created, $options = array());
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_sighting_notifications_enable')) {
-            $pubSubTool = $this->getPubSubTool();
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_sighting_notifications_enable');
+        $kafkaTopic = Configure::read('Plugin.Kafka_sighting_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_sighting_notifications_enable') && !empty($kafkaTopic);
+        if ($pubToZmq || $pubToKafka) {
             $user = array(
                 'org_id' => -1,
                 'Role' => array(
@@ -69,7 +71,14 @@ class Sighting extends AppModel
                 )
             );
             $sighting = $this->getSighting($this->id, $user);
-            $pubSubTool->sighting_save($sighting, 'add');
+            if ($pubToZmq) {
+                $pubSubTool = $this->getPubSubTool();
+                $pubSubTool->sighting_save($sighting, 'add');
+            }
+            if ($pubToKafka) {
+                $kafkaPubTool = $this->getKafkaPubTool();
+                $kafkaPubTool->publishJson($kafkaTopic, $sighting, 'add');
+            }
         }
         return true;
     }
@@ -77,8 +86,10 @@ class Sighting extends AppModel
     public function beforeDelete($cascade = true)
     {
         parent::beforeDelete();
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_sighting_notifications_enable')) {
-            $pubSubTool = $this->getPubSubTool();
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_sighting_notifications_enable');
+        $kafkaTopic = Configure::read('Plugin.Kafka_sighting_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_sighting_notifications_enable') && !empty($kafkaTopic);
+        if ($pubToZmq || $pubToKafka) {
             $user = array(
                 'org_id' => -1,
                 'Role' => array(
@@ -86,7 +97,14 @@ class Sighting extends AppModel
                 )
             );
             $sighting = $this->getSighting($this->id, $user);
-            $pubSubTool->sighting_save($sighting, 'delete');
+            if ($pubToZmq) {
+                $pubSubTool = $this->getPubSubTool();
+                $pubSubTool->sighting_save($sighting, 'delete');
+            }
+            if ($pubToKafka) {
+                $kafkaPubTool = $this->getKafkaPubTool();
+                $kafkaPubTool->publishJson($kafkaTopic, $sighting, 'delete');
+            }
         }
     }
 
diff --git a/app/Model/Tag.php b/app/Model/Tag.php
index d865ed5d8..5494f2889 100644
--- a/app/Model/Tag.php
+++ b/app/Model/Tag.php
@@ -90,27 +90,45 @@ class Tag extends AppModel
     public function afterSave($created, $options = array())
     {
         parent::afterSave($created, $options);
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_tag_notifications_enable')) {
-            $pubSubTool = $this->getPubSubTool();
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_tag_notifications_enable');
+        $kafkaTopic = Configure::read('Plugin.Kafka_tag_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_tag_notifications_enable') && !empty($kafkaTopic);
+        if ($pubToZmq || $pubToKafka) {
             $tag = $this->find('first', array(
                 'recursive' => -1,
                 'conditions' => array('Tag.id' => $this->id)
             ));
             $action = $created ? 'add' : 'edit';
-            $pubSubTool->tag_save($tag, $action);
+            if ($pubToZmq) {
+                $pubSubTool = $this->getPubSubTool();
+                $pubSubTool->tag_save($tag, $action);
+            }
+            if ($pubToKafka) {
+                $kafkaPubTool = $this->getKafkaPubTool();
+                $kafkaPubTool->publishJson($kafkaTopic, $tag, $action);
+            }
         }
     }
 
     public function beforeDelete($cascade = true)
     {
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_tag_notifications_enable')) {
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_tag_notifications_enable');
+        $kafkaTopic = Configure::read('Plugin.Kafka_tag_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_tag_notifications_enable') && !empty($kafkaTopic);
+        if ($pubToZmq || $pubToKafka) {
             if (!empty($this->id)) {
-                $pubSubTool = $this->getPubSubTool();
                 $tag = $this->find('first', array(
                     'recursive' => -1,
                     'conditions' => array('Tag.id' => $this->id)
                 ));
-                $pubSubTool->tag_save($tag, 'delete');
+                if ($pubToZmq) {
+                    $pubSubTool = $this->getPubSubTool();
+                    $pubSubTool->tag_save($tag, 'delete');
+                }
+                if ($pubToKafka) {
+                    $kafkaPubTool = $this->getKafkaPubTool();
+                    $kafkaPubTool->publishJson($kafkaTopic, $tag, 'delete');
+                }
             }
         }
     }
diff --git a/app/Model/Taxonomy.php b/app/Model/Taxonomy.php
index 74c735e02..ab5214a5c 100644
--- a/app/Model/Taxonomy.php
+++ b/app/Model/Taxonomy.php
@@ -362,6 +362,72 @@ class Taxonomy extends AppModel
         return true;
     }
 
+    public function hideTags($id, $tagList = false)
+    {
+        if ($tagList && !is_array($tagList)) {
+            $tagList = array($tagList);
+        }
+        $this->Tag = ClassRegistry::init('Tag');
+        App::uses('ColourPaletteTool', 'Tools');
+        $paletteTool = new ColourPaletteTool();
+        $taxonomy = $this->__getTaxonomy($id, array('full' => true));
+        $tags = $this->Tag->getTagsForNamespace($taxonomy['Taxonomy']['namespace']);
+        $colours = $paletteTool->generatePaletteFromString($taxonomy['Taxonomy']['namespace'], count($taxonomy['entries']));
+        foreach ($taxonomy['entries'] as $k => $entry) {
+            $colour = $colours[$k];
+            if (isset($entry['colour']) && !empty($entry['colour'])) {
+                $colour = $entry['colour'];
+            }
+            if ($tagList) {
+                foreach ($tagList as $tagName) {
+                    if ($tagName === $entry['tag']) {
+                        if (isset($tags[strtoupper($entry['tag'])])) {
+                            $this->Tag->quickEdit($tags[strtoupper($entry['tag'])], $tagName, $colour, 1);
+                        }
+                    }
+                }
+            } else {
+                if (isset($tags[strtoupper($entry['tag'])])) {
+                    $this->Tag->quickEdit($tags[strtoupper($entry['tag'])], $entry['tag'], $colour, 1);
+                }
+            }
+        }
+        return true;
+    }
+
+    public function unhideTags($id, $tagList = false)
+    {
+        if ($tagList && !is_array($tagList)) {
+            $tagList = array($tagList);
+        }
+        $this->Tag = ClassRegistry::init('Tag');
+        App::uses('ColourPaletteTool', 'Tools');
+        $paletteTool = new ColourPaletteTool();
+        $taxonomy = $this->__getTaxonomy($id, array('full' => true));
+        $tags = $this->Tag->getTagsForNamespace($taxonomy['Taxonomy']['namespace']);
+        $colours = $paletteTool->generatePaletteFromString($taxonomy['Taxonomy']['namespace'], count($taxonomy['entries']));
+        foreach ($taxonomy['entries'] as $k => $entry) {
+            $colour = $colours[$k];
+            if (isset($entry['colour']) && !empty($entry['colour'])) {
+                $colour = $entry['colour'];
+            }
+            if ($tagList) {
+                foreach ($tagList as $tagName) {
+                    if ($tagName === $entry['tag']) {
+                        if (isset($tags[strtoupper($entry['tag'])])) {
+                            $this->Tag->quickEdit($tags[strtoupper($entry['tag'])], $tagName, $colour, 0);
+                        }
+                    }
+                }
+            } else {
+                if (isset($tags[strtoupper($entry['tag'])])) {
+                    $this->Tag->quickEdit($tags[strtoupper($entry['tag'])], $entry['tag'], $colour, 0);
+                }
+            }
+        }
+        return true;
+    }
+
     public function listTaxonomies($options = array('full' => false, 'enabled' => false))
     {
         $recursive = -1;
diff --git a/app/Model/User.php b/app/Model/User.php
index 42917090e..8a60d8aef 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -271,8 +271,10 @@ class User extends AppModel
 
     public function afterSave($created, $options = array())
     {
-        if (Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_user_notifications_enable')) {
-            $pubSubTool = $this->getPubSubTool();
+        $pubToZmq = Configure::read('Plugin.ZeroMQ_enable') && Configure::read('Plugin.ZeroMQ_user_notifications_enable');
+        $kafkaTopic = Configure::read('Plugin.Kafka_user_notifications_topic');
+        $pubToKafka = Configure::read('Plugin.Kafka_enable') && Configure::read('Plugin.Kafka_user_notifications_enable') && !empty($kafkaTopic);
+        if ($pubToZmq || $pubToKafka) {
             if (!empty($this->data)) {
                 $user = $this->data;
                 if (!isset($user['User'])) {
@@ -298,7 +300,14 @@ class User extends AppModel
                     unset($user['User']['password']);
                     unset($user['User']['confirm_password']);
                 }
-                $pubSubTool->modified($user, 'user', $action);
+                if ($pubToZmq) {
+                    $pubSubTool = $this->getPubSubTool();
+                    $pubSubTool->modified($user, 'user', $action);
+                }
+                if ($pubToKafka) {
+                    $kafkaPubTool = $this->getKafkaPubTool();
+                    $kafkaPubTool->publishJson($kafkaTopic, $user, $action);
+                }
             }
         }
         return true;
diff --git a/app/View/Attributes/index.ctp b/app/View/Attributes/index.ctp
old mode 100644
new mode 100755
index a246c06e1..3cb070591
--- a/app/View/Attributes/index.ctp
+++ b/app/View/Attributes/index.ctp
@@ -46,7 +46,7 @@
         $headers = array(
             $this->Paginator->sort('date'),
             $this->Paginator->sort('event_id'),
-            $this->Paginator->sort('Event.orgc_id', 'Org'),
+            $this->Paginator->sort('Event.orgc_id', __('Org')),
             $this->Paginator->sort('category'),
             $this->Paginator->sort('type'),
             $this->Paginator->sort('value'),
@@ -56,18 +56,14 @@
             __('Correlate'),
             __('Related Events'),
             __('Feed hits'),
-            sprintf('<span title="%s">%s</th>', $attrDescriptions['signature']['desc'], $this->Paginator->sort('IDS')),
-            $this->Paginator->sort('distribution'),
+            sprintf('<span title="%s">%s', $attrDescriptions['signature']['desc'], $this->Paginator->sort('IDS')),
+            sprintf('<span title="%s">%s', $attrDescriptions['distribution']['desc'], $this->Paginator->sort('distribution')),
             __('Sightings'),
             __('Activity'),
             __('Actions')
         );
         foreach ($headers as $k => &$header) {
-            if ($k == (count($headers)-1)) {
-                $header = sprintf('<th title="%s">%s</th>', $attrDescriptions['signature']['desc'], $header);
-            } else {
-                $header = sprintf('<th>%s</th>', $header);
-            }
+            $header = sprintf('<th>%s</th>', $header);
         }
         $rows = array(
             sprintf('<tr>%s</tr>', implode('', $headers))
diff --git a/app/View/Attributes/search.ctp b/app/View/Attributes/search.ctp
index f9edc7594..5ab7e5d9d 100755
--- a/app/View/Attributes/search.ctp
+++ b/app/View/Attributes/search.ctp
@@ -35,7 +35,7 @@
         ?>
     </fieldset>
 <?php
-    echo $this->Form->button('Search', array('class' => 'btn btn-primary'));
+    echo $this->Form->button(__('Search'), array('class' => 'btn btn-primary'));
     echo $this->Form->end();
 ?>
 </div>
diff --git a/app/View/Elements/Events/eventIndexTable.ctp b/app/View/Elements/Events/eventIndexTable.ctp
index b5fe45ea9..8d468cfef 100644
--- a/app/View/Elements/Events/eventIndexTable.ctp
+++ b/app/View/Elements/Events/eventIndexTable.ctp
@@ -24,7 +24,7 @@
                 endif;
                 if ($isSiteAdmin):
         ?>
-            <th class="filter"><?php echo $this->Paginator->sort('owner org');?></th>
+            <th class="filter"><?php echo $this->Paginator->sort('owner org', __('Owner org'));?></th>
         <?php
                 endif;
             endif;
@@ -36,7 +36,7 @@
         <?php if (Configure::read('MISP.tagging')): ?>
             <th class="filter"><?php echo __('Tags');?></th>
         <?php endif; ?>
-        <th title="<?php echo __('Attribute Count');?>"><?php echo $this->Paginator->sort('attribute_count', '#Attr.');?></th>
+        <th title="<?php echo __('Attribute Count');?>"><?php echo $this->Paginator->sort('attribute_count', __('#Attr.'));?></th>
         <?php if (Configure::read('MISP.showCorrelationsOnIndex')):?>
             <th title="<?php echo __('Correlation Count');?>"><?php echo __('#Corr.');?></th>
         <?php endif; ?>
@@ -50,14 +50,14 @@
             <th title="<?php echo __('Post Count');?>"><?php echo __('#Posts');?></th>
         <?php endif; ?>
         <?php if ($isSiteAdmin): ?>
-        <th><?php echo $this->Paginator->sort('user_id', 'Email');?></th>
+        <th><?php echo $this->Paginator->sort('user_id', __('Email'));?></th>
         <?php endif; ?>
         <th class="filter"><?php echo $this->Paginator->sort('date', null, array('direction' => 'desc'));?></th>
         <th class="filter"><?php echo $this->Paginator->sort('info');?></th>
         <th title="<?php echo $eventDescriptions['distribution']['desc'];?>">
             <?php echo $this->Paginator->sort('distribution');?>
         </th>
-        <th class="actions">Actions</th>
+        <th class="actions"><?php echo __('Actions');?></th>
 
     </tr>
     <?php foreach ($events as $event): ?>
@@ -79,11 +79,11 @@
             <?php
             if ($event['Event']['published'] == 1) {
             ?>
-                <a href="<?php echo $baseurl."/events/view/".$event['Event']['id'] ?>" title = "<?php echo __('View');?>"><i class="black fa fa-check"></i></a>
+                <a href="<?php echo $baseurl."/events/view/".$event['Event']['id'] ?>" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"><i class="black fa fa-check"></i></a>
             <?php
             } else {
             ?>
-                <a href="<?php echo $baseurl."/events/view/".$event['Event']['id'] ?>" title = "<?php echo __('View');?>"><i class="black fa fa-times"></i></a>
+                <a href="<?php echo $baseurl."/events/view/".$event['Event']['id'] ?>" title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"><i class="black fa fa-times"></i></a>
             <?php
             }?>&nbsp;
         </td>
@@ -135,7 +135,7 @@
                         <span class="blue">
                             &nbsp;
                             <a href="<?php echo $baseurl; ?>/events/index/searchtag:<?php echo h($cluster['tag_id']); ?>"><?php echo h($cluster['value']); ?></a>
-                            <a href="<?php echo $baseurl; ?>/galaxy_clusters/view/<?php echo h($cluster['id']); ?>"><i class="black fa fa-search"></i></a>
+                            <a aria-label="<?php echo __('View cluster');?>" href="<?php echo $baseurl; ?>/galaxy_clusters/view/<?php echo h($cluster['id']); ?>"><i class="black fa fa-search"></i></a>
                         </span>
                     <?php
                     endforeach;
@@ -214,22 +214,32 @@
                 echo h($shortDist[$event['Event']['distribution']]);
             endif;
             ?>
+            <?php
+            echo sprintf(
+                '<it type="button" title="%s" class="%s" aria-hidden="true" style="font-size: x-small;" data-event-distribution="%s" data-event-distribution-name="%s" data-scope-id="%s"></it>',
+                'Toggle advanced sharing network viewer',
+                'fa fa-share-alt useCursorPointer distributionNetworkToggle',
+                h($event['Event']['distribution']),
+                $event['Event']['distribution'] == 4 ? h($event['SharingGroup']['name']) : h($shortDist[$event['Event']['distribution']]),
+                h($event['Event']['id'])
+            )
+            ?>
         </td>
         <td class="short action-links">
             <?php
                 if (0 == $event['Event']['published'] && ($isSiteAdmin || ($isAclPublish && $event['Event']['orgc_id'] == $me['org_id'])))
-                    echo $this->Form->postLink('', array('action' => 'alert', $event['Event']['id']), array('class' => 'black fa fa-upload', 'title' => __('Publish Event'), __('Are you sure this event is complete and everyone should be informed?')));
+                    echo $this->Form->postLink('', array('action' => 'alert', $event['Event']['id']), array('class' => 'black fa fa-upload', 'title' => __('Publish Event'), 'aria-label' => __('Publish Event')), __('Are you sure this event is complete and everyone should be informed?'));
                 else if (0 == $event['Event']['published']) echo __('Not published');
 
                 if ($isSiteAdmin || ($isAclModify && $event['Event']['user_id'] == $me['id']) || ($isAclModifyOrg && $event['Event']['orgc_id'] == $me['org_id'])):
             ?>
-                    <a href='<?php echo $baseurl."/events/edit/".$event['Event']['id'];?>' title = "<?php echo __('Edit');?>"><i class="black fa fa-edit"></i></a>
+                    <a href='<?php echo $baseurl."/events/edit/".$event['Event']['id'];?>' title = "<?php echo __('Edit');?>" aria-label = "<?php echo __('Edit');?>"><i class="black fa fa-edit"></i></a>
             <?php
 
-                    echo $this->Form->postLink('', array('action' => 'delete', $event['Event']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete')), __('Are you sure you want to delete # %s?', $event['Event']['id']));
+                    echo $this->Form->postLink('', array('action' => 'delete', $event['Event']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete'), 'aria-label' => __('Delete')), __('Are you sure you want to delete # %s?', $event['Event']['id']));
                 endif;
             ?>
-            <a href='<?php echo $baseurl."/events/view/".$event['Event']['id'];?>' title = "<?php echo __('View');?>"><i class="fa black fa-eye"></i></a>
+            <a href='<?php echo $baseurl."/events/view/".$event['Event']['id'];?>' title = "<?php echo __('View');?>" aria-label = "<?php echo __('View');?>"><i class="fa black fa-eye"></i></a>
         </td>
     </tr>
     <?php endforeach; ?>
@@ -239,5 +249,11 @@
         $('.select').on('change', function() {
             listCheckboxesChecked();
         });
+
+        $('.distributionNetworkToggle').each(function() {
+            $(this).distributionNetwork({
+                distributionData: <?php echo json_encode($distributionData); ?>,
+            });
+        });
     });
 </script>
diff --git a/app/View/Elements/Feeds/View/feed_overlap_tool.ctp b/app/View/Elements/Feeds/View/feed_overlap_tool.ctp
new file mode 100644
index 000000000..1574459e2
--- /dev/null
+++ b/app/View/Elements/Feeds/View/feed_overlap_tool.ctp
@@ -0,0 +1,87 @@
+<?php
+    $progress_bar = sprintf(
+        '<div class="span11 progress" style="margin-left:0px;"><div id="feed_coverage_bar" class="bar" style="width: %s;">%s</div></div><div class="span1">&nbsp;</div><br /><br />',
+        (empty($feed['Feed']['coverage_by_selected_feeds']) ? h($feed['Feed']['coverage_by_other_feeds']) : h($feed['Feed']['coverage_by_selected_feeds'])),
+        (empty($feed['Feed']['coverage_by_selected_feeds']) ? h($feed['Feed']['coverage_by_other_feeds']) : h($feed['Feed']['coverage_by_selected_feeds']))
+    );
+    echo sprintf(
+        '<h3>%s</h3><p class="bold">%s</p>%s',
+        __('Feed coverage tool'),
+        __('Coverage by currently selected sources: '),
+        $progress_bar
+    );
+    $options = array(
+        'Server' => array(
+            'left' => array(), 'right' => array()
+        ),
+        'Feed' => array(
+            'left' => array(), 'right' => array()
+        )
+    );
+    //debug($other_feeds);
+    foreach (array_keys($options) as $scope) {
+        array_multisort(array_column($other_feeds[$scope], 'matching_values'), SORT_DESC, $other_feeds[$scope]);
+    }
+    foreach ($options as $scope => $temp) {
+        if (!empty($other_feeds[$scope])) {
+            foreach ($other_feeds[$scope] as $other_feed) {
+                if (!empty($other_feed['exclude'])) {
+                    $options[$scope]['right'][$other_feed['name']] = $other_feed;
+                } else {
+                    $options[$scope]['left'][$other_feed['name']] = $other_feed;
+                }
+            }
+        }
+    }
+    foreach ($options as $scope => $data) {
+        $temp = array('left' => array(), 'right' => array());
+        foreach ($data as $side => $data_points) {
+            if (!empty($data[$side])) {
+                foreach ($data_points as $data_point) {
+                    $temp[$side][] = sprintf(
+                        '<option value=%s>%s</option>',
+                        h($data_point['id']),
+                        sprintf(
+                            '[%s%%] %s',
+                            round(100 * $data_point['matching_values'] / $feed['Feed']['cached_elements']),
+                            h($data_point['name'])
+                        )
+                    );
+                }
+            }
+        }
+        echo sprintf(
+            '<h4>%s</h4><div class="row-fluid"><div class="span5">%s</div><div class="span1" style="text-align:center;margin-top:50px;">%s</div><div class="span5">%s</div></div>',
+            h($scope),
+            sprintf(
+                '<b class="bold">%s</b><select id="%s" class="picker-%s" style="width:100%%;" size="5" multiple="multiple" data-pickername="%s">%s</select>',
+                __('Include'),
+                h($scope) . 'Left',
+                'left',
+                h($scope),
+                implode('', $temp['left'])
+            ),
+            sprintf(
+                '<button class="btn btn-inverse btn-small" onclick="generic_picker_move(%s, %s);" title="Include selected">&lt;&lt;</button>
+                <button class="btn btn-inverse btn-small" onclick="generic_picker_move(%s, %s);" title="Include selected">&gt;&gt;</button>',
+                '\'' . h($scope) . '\'',
+                "'left'",
+                '\'' . h($scope) . '\'',
+                "'right'"
+            ),
+
+            sprintf(
+                '<b class="bold">%s</b><select id="%s" class="picker-%s" style="width:100%%;" size="5" multiple="multiple" data-pickername="%s">%s</select>',
+                __('Exclude'),
+                h($scope) . 'Right',
+                'right',
+                h($scope),
+                implode('', $temp['right'])
+            )
+        );
+    }
+    echo sprintf(
+        '<button class="btn btn-primary" onClick="submit_feed_overlap_tool(%s);">%s</button>',
+        h($feed['Feed']['id']),
+        __('Check coverage')
+    );
diff --git a/app/View/Elements/Feeds/View/row_attribute.ctp b/app/View/Elements/Feeds/View/row_attribute.ctp
old mode 100644
new mode 100755
index 2b3af5dd5..7fc8003ff
--- a/app/View/Elements/Feeds/View/row_attribute.ctp
+++ b/app/View/Elements/Feeds/View/row_attribute.ctp
@@ -84,7 +84,7 @@ if ($object['value'] == 'MERGE') debug($object);
     </td>
     <td class="short">
       <div id = "Attribute_<?php echo $object['uuid']; ?>_to_ids_solid" class="inline-field-solid");">
-        <?php echo $object['to_ids'] ? 'Yes' : 'No'; ?>
+        <?php echo $object['to_ids'] ? __('Yes') : __('No'); ?>
       </div>
     </td>
   </td>
diff --git a/app/View/Elements/Feeds/eventattribute.ctp b/app/View/Elements/Feeds/eventattribute.ctp
index dc324bfa8..ee2ac3ed9 100644
--- a/app/View/Elements/Feeds/eventattribute.ctp
+++ b/app/View/Elements/Feeds/eventattribute.ctp
@@ -38,7 +38,7 @@
 <div id="attributeList" class="attributeListContainer">
     <table class="table table-striped table-condensed">
         <tr>
-            <th><?php echo $this->Paginator->sort('timestamp', 'Date');?></th>
+            <th><?php echo $this->Paginator->sort('timestamp', __('Date'));?></th>
             <th><?php echo $this->Paginator->sort('category');?></th>
             <th><?php echo $this->Paginator->sort('type');?></th>
             <th><?php echo $this->Paginator->sort('value');?></th>
diff --git a/app/View/Elements/TagCollections/index_row.ctp b/app/View/Elements/TagCollections/index_row.ctp
index b912ed570..703057529 100644
--- a/app/View/Elements/TagCollections/index_row.ctp
+++ b/app/View/Elements/TagCollections/index_row.ctp
@@ -40,13 +40,14 @@
         <td class="short action-links">
             <?php
                 if ($isSiteAdmin || $me['org_id'] == $item['TagCollection']['org_id']) {
-                    echo $this->Html->link('', array('action' => 'edit', $item['TagCollection']['id']), array('class' => 'fa fa-edit', 'title' => 'Edit'));
-                    echo $this->Form->postLink('', array('action' => 'delete', $item['TagCollection']['id']), array('class' => 'fa fa-trash', 'title' => 'Delete'), __('Are you sure you want to delete "%s"?', $item['TagCollection']['name']));
+                    echo $this->Html->link('', array('action' => 'edit', $item['TagCollection']['id']), array('class' => 'fa fa-edit', 'title' => __('Edit')));
+                    echo $this->Form->postLink('', array('action' => 'delete', $item['TagCollection']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete')), __('Are you sure you want to delete "%s"?', $item['TagCollection']['name']));
                 }
                 echo sprintf(
-                    '<a href="%s/tag_collections/view/%s.json" class="fa fa-cloud-download black" title="Download configuration" download="tag_collection_%s.json"></a>',
+                    '<a href="%s/tag_collections/view/%s.json" class="fa fa-cloud-download black" title="%s" download="tag_collection_%s.json"></a>',
                     $baseurl,
                     h($item['TagCollection']['id']),
+                    __('Download configuration'),
                     h($item['TagCollection']['id'])
                 );
 
diff --git a/app/View/Elements/ajaxTags.ctp b/app/View/Elements/ajaxTags.ctp
index 3233eb333..3b4afadef 100644
--- a/app/View/Elements/ajaxTags.ctp
+++ b/app/View/Elements/ajaxTags.ctp
@@ -1,3 +1,24 @@
+<?php
+    if (!empty($required_taxonomies)) {
+        foreach ($required_taxonomies as $k => $v) {
+            foreach ($tags as $tag) {
+                $temp_tag = explode(':', $tag['Tag']['name']);
+                if (count($temp_tag) > 1) {
+                    if ($temp_tag[0] == $v) {
+                        unset($required_taxonomies[$k]);
+                        break;
+                    }
+                }
+            }
+        }
+        if (!empty($required_taxonomies)) {
+            echo sprintf(
+                'Missing taxonomies: <span class="red bold">%s</span><br />',
+                implode(', ', $required_taxonomies)
+            );
+        }
+    }
+?>
 <span style="display:inline-block;">
     <?php
         $full = $isAclTagger && $tagAccess;
diff --git a/app/View/Elements/eventattribute.ctp b/app/View/Elements/eventattribute.ctp
index 1166521ed..c8fa1d08f 100644
--- a/app/View/Elements/eventattribute.ctp
+++ b/app/View/Elements/eventattribute.ctp
@@ -137,15 +137,15 @@
             ?>
             <th class="context hidden"><?php echo $this->Paginator->sort('id');?></th>
             <th class="context hidden">UUID</th>
-            <th><?php echo $this->Paginator->sort('timestamp', 'Date', array('direction' => 'desc'));?></th>
+            <th><?php echo $this->Paginator->sort('timestamp', __('Date'), array('direction' => 'desc'));?></th>
             <?php
                 if ($extended):
             ?>
-                    <th class="event_id"><?php echo $this->Paginator->sort('event_id', 'Event');?></th>
+                    <th class="event_id"><?php echo $this->Paginator->sort('event_id', __('Event'));?></th>
             <?php
                 endif;
             ?>
-            <th><?php echo $this->Paginator->sort('Org.name', 'Org'); ?>
+            <th><?php echo $this->Paginator->sort('Org.name', __('Org')); ?>
             <th><?php echo $this->Paginator->sort('category');?></th>
             <th><?php echo $this->Paginator->sort('type');?></th>
             <th><?php echo $this->Paginator->sort('value');?></th>
diff --git a/app/View/Elements/galaxyQuickView.ctp b/app/View/Elements/galaxyQuickView.ctp
old mode 100644
new mode 100755
index bced5958c..bafb78746
--- a/app/View/Elements/galaxyQuickView.ctp
+++ b/app/View/Elements/galaxyQuickView.ctp
@@ -93,7 +93,7 @@
 <?php
     if ($isSiteAdmin || ($mayModify && $isAclTagger)):
 ?>
-        <span class="useCursorPointer btn btn-inverse addGalaxy" data-target-type="<?php echo h($target_type);?>" data-target-id="<?php echo h($target_id); ?>" role="button" tabindex="0" aria-label="Add new cluster" style="padding: 1px 5px !important;font-size: 12px !important;">Add</span>
+        <span class="useCursorPointer btn btn-inverse addGalaxy" data-target-type="<?php echo h($target_type);?>" data-target-id="<?php echo h($target_id); ?>" role="button" tabindex="0" aria-label="Add new cluster" style="padding: 1px 5px !important;font-size: 12px !important;"><?php echo __('Add'); ?></span>
 <?php
     endif;
 ?>
diff --git a/app/View/Elements/genericElements/SideMenu/side_menu.ctp b/app/View/Elements/genericElements/SideMenu/side_menu.ctp
index 96b4902b4..1fd6ef867 100644
--- a/app/View/Elements/genericElements/SideMenu/side_menu.ctp
+++ b/app/View/Elements/genericElements/SideMenu/side_menu.ctp
@@ -17,6 +17,14 @@
                             'text' => __('Populate From Template')
                         ));
                     }
+                    if ($menuItem === 'enrichmentResults') {
+                        echo $this->element('/genericElements/SideMenu/side_menu_link', array(
+                            'element_id' => 'enrichmentResults',
+                            'url' => '#',
+                            'text' => __('Enrichment Module Result')
+                        ));
+                        echo $this->element('/genericElements/SideMenu/side_menu_divider');
+                    }
                     if ($menuItem === 'freetextResults') {
                         echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                             'element_id' => 'freetextResults',
@@ -173,6 +181,16 @@
                             'message' => __('Are you sure you wish to republish the current event to the ZMQ channel?')
                         ));
                     }
+                    if (Configure::read('Plugin.Kafka_enable') &&
+                        Configure::read('Plugin.Kafka_event_notifications_enable') &&
+                        Configure::read('Plugin.Kafka_event_notifications_topic') &&
+                        $isAclKafka) {
+                        echo $this->element('/genericElements/SideMenu/side_menu_post_link', array(
+                            'url' => '/events/pushEventToKafka/' . h($event['Event']['id']),
+                            'text' => __('Publish event to Kafka'),
+                            'message' => __('Are you sure you wish to republish the current event to the Kafka topic?')
+                        ));
+                    }
                     echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                         'element_id' => 'contact',
                         'url' => '/events/contact/' . $event['Event']['id'],
@@ -638,11 +656,6 @@
                             ));
                         }
                         if ($menuItem === 'editOrg' || $menuItem === 'viewOrg') {
-                            echo $this->element('/genericElements/SideMenu/side_menu_link', array(
-                                'element_id' => 'editOrg',
-                                'url' => '/organisations/edit/' . h($id),
-                                'text' => __('Edit Organisation')
-                            ));
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'viewOrg',
                                 'url' => '/organisations/view/' . h($id),
@@ -884,11 +897,17 @@
                         'download' => 'feed_index.json'
                     ));
                     if ($isSiteAdmin) {
-                        if ($menuItem === 'edit') {
+                        if ($menuItem === 'edit' || $menuItem === 'view') {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'edit',
+                                'url' => '/feeds/edit/' . h($feed['Feed']['id']),
                                 'text' => __('Edit Feed')
                             ));
+                            echo $this->element('/genericElements/SideMenu/side_menu_link', array(
+                                'element_id' => 'view',
+                                'url' => '/feeds/view/' . h($feed['Feed']['id']),
+                                'text' => __('View Feed')
+                            ));
                         } else if ($menuItem === 'previewIndex') {
                             echo $this->element('/genericElements/SideMenu/side_menu_link', array(
                                 'element_id' => 'previewIndex',
diff --git a/app/View/Elements/generic_picker.ctp b/app/View/Elements/generic_picker.ctp
index 51b912aad..0d762969f 100644
--- a/app/View/Elements/generic_picker.ctp
+++ b/app/View/Elements/generic_picker.ctp
@@ -105,7 +105,6 @@ function redrawChosenWithTemplate($select, $chosenContainer, eventType) {
     if (optionLength > 1000) {
         $chosenContainer.parent().find('.generic-picker-wrapper-warning-text').show(0)
     } else {
-        console.log(eventType);
         $chosenContainer.find('.generic-picker-wrapper-warning-text').hide(0)
         var $matches;
         if (eventType == 'chosen:picked' || eventType == 'change') {
@@ -284,5 +283,4 @@ function submitFunction(clicked, callback) {
         options_templates['<?php echo $select_id; ?>'] = <?php echo json_encode($option_templates); ?>;
         options_additionalData['<?php echo $select_id; ?>'] = <?php echo json_encode($options_additionalData); ?>;
     </script>
-
 </div>
diff --git a/app/View/Elements/generic_table.ctp b/app/View/Elements/generic_table.ctp
old mode 100644
new mode 100755
index c2bfd2fd9..7718dec6a
--- a/app/View/Elements/generic_table.ctp
+++ b/app/View/Elements/generic_table.ctp
@@ -5,7 +5,7 @@
         'before' => '$(".progress").show()',
         'complete' => '$(".progress").hide()',
     ));
-    $title = sprintf('<h2>%s</h2>', Inflector::humanize($controller));
+    $title = sprintf('<h2>%s</h2>', $alias);
     if (!empty($description)) {
         $description = sprintf('<p>%s</p>', Inflector::humanize($description));
     } else {
diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp
old mode 100644
new mode 100755
index 95a5016f7..c644b988a
--- a/app/View/Elements/global_menu.ctp
+++ b/app/View/Elements/global_menu.ctp
@@ -4,7 +4,7 @@
             array(
                 'type' => 'root',
                 'url' => $baseurl . '/',
-                'html' => (Configure::read('MISP.home_logo') ?  $logo = '<img src="' . $baseurl . '/img/custom/' . Configure::read('MISP.home_logo') . '" style="height:24px;">' : 'Home')
+                'html' => (Configure::read('MISP.home_logo') ?  $logo = '<img src="' . $baseurl . '/img/custom/' . Configure::read('MISP.home_logo') . '" style="height:24px;">' : __('Home'))
             ),
             array(
                 'type' => 'root',
diff --git a/app/View/Elements/healthElements/tabs.ctp b/app/View/Elements/healthElements/tabs.ctp
index 961dd818d..ddd9c778b 100644
--- a/app/View/Elements/healthElements/tabs.ctp
+++ b/app/View/Elements/healthElements/tabs.ctp
@@ -65,7 +65,7 @@
         'title' => __('Download report'),
         'html' => '<i class="fa fa-download"></i>'
     );
-    if ($active_tab && $active_tab !== 'diagnostics' && $active_tab !== 'files') {
+    if ($active_tab && !in_array($active_tab, array('diagnostics', 'files', 'workers'))) {
         $data['children'][] = array(
                 'type' => 'live_search',
                 'placeholder' => 'Filter the table(s) below'
diff --git a/app/View/Elements/serverRuleElements/pull.ctp b/app/View/Elements/serverRuleElements/pull.ctp
old mode 100644
new mode 100755
index 5f1d00c13..a38cd9ba4
--- a/app/View/Elements/serverRuleElements/pull.ctp
+++ b/app/View/Elements/serverRuleElements/pull.ctp
@@ -35,7 +35,7 @@
                 </tr>
                 <tr>
                     <td style="width:120px;">
-                        <p style="color:green;font-weight:bold;">Allowed Orgs (OR)</p>
+                        <p style="color:green;font-weight:bold;"><?php echo __('Allowed Orgs (OR)');?></p>
                         <select id="orgspullLeftValues" size="5" multiple style="width:185px;">
                         </select>
                     </td>
diff --git a/app/View/Elements/view_event_distribution_graph.ctp b/app/View/Elements/view_event_distribution_graph.ctp
index 0fbd2f64f..298ca7c33 100644
--- a/app/View/Elements/view_event_distribution_graph.ctp
+++ b/app/View/Elements/view_event_distribution_graph.ctp
@@ -8,7 +8,8 @@
         <div class="spinner"></div>
         <div class="loadingText"><?php echo __('Loading');?></div>
     </div>
-    <div id="eventdistri_graph" data-event-id="<?php echo h($event['Event']['id']); ?>" data-event-distribution="<?php echo h($event['Event']['distribution']); ?>" data-user-manipulation="<?php echo $mayModify || $isSiteAdmin ? 'true' : 'false'; ?>" data-extended="<?php echo $extended; ?>">
+
+    <div id="eventdistri_graph" data-event-id="<?php echo h($event['Event']['id']); ?>" data-event-distribution="<?php echo h($event['Event']['distribution']); ?>" data-event-distribution-text="<?php echo $event['Event']['distribution'] == 4 ? h($event['SharingGroup']['name']) : h($distributionLevels[$event['Event']['distribution']]); ?>" data-user-manipulation="<?php echo $mayModify || $isSiteAdmin ? 'true' : 'false'; ?>" data-extended="<?php echo $extended; ?>">
         <canvas id="distribution_graph_canvas"  height="290px"width="400px"></canvas>
     </div>
     <div class="popupDistriSeparator"></div>
diff --git a/app/View/Elements/view_event_graph.ctp b/app/View/Elements/view_event_graph.ctp
old mode 100644
new mode 100755
index 6df7b91e6..2578f9aac
--- a/app/View/Elements/view_event_graph.ctp
+++ b/app/View/Elements/view_event_graph.ctp
@@ -15,7 +15,7 @@
     <label id="network-import" class="btn center-in-network-header network-control-btn"><span class="useCursorPointer fa fa-exchange" style="margin-right: 3px;"></span><?php echo __('Export')?></label>
     <label id="network-history" class="btn center-in-network-header network-control-btn"><span class="useCursorPointer fa fa-history" style="margin-right: 3px;"></span><?php echo __('History')?></label>
             
-    <input type="text" id="network-typeahead" class="center-in-network-header network-typeahead flushright" data-provide="typeahead" size="20" placeholder="Search for an item">
+    <input type="text" id="network-typeahead" class="center-in-network-header network-typeahead flushright" data-provide="typeahead" size="20" placeholder="<?php echo __('Search for an item');?>">
 </div>
 
 <span class="shortcut-help btn btn-xs btn-info">?</span>
diff --git a/app/View/Events/add.ctp b/app/View/Events/add.ctp
index ec8e6e3ce..35736a722 100644
--- a/app/View/Events/add.ctp
+++ b/app/View/Events/add.ctp
@@ -33,17 +33,19 @@
         ?>
             </div>
         <?php
-        if (isset($this->request->data['Event']['threat_level_id'])) {
-            $selected = $this->request->data['Event']['threat_level_id'];
-        } else {
-            $selected = Configure::read('MISP.default_event_threat_level') ? Configure::read('MISP.default_event_threat_level') : '4';
-        }
+        echo '<div class="input clear"></div>';
+        if (empty(Configure::read('MISP.disable_threat_level'))) {
+            if (isset($this->request->data['Event']['threat_level_id'])) {
+                $selected = $this->request->data['Event']['threat_level_id'];
+            } else {
+                $selected = Configure::read('MISP.default_event_threat_level') ? Configure::read('MISP.default_event_threat_level') : '4';
+            }
 
-        echo $this->Form->input('threat_level_id', array(
-                'div' => 'input clear',
-                'label' => __('Threat Level ') . $this->element('formInfo', array('type' => 'threat_level')),
-                'selected' => $selected,
-                ));
+            echo $this->Form->input('threat_level_id', array(
+                    'label' => __('Threat Level ') . $this->element('formInfo', array('type' => 'threat_level')),
+                    'selected' => $selected,
+                    ));
+        }
         echo $this->Form->input('analysis', array(
                 'label' => __('Analysis ') . $this->element('formInfo', array('type' => 'analysis')),
                 'options' => array($analysisLevels),
diff --git a/app/View/Events/add_tag.ctp b/app/View/Events/add_tag.ctp
new file mode 100644
index 000000000..7f0d4bcbf
--- /dev/null
+++ b/app/View/Events/add_tag.ctp
@@ -0,0 +1,8 @@
+<?php
+    echo $this->Form->create($scope, array('url' => array('controller' => Inflector::tableize($scope), 'action' => 'addTag', $object_id)));
+    if ($scope === 'Attribute') {
+        echo $this->Form->input('attribute_ids', array());
+    }
+    echo $this->Form->input('tag', array('value' => 0));
+    echo $this->Form->end();
+?>
diff --git a/app/View/Events/edit.ctp b/app/View/Events/edit.ctp
index 631331481..3af6e0537 100644
--- a/app/View/Events/edit.ctp
+++ b/app/View/Events/edit.ctp
@@ -30,10 +30,12 @@ $mayPublish = ($isAclPublish && $event['Event']['orgc_id'] == $me['org_id']);
         ?>
     </div>
 <?php
-    echo $this->Form->input('threat_level_id', array(
-            'div' => 'input clear',
+    echo '<div class="input clear"></div>';
+    if (empty(Configure::read('MISP.disable_threat_level'))) {
+        echo $this->Form->input('threat_level_id', array(
             'label' => __('Threat Level ') . $this->element('formInfo', array('type' => 'threat_level'))
-    ));
+        ));
+    }
     echo $this->Form->input('analysis', array(
             'label' => __('Analysis ') . $this->element('formInfo', array('type' => 'analysis')),
             'options' => array($analysisLevels)
diff --git a/app/View/Events/export.ctp b/app/View/Events/export.ctp
old mode 100644
new mode 100755
index d04b741e0..d99f795a3
--- a/app/View/Events/export.ctp
+++ b/app/View/Events/export.ctp
@@ -95,7 +95,7 @@
                 <td style="width:150px;">
                     <?php
                         if ($k !== 'text') {
-                            echo $this->Html->link('Download', array('action' => 'downloadExport', $k), array('class' => 'btn btn-inverse toggle-left btn.active qet'));
+                            echo $this->Html->link(__('Download'), array('action' => 'downloadExport', $k), array('class' => 'btn btn-inverse toggle-left btn.active qet'));
                         ?>
                             <button class = "btn btn-inverse toggle-right btn.active qet" id=button<?php echo $i;?> onClick = "generate('<?php echo $temp; ?>')" <?php if (!$type['recommendation']) echo 'disabled';?>><?php echo __('Generate');?></button>
                         <?php
diff --git a/app/View/Events/index.ctp b/app/View/Events/index.ctp
index 5dc14f5bc..446babf54 100644
--- a/app/View/Events/index.ctp
+++ b/app/View/Events/index.ctp
@@ -91,8 +91,8 @@
                 ),
                 array(
                     'type' => 'search',
-                    'button' => 'Filter',
-                    'placeholder' => 'Enter value to search',
+                    'button' => __('Filter'),
+                    'placeholder' => __('Enter value to search'),
                     'data' => '',
                 )
             )
@@ -136,6 +136,12 @@
     });
 
 </script>
+<?php
+    echo $this->Html->script('vis');
+    echo $this->Html->css('vis');
+    echo $this->Html->css('distribution-graph');
+    echo $this->Html->script('network-distribution-graph');
+?>
 
 <input type="hidden" class="keyboardShortcutsConfig" value="/shortcuts/event_index.json" />
 <?php
diff --git a/app/View/Events/proposal_event_index.ctp b/app/View/Events/proposal_event_index.ctp
old mode 100644
new mode 100755
index c255b881f..0eed4be36
--- a/app/View/Events/proposal_event_index.ctp
+++ b/app/View/Events/proposal_event_index.ctp
@@ -27,7 +27,7 @@
             <th><?php echo $this->Paginator->sort('user_id', __('Email'));?></th>
             <?php endif; ?>
             <th class="filter">
-                <?php echo $this->Paginator->sort('date', 'Date', array('direction' => 'desc'));?>
+                <?php echo $this->Paginator->sort('date', __('Date'), array('direction' => 'desc'));?>
             </th>
             <th class="filter">
                 <?php echo $this->Paginator->sort('info');?>
diff --git a/app/View/Events/resolved_misp_format.ctp b/app/View/Events/resolved_misp_format.ctp
new file mode 100644
index 000000000..e294d20f3
--- /dev/null
+++ b/app/View/Events/resolved_misp_format.ctp
@@ -0,0 +1,136 @@
+<div class="index">
+    <h2><?php echo h($title); ?></h2>
+    <?php
+        $scope = !empty($proposals) ? 'proposals of' : '';
+        $objects_array = array();
+        if (isset($event['Attribute'])) {
+            array_push($objects_array, 'attributes');
+        }
+        if (isset($event['Object'])) {
+            array_push($objects_array, 'objects');
+        }
+        if (isset($resultArray) && !in_array('attributes', $objects_array, true) && in_array('objects', $objects_array, true)) {
+            $scope .= __('simplified attributes and');
+        }
+        $scope .= !empty($objects_array) ? join(' and ', $objects_array) : 'simplified attributes';
+    ?>
+    <p><?php echo __('Below you can see the %s that are to be created, from the results of the enrichment module.', $scope);?></p>
+    <div style="margin-bottom:20px;">
+        <?php
+            $attributeFields = array('category', 'type', 'value', 'to_ids', 'comment', 'uuid', 'distribution');
+            $defaultDistribution = 5;
+            if (!empty(Configure::read('MISP.default_attribute_distribution'))) {
+                $defaultDistribution = Configure::read('MISP.default_attribute_distribution');
+                if ($defaultDistribution == 'event') {
+                    $defaultDistribution = 5;
+                }
+            }
+            if (isset($event['Object'])) {
+        ?>
+        <table class="table table-condensed table-stripped">
+        <h3><?php echo __('Objects'); ?></h3>
+        </table>
+        <?php
+                foreach ($event['Object'] as $object) {
+        ?>
+        <table class="table table-condensed table-stripped">
+          <tbody>
+            <tr>
+              <td class="bold"><?php echo __('Name');?></td>
+              <td><?php echo h($object['name']); ?></td>
+            </tr>
+            <tr>
+              <table class="table table-condensed table-striped">
+                <thead>
+                  <th><?php echo __('Attribute');?></th>
+                  <th><?php echo __('Category');?></th>
+                  <th><?php echo __('Type');?></th>
+                  <th><?php echo __('Value');?></th>
+                  <th><?php echo __('To IDS');?></th>
+                  <th><?php echo __('Comment');?></th>
+                  <th><?php echo __('UUID');?></th>
+                  <th><?php echo __('Distribution');?></th>
+                </thead>
+                <tbody>
+                  <?php
+                    if (!empty($object['Attribute'])) {
+                        foreach ($object['Attribute'] as $attribute) {
+                            echo '<tr>';
+                            echo '<td>' . h($attribute['object_relation']) . '</td>';
+                            if (isset($attribute['distribution'])) {
+                                if ($attribute['distribution'] != 4) {
+                                    $attribute['distribution'] = $distributions[$attribute['distribution']];
+                                } else {
+                                    $attribute['distribution'] = $sgs[$attribute['sharing_group_id']];
+                                }
+                            } else {
+                                $attribute['distribution'] = $distributions[$defaultDistribution];
+                            }
+                            if (isset($attribute['to_ids'])) {
+                                $attribute['to_ids'] = ($attribute['to_ids'] ? __('Yes') : __('No'));
+                            }
+                            foreach ($attributeFields as $field) {
+                                if (isset($attribute[$field])) {
+                                    echo '<td>' . h($attribute[$field]) . '</td>';
+                                } else {
+                                    echo '<td></td>';
+                                }
+                            }
+                            echo '</tr>';
+                        }
+                    }
+                  ?>
+                </tbody>
+              </table>
+            </tr>
+          </tbody>
+        </table>
+        <?php
+                }
+            }
+            if (isset($event['Attribute'])) {
+        ?>
+        <table class="table table-condensed table-stripped">
+        <h3><?php echo __('Attributes'); ?></h3>
+          <thead>
+            <th><?php echo __('Category');?></th>
+            <th><?php echo __('Type');?></th>
+            <th><?php echo __('Value');?></th>
+            <th><?php echo __('To IDS');?></th>
+            <th><?php echo __('Comment');?></th>
+            <th><?php echo __('UUID');?></th>
+            <th><?php echo __('Distribution');?></th>
+          </thead>
+          <tbody>
+          <?php
+                foreach ($event['Attribute'] as $attribute) {
+                    echo '<tr>';
+                    if (isset($attribute['distribution'])) {
+                        $attribute['distribution'] = ($attribute['distribution'] != 4 ? $distributions[$attribute['distribution']] : $sgs[$attribute['sharing_group_id']]);
+                    } else {
+                        $attribute['distribution'] = $distributions[$defaultDistribution];
+                    }
+                    if (isset($attribute['to_ids'])) {
+                        $attribute['to_ids'] = ($attribute['to_ids'] ? __('Yes') : _('No'));
+                    }
+                    foreach ($attributeFields as $field) {
+                        if (isset($attribute[$field])) {
+                            echo '<td>' . h($attribute[$field]) . '</td>';
+                        } else {
+                            echo '<td></td>';
+                        }
+                    }
+                    echo '</tr>';
+                }
+            }
+          ?>
+          </tbody>
+        </table>
+    </div>
+</div>
+<?php
+    if (!isset($menuItem)) {
+        $menuItem = 'freetextResults';
+    }
+    echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event', 'menuItem' => $menuItem));
+?>
diff --git a/app/View/Events/view.ctp b/app/View/Events/view.ctp
index 05fcadcfb..d2945b56f 100644
--- a/app/View/Events/view.ctp
+++ b/app/View/Events/view.ctp
@@ -39,6 +39,7 @@
     echo $this->Html->css('query-builder.default');
     echo $this->Html->script('query-builder');
     echo $this->Html->css('attack_matrix');
+    echo $this->Html->script('network-distribution-graph');
 ?>
 <div class="events view">
     <?php
@@ -122,7 +123,8 @@
                     array(
                         'event' => $event,
                         'tags' => $event['EventTag'],
-                        'tagAccess' => ($isSiteAdmin || $mayModify || $me['org_id'] == $event['Event']['orgc_id'])
+                        'tagAccess' => ($isSiteAdmin || $mayModify || $me['org_id'] == $event['Event']['orgc_id']),
+                        'required_taxonomies' => $required_taxonomies
                     )
                 )
             )
@@ -131,11 +133,13 @@
             'key' => __('Date'),
             'value' => $event['Event']['date']
         );
-        $table_data[] = array(
-            'key' => __('Threat Level'),
-            'key_title' => $eventDescriptions['threat_level_id']['desc'],
-            'value' => $event['ThreatLevel']['name']
-        );
+        if (empty(Configure::read('MISP.disable_threat_level'))) {
+            $table_data[] = array(
+                'key' => __('Threat Level'),
+                'key_title' => $eventDescriptions['threat_level_id']['desc'],
+                'value' => $event['ThreatLevel']['name']
+            );
+        }
         $table_data[] = array(
             'key' => __('Analysis'),
             'key_title' => $eventDescriptions['analysis']['desc'],
@@ -145,15 +149,24 @@
             'key' => __('Distribution'),
             'value_class' => ($event['Event']['distribution'] == 0) ? 'privateRedText' : '',
             'html' => sprintf(
-                '%s %s',
+                '%s %s %s %s',
                 ($event['Event']['distribution'] == 4) ?
                     sprintf('<a href="%s%s">%s</a>', $baseurl . '/sharing_groups/view/', h($event['SharingGroup']['id']), h($event['SharingGroup']['name'])) :
                     h($distributionLevels[$event['Event']['distribution']]),
                 sprintf(
-                    '<span class="%s" data-object-id="%s" data-object-context="event" data-shown="false"></span><div style="display: none">%s</div>',
+                    '<span id="distribution_graph_bar" style="margin-left: 5px;" data-object-id="%s" data-object-context="event"></span>',
+                    h($event['Event']['id'])
+                ),
+                sprintf(
+                    '<it class="%s" data-object-id="%s" data-object-context="event" data-shown="false"></it><div style="display: none">%s</div>',
                     'useCursorPointer fa fa-info-circle distribution_graph',
                     h($event['Event']['id']),
                     $this->element('view_event_distribution_graph')
+                ),
+                sprintf(
+                    '<it type="button" id="showAdvancedSharingButton" title="%s" class="%s" aria-hidden="true" style="margin-left: 5px;"></it>',
+                    __('Toggle advanced sharing network viewer'),
+                    'fa fa-share-alt useCursorPointer'
                 )
             )
         );
@@ -165,10 +178,10 @@
             'key' => __('Published'),
             'class' => ($event['Event']['published'] == 0) ? 'background-red bold not-published' : 'published',
             'class_value' => ($event['Event']['published'] == 0) ? '' : 'green',
-            'html' => ($event['Event']['published'] == 0) ? 'No' : '<span class="green bold">Yes</span>' . ((empty($event['Event']['publish_timestamp'])) ? 'N/A' :  ' (' . date('Y-m-d H:i:s', ($event['Event']['publish_timestamp'])) . ')')
+            'html' => ($event['Event']['published'] == 0) ? __('No') : sprintf('<span class="green bold">%s</span>', __('Yes')) . ((empty($event['Event']['publish_timestamp'])) ? __('N/A') :  ' (' . date('Y-m-d H:i:s', ($event['Event']['publish_timestamp'])) . ')')
         );
         $attribute_text = $attribute_count;
-        $attribute_text .= $object_count > 1 ? sprintf(' (%s Objects)', h($object_count)) : sprintf(' (%s Object)', h($object_count));
+        $attribute_text .= $object_count > 1 ? sprintf(__(' (%s Objects)'), h($object_count)) : sprintf(__(' (%s Object)'), h($object_count));
         $table_data[] = array(
             'key' => __('#Attributes'),
             'value' => $attribute_text
@@ -245,19 +258,19 @@
             if ($isSiteAdmin || $me['org_id'] == $delegationRequest['EventDelegation']['org_id']) {
                 if ($isSiteAdmin) {
                     $message = sprintf(
-                        '%s has requested that %s take over this event.',
+                        __('%s has requested that %s take over this event.'),
                         h($delegationRequest['RequesterOrg']['name']),
                         h($delegationRequest['Org']['name'])
                     );
                 } else {
                     $message = sprintf(
-                        '%s has requested that you take over this event.',
+                        __('%s has requested that you take over this event.'),
                         h($delegationRequest['RequesterOrg']['name'])
                     );
                 }
             } else {
                 $message = sprintf(
-                    'You have requested that %s take over this event.',
+                    __('You have requested that %s take over this event.'),
                     h($delegationRequest['Org']['name'])
                 );
             }
@@ -497,6 +510,7 @@ $(document).ready(function () {
     $.get("/threads/view/<?php echo h($event['Event']['id']); ?>/true", function(data) {
         $("#discussions_div").html(data);
     });
+
 });
 
 function enable_correlation_graph() {
diff --git a/app/View/Feeds/add.ctp b/app/View/Feeds/add.ctp
old mode 100644
new mode 100755
index 5ddb1e6de..d824386c3
--- a/app/View/Feeds/add.ctp
+++ b/app/View/Feeds/add.ctp
@@ -5,11 +5,11 @@
         <p><?php echo __('Add a new MISP feed source.');?></p>
     <?php
         echo $this->Form->input('enabled', array());
-        echo $this->Form->input('caching_enabled', array());
+        echo $this->Form->input('caching_enabled', array('label' => __('Caching enabled')));
     ?>
         <div class="input clear"></div>
     <?php
-        echo $this->Form->input('lookup_visible', array());
+        echo $this->Form->input('lookup_visible', array('label' => __('Lookup visible')));
         echo $this->Form->input('name', array(
                 'div' => 'input clear',
                 'placeholder' => __('Feed name'),
@@ -17,6 +17,7 @@
         ));
         echo $this->Form->input('provider', array(
                 'div' => 'input clear',
+                'label' => __('Provider'),
                 'placeholder' => __('Name of the content provider'),
                 'class' => 'form-control span6'
         ));
@@ -39,6 +40,7 @@
         <?php
         echo $this->Form->input('url', array(
                 'div' => 'input clear',
+                'label' => __('URL'),
                 'placeholder' => __('URL of the feed'),
                 'class' => 'form-control span6'
         ));
diff --git a/app/View/Feeds/compare_feeds.ctp b/app/View/Feeds/compare_feeds.ctp
index 2e9689d53..817aaec9f 100644
--- a/app/View/Feeds/compare_feeds.ctp
+++ b/app/View/Feeds/compare_feeds.ctp
@@ -1,4 +1,5 @@
 <?php
+    $canViewFeedData = $isSiteAdmin || intval(Configure::read('MISP.host_org_id')) === $me['org_id'];
     $feedTemplate = array(
         'id', 'name', 'provider', 'url'
     );
@@ -44,7 +45,13 @@
                                         empty($item['Feed']['is_misp_server']) ? 'Feed #' : 'Server #',
                                         h($item['Feed']['id']),
                                         empty($item['Feed']['is_misp_server']) ? '' : '(<span class="blue bold">MISP</span>) ',
-                                        h($item['Feed']['name'])
+                                        (!$canViewFeedData || !empty($item['Feed']['is_misp_server'])) ? h($item['Feed']['name']) : sprintf(
+                                            '<a href="%s/feeds/view/%s" title="View feed #%s">%s</a>',
+                                            $baseurl,
+                                            h($item['Feed']['id']),
+                                            h($item['Feed']['id']),
+                                            h($item['Feed']['name'])
+                                        )
                                     );
                                 ?>
                             </div>
diff --git a/app/View/Feeds/edit.ctp b/app/View/Feeds/edit.ctp
old mode 100644
new mode 100755
index e1aee30d2..e169294f6
--- a/app/View/Feeds/edit.ctp
+++ b/app/View/Feeds/edit.ctp
@@ -65,6 +65,7 @@
             <?php
             echo $this->Form->input('url', array(
                     'div' => 'input clear',
+                    'label' => __('URL'),
                     'placeholder' => __('URL of the feed'),
                     'class' => 'form-control span6'
             ));
diff --git a/app/View/Feeds/import_feeds.ctp b/app/View/Feeds/import_feeds.ctp
old mode 100644
new mode 100755
index bdcc298d9..590959f3d
--- a/app/View/Feeds/import_feeds.ctp
+++ b/app/View/Feeds/import_feeds.ctp
@@ -7,6 +7,7 @@
     <?php
         echo $this->Form->input('json', array(
                 'div' => 'input clear',
+                'label' => __('JSON'),
                 'placeholder' => __('Feed metadata JSON'),
                 'class' => 'form-control span6',
                 'type' => 'textarea',
diff --git a/app/View/Feeds/index.ctp b/app/View/Feeds/index.ctp
index bddf79c80..4cb7f521c 100644
--- a/app/View/Feeds/index.ctp
+++ b/app/View/Feeds/index.ctp
@@ -24,6 +24,7 @@
         </ul>
     </div>
     <?php
+        $canViewFeedData = $isSiteAdmin || intval(Configure::read('MISP.host_org_id')) === $me['org_id'];
         $data = array(
             'children' => array(
                 array(
@@ -93,12 +94,12 @@
             <?php endif;?>
             <th><?php echo $this->Paginator->sort('id');?></th>
             <th title="<?php echo __('Enable pulling the feed into your MISP as events/attributes.'); ?>"><?php echo $this->Paginator->sort('enabled');?></th>
-            <th title="<?php echo __('Enable caching the feed into Redis - allowing for correlations to the feed to be shown.'); ?>"><?php echo $this->Paginator->sort('caching_enabled');?></th>
+            <th title="<?php echo __('Enable caching the feed into Redis - allowing for correlations to the feed to be shown.'); ?>"><?php echo $this->Paginator->sort('caching_enabled', __('Caching enabled'));?></th>
             <th><?php echo $this->Paginator->sort('name');?></th>
             <th><?php echo $this->Paginator->sort('source_format', __('Feed Format'));?></th>
-            <th><?php echo $this->Paginator->sort('provider');?></th>
+            <th><?php echo $this->Paginator->sort('provider', __('Provider'));?></th>
             <th><?php echo $this->Paginator->sort('input_source', __('Input'));?></th>
-            <th><?php echo $this->Paginator->sort('url');?></th>
+            <th><?php echo $this->Paginator->sort('url', __('URL'));?></th>
             <th><?php echo $this->Paginator->sort('headers');?></th>
             <th><?php echo __('Target');?></th>
             <th><?php echo __('Publish');?></th>
@@ -106,7 +107,7 @@
             <th><?php echo __('Override IDS');?></th>
             <th><?php echo $this->Paginator->sort('distribution');?></th>
             <th><?php echo $this->Paginator->sort('tag');?></th>
-            <th><?php echo $this->Paginator->sort('lookup_visible');?></th>
+            <th><?php echo $this->Paginator->sort('lookup_visible', __('Lookup visible'));?></th>
             <th class="actions"><?php echo __('Caching');?></th>
             <th class="actions"><?php echo __('Actions');?></th>
     </tr><?php
@@ -146,7 +147,24 @@ foreach ($feeds as $item):
         <?php
             endif;
         ?>
-        <td class="short"><?php echo h($item['Feed']['id']); ?>&nbsp;</td>
+        <td class="short">
+            <?php
+                if ($canViewFeedData) {
+                    echo sprintf(
+                        '<a href="%s/feeds/view/%s" title="%s">%s</a>',
+                        $baseurl,
+                        h($item['Feed']['id']),
+                        sprintf(
+                            __('View feed #%s', h($item['Feed']['id']))
+                        ),
+                        h($item['Feed']['id'])
+                    );
+                } else {
+                    echo h($item['Feed']['id']);
+                }
+
+            ?>
+        </td>
         <td class="short">
             <span class="<?php echo ($item['Feed']['enabled'] ? 'icon-ok' : 'icon-remove'); ?>"></span>
             <span
@@ -261,7 +279,7 @@ foreach ($feeds as $item):
                 }
                 if ($isSiteAdmin):
             ?>
-                <a href="<?php echo $baseurl;?>/feeds/edit/<?php echo h($item['Feed']['id']); ?>"><span class="fa fa-edit" title="Edit">&nbsp;</span></a>
+                <a href="<?php echo $baseurl;?>/feeds/edit/<?php echo h($item['Feed']['id']); ?>"><span class="fa fa-edit" title="<?php echo __('Edit');?>">&nbsp;</span></a>
                 <?php echo $this->Form->postLink('', array('action' => 'delete', h($item['Feed']['id'])), array('class' => 'fa fa-trash', 'title' => __('Delete')), __('Are you sure you want to permanently remove the feed (%s)?', h($item['Feed']['name']))); ?>
             <?php endif; ?>
             <a href="<?php echo $baseurl;?>/feeds/view/<?php echo h($item['Feed']['id']); ?>.json" title="<?php echo __('Download feed metadata as JSON');?>" download><span class="fa fa-cloud-download black"></span></a>
diff --git a/app/View/Feeds/preview_event.ctp b/app/View/Feeds/preview_event.ctp
old mode 100644
new mode 100755
index 530710392..8be11dfd7
--- a/app/View/Feeds/preview_event.ctp
+++ b/app/View/Feeds/preview_event.ctp
@@ -10,7 +10,7 @@
             <dl>
                 <dt><?php echo __('Uuid');?></dt>
                 <dd><?php echo h($event['Event']['uuid']); ?></dd>
-                <dt><?php echo Configure::read('MISP.showorgalternate') ? 'Source Organisation' : 'Org'?></dt>
+                <dt><?php echo Configure::read('MISP.showorgalternate') ? __('Source Organisation') : __('Org')?></dt>
                 <dd><?php echo h($event['Orgc']['name']); ?></dd>
                 <?php if (Configure::read('MISP.tagging')): ?>
                     <dt><?php echo __('Tags');?></dt>
@@ -22,7 +22,7 @@
                     <?php endforeach; ?>&nbsp;
                     </dd>
                 <?php endif; ?>
-                <dt>Date</dt>
+                <dt><?php echo __('Date');?></dt>
                 <dd>
                     <?php echo h($event['Event']['date']); ?>
                     &nbsp;
diff --git a/app/View/Feeds/preview_index.ctp b/app/View/Feeds/preview_index.ctp
index 7d856ab79..1705e0865 100644
--- a/app/View/Feeds/preview_index.ctp
+++ b/app/View/Feeds/preview_index.ctp
@@ -22,8 +22,8 @@
             'children' => array(
                 array(
                     'type' => 'search',
-                    'button' => 'Filter',
-                    'placeholder' => 'Enter value to search',
+                    'button' => __('Filter'),
+                    'placeholder' => __('Enter value to search'),
                     'data' => '',
                 )
             )
@@ -35,13 +35,13 @@
 
     <table class="table table-striped table-hover table-condensed">
         <tr>
-            <th class="filter"><?php echo $this->Paginator->sort('Org', 'org'); ?></th>
-            <th class="filter">Tags</th>
+            <th class="filter"><?php echo $this->Paginator->sort('Org', __('Org')); ?></th>
+            <th class="filter"><?php echo __('Tags');?></th>
             <th class="filter"><?php echo $this->Paginator->sort('date', null, array('direction' => 'desc'));?></th>
             <th class="filter" title="<?php echo $eventDescriptions['threat_level_id']['desc'];?>"><?php echo $this->Paginator->sort('threat_level_id');?></th>
             <th class="filter" title="<?php echo $eventDescriptions['analysis']['desc']; ?>"><?php echo $this->Paginator->sort('analysis');?></th>
             <th class="filter"><?php echo $this->Paginator->sort('info');?></th>
-            <th class="filter"><?php echo $this->Paginator->sort('timestamp', null, array('direction' => 'desc'));?></th>
+            <th class="filter"><?php echo $this->Paginator->sort('timestamp', __('Timestamp'), array('direction' => 'desc'));?></th>
             <th class="actions"><?php echo __('Actions');?></th>
 
         </tr>
@@ -69,7 +69,7 @@
             </td>
             <td ondblclick="document.location.href ='<?php echo $eventViewURL . h($uuid);?>'" class="short"><?php echo h($event['timestamp']); ?></td>
             <td class="short action-links">
-                <?php if ($feed['Feed']['enabled'] && $isSiteAdmin) echo $this->Form->postLink('', '/feeds/getEvent/' . $id . '/' . $uuid, array('class' => 'fa fa-arrow-circle-down', 'title' => 'Fetch the event'), __('Are you sure you want to fetch and save this event on your instance?', $this->Form->value('Feed.id'))); ?>
+                <?php if ($feed['Feed']['enabled'] && $isSiteAdmin) echo $this->Form->postLink('', '/feeds/getEvent/' . $id . '/' . $uuid, array('class' => 'fa fa-arrow-circle-down', 'title' => __('Fetch the event')), __('Are you sure you want to fetch and save this event on your instance?', $this->Form->value('Feed.id'))); ?>
                 <a href='<?php echo $eventViewURL . h($uuid);?>' class = "fa fa-eye" title = "<?php echo __('View');?>"></a>
             </td>
         </tr>
diff --git a/app/View/Feeds/view.ctp b/app/View/Feeds/view.ctp
new file mode 100644
index 000000000..a45c55fbd
--- /dev/null
+++ b/app/View/Feeds/view.ctp
@@ -0,0 +1,85 @@
+<?php
+    $table_data = array();
+    $table_data[] = array('key' => __('Id'), 'value' => $feed['Feed']['id']);
+    $table_data[] = array('key' => __('Name'), 'value' => $feed['Feed']['name']);
+    $table_data[] = array('key' => __('URL'), 'value' => $feed['Feed']['url']);
+    $table_data[] = array(
+        'key' => __('Source format'),
+        'html' => $feed['Feed']['source_format'] !== 'misp' ? h($feed['Feed']['source_format']) : sprintf(
+            '%s%s',
+            '<span class="blue bold">M</span>',
+            '<span class="black bold">ISP</span>'
+        )
+    );
+    if (!empty($feed['Tag']['id'])) {
+        $table_data[] = array(
+            'key' => __('Tags'),
+            'html' => sprintf(
+                '<span class="eventTagContainer">%s</span>',
+                $this->element(
+                    'ajaxTags',
+                    array(
+                        'event' => false,
+                        'tags' => array(array('Tag' => $feed['Tag'])),
+                        'tagAccess' => false
+                    )
+                )
+            )
+        );
+    }
+    $table_data[] = array('key' => __('Provider'), 'value' => $feed['Feed']['provider']);
+    $temp = json_decode($feed['Feed']['rules'], true);
+    if ($temp) {
+        $scopes = array('tags', 'orgs');
+        $booleanScopeColours = array('OR' => 'green', 'NOT' => 'red');
+        $ruleDataFinal = '';
+        $rule = array();
+        foreach ($temp as $scope => $ruleData) {
+            if (!empty($ruleData['OR']) || !empty($ruleData['NOT'])) {
+                $rule[] = sprintf(
+                    '<span class="bold">%s</span>:',
+                    h(ucfirst($scope))
+                );
+                foreach ($ruleData as $booleanScope => $ruleValues) {
+                    foreach ($ruleValues as $ruleValue) {
+                        $rule[] = sprintf(
+                            '&nbsp;&nbsp;<span class="%s">%s</span>',
+                            $booleanScopeColours[$booleanScope],
+                            h($ruleValue)
+                        );
+                    }
+                }
+            }
+        }
+        $table_data[] = array('key' => __('Rules'), 'html' => implode('<br />', $rule));
+    }
+    if (!empty($feed['Feed']['settings'])) {
+        $table_data[] = array('key' => __('Settings'), 'html' => sprintf(
+            '<pre class="red">%s</pre>',
+            h(json_encode(json_decode($feed['Feed']['settings']), JSON_PRETTY_PRINT)))
+        );
+    }
+    $table_data[] = array('key' => __('Enabled'), 'boolean' => $feed['Feed']['enabled']);
+    $table_data[] = array('key' => __('Caching enabled'), 'boolean' => $feed['Feed']['caching_enabled']);
+    $progress_bar = sprintf(
+        '<div class="progress" style="margin-bottom:0px;"><div class="bar" style="width: %s;">%s</div></div>',
+        h($feed['Feed']['coverage_by_other_feeds']),
+        h($feed['Feed']['coverage_by_other_feeds'])
+    );
+    $table_data[] = array(
+        'key' => __('Coverage by other feeds'),
+        'html' => $progress_bar
+    );
+
+//    $table_data[] = array('key' => __('Role'), 'html' => $this->Html->link($user['Role']['name'], array('controller' => 'roles', 'action' => 'view', $user['Role']['id'])));
+    echo sprintf(
+        '<div class="feeds view"><div class="row-fluid"><div class="span8" style="margin:0px;">%s<hr /><div class="feed_overlap_tool">%s</div></div></div></div>%s',
+        sprintf(
+            '<h2>%s</h2>%s',
+            __('Feed'),
+            $this->element('genericElements/viewMetaTable', array('table_data' => $table_data))
+        ),
+        $this->element('Feeds/View/feed_overlap_tool', array('other_feeds' => $other_feeds, 'feed' => $feed)),
+        $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'feeds', 'menuItem' => 'view'))
+    );
+?>
diff --git a/app/View/Galaxies/ajax/attach_multiple_clusters.ctp b/app/View/Galaxies/ajax/attach_multiple_clusters.ctp
new file mode 100644
index 000000000..6a3876fc2
--- /dev/null
+++ b/app/View/Galaxies/ajax/attach_multiple_clusters.ctp
@@ -0,0 +1,6 @@
+<?php
+    echo $this->Form->create('Galaxy', array('url' => array('controller' => 'galaxies', 'action' => 'attachMultipleClusters', $target_id, $target_type), 'style' => 'margin:0px;'));
+    echo $this->Form->input('target_ids', array('type' => 'text'));
+    echo $this->Form->input('attribute_ids', array('style' => 'display:none;', 'label' => false));
+    echo $this->Form->end();
+?>
diff --git a/app/View/Galaxies/ajax/cluster_choice.ctp b/app/View/Galaxies/ajax/cluster_choice.ctp
index 369b0a6d8..c0236d980 100644
--- a/app/View/Galaxies/ajax/cluster_choice.ctp
+++ b/app/View/Galaxies/ajax/cluster_choice.ctp
@@ -1,14 +1,5 @@
-<div class="hidden">
-    <?php
-        echo $this->Form->create('Galaxy', array('url' => '/galaxies/attachMultipleClusters/' . h($target_id) . '/' . h($target_type), 'style' => 'margin:0px;'));
-        echo $this->Form->input('target_ids', array('type' => 'text'));
-        echo $this->Form->input('attribute_ids', array('style' => 'display:none;', 'label' => false));
-        echo $this->Form->end();
-    ?>
-</div>
-
+<div id="temp"></div>
 <?php echo $this->element('generic_picker'); ?>
-
 <script>
     $(document).ready(function() {
         $('#GalaxyAttributeIds').attr('value', getSelected());
diff --git a/app/View/Galaxies/index.ctp b/app/View/Galaxies/index.ctp
index 187789a8e..8444b9c6a 100644
--- a/app/View/Galaxies/index.ctp
+++ b/app/View/Galaxies/index.ctp
@@ -19,12 +19,12 @@
     <table class="table table-striped table-hover table-condensed">
     <tr>
             <th><?php echo $this->Paginator->sort('id');?></th>
-            <th><?php echo $this->Paginator->sort('icon');?></th>
+            <th><?php echo $this->Paginator->sort('icon', __('Icon'));?></th>
             <th><?php echo $this->Paginator->sort('name');?></th>
             <th><?php echo $this->Paginator->sort('version');?></th>
-            <th><?php echo $this->Paginator->sort('namespace');?></th>
-            <th><?php echo $this->Paginator->sort('description');?></th>
-            <th class="actions"><?php echo $this->Paginator->sort('description');?></th>
+            <th><?php echo $this->Paginator->sort('namespace', __('Namespace'));?></th>
+            <th class="description"><?php echo $this->Paginator->sort('description');?></th>
+            <th><?php echo __('Actions');?></th>
     </tr><?php
 foreach ($list as $item):?>
     <tr>
@@ -35,7 +35,8 @@ foreach ($list as $item):?>
         <td class="short"><?php echo h($item['Galaxy']['namespace']);?>&nbsp;</td>
         <td><?php echo h($item['Galaxy']['description']);?>&nbsp;</td>
         <td class="short action-links">
-            <?php echo $this->Html->link('', array('action' => 'view', $item['Galaxy']['id']), array('class' => 'fa fa-eye', 'title' => 'View'));?>
+            <?php echo $this->Form->postLink('', array('action' => 'delete', $item['Galaxy']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete')), sprintf(__('Are you sure you want to delete the Galaxy (%s)?'), $item['Galaxy']['name'])); ?>
+            <?php echo $this->Html->link('', array('action' => 'view', $item['Galaxy']['id']), array('class' => 'fa fa-eye', 'title' => __('View')));?>
         </td>
     </tr><?php
 endforeach;?>
diff --git a/app/View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp b/app/View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp
old mode 100644
new mode 100755
index e1c984572..89408efc1
--- a/app/View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp
+++ b/app/View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp
@@ -8,7 +8,7 @@
 ?>
 <legend><?php echo __('Galaxy Cluster Deletion');?></legend>
 <div style="padding-left:5px;padding-right:5px;padding-bottom:5px;">
-<p><?php echo __('Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies.');?></p>
+<p><?php echo sprintf(__('Are you sure you want to delete Galaxy Cluster %s?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies.'), h($id));?></p>
     <table>
         <tr>
             <td style="vertical-align:top">
diff --git a/app/View/GalaxyClusters/ajax/index.ctp b/app/View/GalaxyClusters/ajax/index.ctp
index 6d90b1ee9..61152ce71 100644
--- a/app/View/GalaxyClusters/ajax/index.ctp
+++ b/app/View/GalaxyClusters/ajax/index.ctp
@@ -32,21 +32,21 @@
             </span>
         <?php endforeach; ?>
         <span class="tabMenuFixed tabMenuFixedRight tabMenuSides">
-            <?php echo $this->Html->link('', array('controller' => 'galaxies', 'action' => 'view/'. $galaxy_id), array('class' => 'icon-remove', 'title' => 'Remove filters'));?>
+            <?php echo $this->Html->link('', array('controller' => 'galaxies', 'action' => 'view/'. $galaxy_id), array('class' => 'icon-remove', 'title' => __('Remove filters')));?>
         </span>
     <?php endif;?>
     <span style="border-right:0px !important;">
         <span id="quickFilterButton" role="button" tabindex="0" aria-label="Filter value galaxie cluster" class="tabMenuFilterFieldButton useCursorPointer"
-            onClick="quickFilter('', '<?php echo $baseurl . '/galaxies/view/' . $galaxy_id; ?>');">Filter</span>
+            onClick="quickFilter('', '<?php echo $baseurl . '/galaxies/view/' . $galaxy_id; ?>');"><?php echo __('Filter');?></span>
         <input class="tabMenuFilterField" type="text" id="quickFilterField"></input>
     </span>
 </div>
 <table class="table table-striped table-hover table-condensed">
     <tr>
         <th><?php echo $this->Paginator->sort('value');?></th>
-        <th><?php echo $this->Paginator->sort('synonyms');?></th>
-        <th>Activity</th>
-        <th>#Events</th>
+        <th><?php echo $this->Paginator->sort('synonyms', __('Synonyms'));?></th>
+        <th><?php echo __('Activity');?></th>
+        <th><?php echo __('#Events');?></th>
         <th><?php echo $this->Paginator->sort('description');?></th>
         <th class="actions"><?php echo __('Actions');?></th>
     </tr>
@@ -77,8 +77,8 @@
             </td>
             <td><?php echo h($item['GalaxyCluster']['description']); ?>&nbsp;</td>
             <td class="short action-links">
-                <?php echo $this->Html->link('', array('controller' => 'galaxies', 'action' => 'viewGraph', $item['GalaxyCluster']['id']), array('class' => 'fa fa-share-alt', 'title' => 'View graph'));?>
-                <?php echo $this->Html->link('', array('action' => 'view', $item['GalaxyCluster']['id']), array('class' => 'fa fa-eye', 'title' => 'View'));?>
+                <?php echo $this->Html->link('', array('controller' => 'galaxies', 'action' => 'viewGraph', $item['GalaxyCluster']['id']), array('class' => 'fa fa-share-alt', 'title' => __('View graph')));?>
+                <?php echo $this->Html->link('', array('action' => 'view', $item['GalaxyCluster']['id']), array('class' => 'fa fa-eye', 'title' => __('View')));?>
                 <span class="fa fa-trash useCursorPointer" title="<?php echo __('Delete galaxy cluster');?>" role="button" tabindex="0" aria-label="<?php echo __('Delete galaxy cluster');?>" onClick="deleteObject('galaxy_clusters', 'delete', '<?php echo h($item['GalaxyCluster']['id']); ?>', '<?php echo h($item['GalaxyCluster']['id']); ?>');"></span>
             </td>
         </tr>
diff --git a/app/View/GalaxyClusters/cluster_matrix.ctp b/app/View/GalaxyClusters/cluster_matrix.ctp
new file mode 100644
index 000000000..7af8ad5be
--- /dev/null
+++ b/app/View/GalaxyClusters/cluster_matrix.ctp
@@ -0,0 +1,6 @@
+<button class="btn btn-inverse" onclick="$('#attackmatrix_div').toggle('blind', 300);"><span class="fa fa-eye-slash"> <?php echo __('Toggle ATT&CK Matrix'); ?></span></button>
+<div id="attackmatrix_div" style="position: relative; border: solid 1px;" class="statistics_attack_matrix hidden">
+    <?php
+        echo $this->element('view_galaxy_matrix');
+    ?>
+</div>
diff --git a/app/View/GalaxyClusters/view.ctp b/app/View/GalaxyClusters/view.ctp
old mode 100644
new mode 100755
index b59e2f696..a2d9021da
--- a/app/View/GalaxyClusters/view.ctp
+++ b/app/View/GalaxyClusters/view.ctp
@@ -8,34 +8,34 @@
                 <?php echo isset($cluster['Galax']['name']) ? h($cluster['Galaxy']['name']) : h($cluster['GalaxyCluster']['type']) . ': ' . $cluster['GalaxyCluster']['value']; ?>
             </h2>
             <dl>
-                <dt>Cluster ID</dt>
+                <dt><?php echo __('Cluster ID');?></dt>
                 <dd><?php echo h($cluster['GalaxyCluster']['id']); ?></dd>
-                <dt>Name</dt>
+                <dt><?php echo __('Name');?></dt>
                 <dd><?php echo h($cluster['GalaxyCluster']['value']); ?></dd>
-                <dt>Parent Galaxy</dt>
+                <dt><?php echo __('Parent Galaxy');?></dt>
                 <dd><?php echo $cluster['Galaxy']['name'] ? h($cluster['Galaxy']['name']) : h($cluster['Galaxy']['type']); ?></dd>
-                <dt>Description</dt>
+                <dt><?php echo __('Description');?></dt>
                 <dd><?php echo h($cluster['GalaxyCluster']['description']); ?>&nbsp;</dd>
-                <dt>UUID</dt>
+                <dt><?php echo __('UUID');?></dt>
                 <dd><?php echo h($cluster['GalaxyCluster']['uuid']); ?>&nbsp;</dd>
-                <dt>Collection UUID</dt>
+                <dt><?php echo __('Collection UUID');?></dt>
                 <dd><?php echo h($cluster['GalaxyCluster']['collection_uuid']); ?>&nbsp;</dd>
-                <dt>Source</dt>
+                <dt><?php echo __('Source');?></dt>
                 <dd><?php echo h($cluster['GalaxyCluster']['source']); ?>&nbsp;</dd>
-                <dt>Authors</dt>
+                <dt><?php echo __('Authors');?></dt>
                 <dd>
                     <?php
                         $authors = $cluster['GalaxyCluster']['authors'];
                         if (!empty($authors)) {
                             echo implode(', ', $authors);
                         } else {
-                            echo 'N/A';
+                            echo __('N/A');
                         }
                     ?>
                 </dd>
-                <dt>Connector tag</dt>
+                <dt><?php echo __('Connector tag');?></dt>
                 <dd><?php echo h($cluster['GalaxyCluster']['tag_name']); ?></dd>
-                <dt>Events</dt>
+                <dt><?php echo __('Events');?></dt>
                 <dd>
                     <?php
                         if (isset($cluster['GalaxyCluster']['tag_count'])):
@@ -50,6 +50,9 @@
             </dl>
         </div>
     </div>
+    <div class="row-fuild">
+        <div id="matrix_container"></div>
+    </div>
     <div class="row-fluid">
         <div id="elements_div" class="span8"></div>
     </div>
@@ -59,5 +62,8 @@ $(document).ready(function () {
     $.get("/galaxy_elements/index/<?php echo $cluster['GalaxyCluster']['id']; ?>", function(data) {
         $("#elements_div").html(data);
     });
+    $.get("/galaxy_clusters/viewGalaxyMatrix/<?php echo $cluster['GalaxyCluster']['id']; ?>", function(data) {
+        $("#matrix_container").html(data);
+    });
 });
 </script>
diff --git a/app/View/GalaxyElements/ajax/index.ctp b/app/View/GalaxyElements/ajax/index.ctp
old mode 100644
new mode 100755
index 4828274e3..0172c658c
--- a/app/View/GalaxyElements/ajax/index.ctp
+++ b/app/View/GalaxyElements/ajax/index.ctp
@@ -19,7 +19,7 @@
 </div>
 <table class="table table-striped table-hover table-condensed">
     <tr>
-        <th class="short"><?php echo $this->Paginator->sort('key');?></th>
+        <th class="short"><?php echo $this->Paginator->sort('key', __('Key'));?></th>
         <th><?php echo $this->Paginator->sort('value');?></th>
     </tr>
 <?php
diff --git a/app/View/Logs/admin_search.ctp b/app/View/Logs/admin_search.ctp
old mode 100644
new mode 100755
index 0f99ac5fa..76c08c885
--- a/app/View/Logs/admin_search.ctp
+++ b/app/View/Logs/admin_search.ctp
@@ -22,7 +22,7 @@
     ?>
     </fieldset>
 <?php
-echo $this->Form->button('Search', array('class' => 'btn btn-primary'));
+echo $this->Form->button(__('Search'), array('class' => 'btn btn-primary'));
 echo $this->Form->end();
 ?>
 </div>
diff --git a/app/View/News/add.ctp b/app/View/News/add.ctp
old mode 100644
new mode 100755
index f1946fbd0..4d1ea7661
--- a/app/View/News/add.ctp
+++ b/app/View/News/add.ctp
@@ -30,7 +30,7 @@
         ?>
     </fieldset>
     <?php
-        echo $this->Form->button('Submit', array('class' => 'btn btn-primary'));
+        echo $this->Form->button(__('Submit'), array('class' => 'btn btn-primary'));
         echo $this->Form->end();
     ?>
 </div>
diff --git a/app/View/News/index.ctp b/app/View/News/index.ctp
index 6e469668e..b39a3a4e0 100644
--- a/app/View/News/index.ctp
+++ b/app/View/News/index.ctp
@@ -21,7 +21,7 @@
                             ?>
                                     <br /><a href="<?php echo $baseurl; ?>/news/edit/<?php echo h($newsItem['News']['id']);?>" class="fa fa-edit" title="<?php echo __('Edit news message');?>"></a>
                             <?php
-                                    echo $this->Form->postLink('', array('action' => 'delete', $newsItem['News']['id']), array('class' => 'fa fa-trash', 'title' => 'Delete'), __('Are you sure you want to delete news item # %s?', $newsItem['News']['id']));
+                                    echo $this->Form->postLink('', array('action' => 'delete', $newsItem['News']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete')), __('Are you sure you want to delete news item # %s?', $newsItem['News']['id']));
                                 endif;
                             ?>
                         </div>
diff --git a/app/View/Organisations/admin_edit.ctp b/app/View/Organisations/admin_edit.ctp
index 0a6b7663b..1b2d23aa7 100644
--- a/app/View/Organisations/admin_edit.ctp
+++ b/app/View/Organisations/admin_edit.ctp
@@ -4,7 +4,7 @@
         <legend><?php echo __('Edit Organisation'); ?></legend>
         <p style="font-weight:bold;"><?php echo __('If the organisation should have access to this instance, make sure that the Local organisation setting is checked. <br />If you would only like to add a known external organisation for inclusion in sharing groups, uncheck the Local organisation setting.');?></p>
         <div style="float:left;width:345px;">
-            <?php echo $this->Form->input('local', array('label' => 'Local organisation'));?>
+            <?php echo $this->Form->input('local', array('label' => __('Local organisation')));?>
         </div>
         <div class="clear"></div>
         <hr />
@@ -54,7 +54,7 @@
         echo $this->Form->input('nationality', array('options' => $countries));
         echo $this->Form->input('sector', array('placeholder' => __('For example "financial".'), 'style' => 'width:300px;'));
         echo $this->Form->input('type', array('class' => 'input-xxlarge', 'label' => __('Type of organisation'), 'div' => 'clear', 'placeholder' => __('Freetext description of the org.')));
-        echo $this->Form->input('contacts', array('class' => 'input-xxlarge', 'type' => 'textarea', 'div' => 'clear', 'placeholder' => __('You can add some contact details for the organisation here, if applicable.')));
+        echo $this->Form->input('contacts', array('class' => 'input-xxlarge', 'label' => __('Contacts'), 'type' => 'textarea', 'div' => 'clear', 'placeholder' => __('You can add some contact details for the organisation here, if applicable.')));
     ?>
     </fieldset>
 <?php echo $this->Form->button(__('Submit'), array('class' => 'btn btn-primary'));
diff --git a/app/View/Organisations/ajax/merge.ctp b/app/View/Organisations/ajax/merge.ctp
index fa353f125..2b8704be9 100644
--- a/app/View/Organisations/ajax/merge.ctp
+++ b/app/View/Organisations/ajax/merge.ctp
@@ -55,7 +55,7 @@
                 <b><?php echo __('Organisation to be merged');?></b><br />
                 <b><?php echo __('ID');?>: </b><span class="red"><?php echo h($currentOrg['Organisation']['id']);?></span><br />
                 <b><?php echo __('Name');?>: </b><span class="red"><?php echo h($currentOrg['Organisation']['name']);?></span><br />
-                <b><?php echo __('Uuid');?>: </b><span class="red"><?php echo h($currentOrg['Organisation']['uuid']);?></span><br />
+                <b><?php echo __('UUID');?>: </b><span class="red"><?php echo h($currentOrg['Organisation']['uuid']);?></span><br />
                 <b><?php echo __('Type');?>: </b><span class="red"><?php echo h($currentOrg['Organisation']['local']) ? 'Local' : 'External';?></span>
             </div>
             <div class="span6 highlightedBlock">
diff --git a/app/View/Organisations/index.ctp b/app/View/Organisations/index.ctp
index 8434fe220..c723a0246 100644
--- a/app/View/Organisations/index.ctp
+++ b/app/View/Organisations/index.ctp
@@ -72,8 +72,8 @@
                 ),
                 array(
                     'type' => 'search',
-                    'button' => 'Filter',
-                    'placeholder' => 'Enter value to search',
+                    'button' => __('Filter'),
+                    'placeholder' => __('Enter value to search'),
                     'data' => '',
                 )
             )
@@ -135,7 +135,7 @@ foreach ($orgs as $org): ?>
         </td>
         <td class="short action-links">
             <?php if ($isSiteAdmin): ?>
-                <a href='/admin/organisations/edit/<?php echo $org['Organisation']['id'];?>' class = "fa fa-edit" title = "<?php echo __('');?>Edit"></a>
+                <a href='/admin/organisations/edit/<?php echo $org['Organisation']['id'];?>' class = "fa fa-edit" title = "<?php echo __('Edit');?>"</a>
                 <?php
                     echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $org['Organisation']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete')), __('Are you sure you want to delete %s?', $org['Organisation']['name']));
                 ?>
diff --git a/app/View/Organisations/view.ctp b/app/View/Organisations/view.ctp
index 4cb35837a..ca1b62edc 100644
--- a/app/View/Organisations/view.ctp
+++ b/app/View/Organisations/view.ctp
@@ -27,7 +27,7 @@
             $table_data[] = array('key' => __('Creation time'), 'value' => $org['Organisation']['date_created']);
             $table_data[] = array('key' => __('Last modified'), 'value' => $org['Organisation']['date_modified']);
         }
-        foreach (array('sector' => 'Sector', 'nationality' => 'Nationality', 'type' => 'Organisation type', 'contacts' => 'Contact information') as $k => $field) {
+        foreach (array('sector' => __('Sector'), 'nationality' => __('Nationality'), 'type' => __('Organisation type'), 'contacts' => __('Contact information')) as $k => $field) {
             if (!empty(trim($org['Organisation'][$k]))) {
                 $table_data[] = array('key' => $field, 'value' => trim(h($org['Organisation'][$k])));
             }
diff --git a/app/View/Regexp/admin_add.ctp b/app/View/Regexp/admin_add.ctp
old mode 100644
new mode 100755
index 15e31aa10..915b696e6
--- a/app/View/Regexp/admin_add.ctp
+++ b/app/View/Regexp/admin_add.ctp
@@ -14,7 +14,7 @@
     <?php
         echo $this->Form->input('all', array(
             'checked' => false,
-            'label' => 'All',
+            'label' => __('All'),
         ));
     ?>
     </div>
diff --git a/app/View/Regexp/admin_index.ctp b/app/View/Regexp/admin_index.ctp
index bf4f85da4..5f7b4b44a 100644
--- a/app/View/Regexp/admin_index.ctp
+++ b/app/View/Regexp/admin_index.ctp
@@ -19,8 +19,8 @@
     <table class="table table-striped table-hover table-condensed">
     <tr>
             <th><?php echo $this->Paginator->sort('id');?></th>
-            <th><?php echo $this->Paginator->sort('regexp');?></th>
-            <th><?php echo $this->Paginator->sort('replacement');?></th>
+            <th><?php echo $this->Paginator->sort('regexp', __('Regexp'));?></th>
+            <th><?php echo $this->Paginator->sort('replacement', __('Replacement'));?></th>
             <th><?php echo $this->Paginator->sort('type');?></th>
             <th class="actions"><?php echo __('Actions');?></th>
     </tr><?php
@@ -31,8 +31,8 @@ foreach ($list as $item):?>
         <td><?php echo h($item['Regexp']['replacement']);?>&nbsp;</td>
         <td class="short"><?php echo h($item['Regexp']['type']);?>&nbsp;</td>
         <td class="short action-links">
-            <?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Regexp']['id']), array('class' => 'fa fa-edit', 'title' => 'Edit'));?>
-            <?php echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $item['Regexp']['id']), array('class' => 'fa fa-trash', 'title' => 'Delete'), __('Are you sure you want to delete %s?', h($item['Regexp']['regexp'])));?>
+            <?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Regexp']['id']), array('class' => 'fa fa-edit', 'title' => __('Edit')));?>
+            <?php echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $item['Regexp']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete')), __('Are you sure you want to delete %s?', h($item['Regexp']['regexp'])));?>
         </td>
     </tr><?php
 endforeach;?>
diff --git a/app/View/Regexp/index.ctp b/app/View/Regexp/index.ctp
old mode 100644
new mode 100755
index 663a3e402..f697f5a15
--- a/app/View/Regexp/index.ctp
+++ b/app/View/Regexp/index.ctp
@@ -19,8 +19,8 @@
     <table class="table table-striped table-hover table-condensed">
     <tr>
             <th><?php echo $this->Paginator->sort('id');?></th>
-            <th><?php echo $this->Paginator->sort('regexp');?></th>
-            <th><?php echo $this->Paginator->sort('replacement');?></th>
+            <th><?php echo $this->Paginator->sort('regexp', __('Regexp'));?></th>
+            <th><?php echo $this->Paginator->sort('replacement', __('Replacement'));?></th>
             <th><?php echo $this->Paginator->sort('type');?></th>
     </tr><?php
 foreach ($list as $item):?>
diff --git a/app/View/RestClientHistory/index.ctp b/app/View/RestClientHistory/index.ctp
new file mode 100644
index 000000000..a753cc0cc
--- /dev/null
+++ b/app/View/RestClientHistory/index.ctp
@@ -0,0 +1,51 @@
+<?php
+    $data_container = $bookmarked ? 'rest_client_bookmarks' : 'rest_client_history';
+    foreach ($list as $k => $item) {
+        $name = '';
+        if (!empty($item['RestClientHistory']['bookmark_name'])) {
+            $name = sprintf(
+                '<span class="bold">%s</span> - ',
+                h($item['RestClientHistory']['bookmark_name'])
+            );
+        }
+        $name .= sprintf(
+            '%s - %s',
+            h($item['RestClientHistory']['http_method']),
+            sprintf(
+                '<a href="#" onClick="loadRestClientHistory(%s, %s);">%s</a>',
+                $k,
+                $data_container,
+                h($item['RestClientHistory']['url'])
+            )
+        );
+        $colour = 'green';
+        if (intval($item['RestClientHistory']['outcome']) >= 300) {
+            $colour = 'orange';
+        }
+        if (intval($item['RestClientHistory']['outcome']) >= 400) {
+            $colour = 'red';
+        }
+        echo sprintf(
+            '<div title="%s" class="useCursorPointer">(%s) %s %s</div>',
+            sprintf(
+                "URL: %s\n\nHeaders: %s\n\nBody: %s",
+                h($item['RestClientHistory']['url']),
+                h($item['RestClientHistory']['headers']),
+                h($item['RestClientHistory']['body'])
+            ),
+            sprintf(
+                '<span class="bold %s">%s</span>',
+                $colour,
+                h($item['RestClientHistory']['outcome'])
+            ),
+            $name,
+            sprintf(
+                '<a href="#" class="fa fa-trash black" title="Delete" aria-label="Delete" onclick="removeRestClientHistoryItem(\'%s\');"></a>',
+                h($item['RestClientHistory']['id'])
+            )
+        );
+    }
+?>
+<script type="text/javascript">
+    var <?php echo $data_container; ?> = <?php echo json_encode($list); ?>;
+</script>
diff --git a/app/View/Roles/admin_add.ctp b/app/View/Roles/admin_add.ctp
index 3cd0fd4fa..46b76d4fc 100644
--- a/app/View/Roles/admin_add.ctp
+++ b/app/View/Roles/admin_add.ctp
@@ -12,7 +12,7 @@
             <div class = 'input clear'></div>
         <?php
             echo $this->Form->input('name');
-            echo $this->Form->input('permission', array('type' => 'select', 'options' => $options), array('value' => '3'));
+            echo $this->Form->input('permission', array('type' => 'select', 'label' => __('Permissions'), 'options' => $options), array('value' => '3'));
         ?>
         <div class = 'input clear'></div>
         <?php
diff --git a/app/View/Roles/admin_edit.ctp b/app/View/Roles/admin_edit.ctp
index af0e04894..13b2ba062 100644
--- a/app/View/Roles/admin_edit.ctp
+++ b/app/View/Roles/admin_edit.ctp
@@ -39,7 +39,7 @@
         ?>
     </fieldset>
 <?php
-    echo $this->Form->button('Edit', array('class' => 'btn btn-primary'));
+    echo $this->Form->button(__('Edit'), array('class' => 'btn btn-primary'));
     echo $this->Form->end();
 ?>
 </div>
diff --git a/app/View/Roles/admin_index.ctp b/app/View/Roles/admin_index.ctp
index f45a93dd9..075611df8 100644
--- a/app/View/Roles/admin_index.ctp
+++ b/app/View/Roles/admin_index.ctp
@@ -21,8 +21,8 @@
             <th><?php echo $this->Paginator->sort('id');?></th>
             <th><?php echo __('Default');?></th>
             <th><?php echo $this->Paginator->sort('name');?></th>
-            <th><?php echo $this->Paginator->sort('restricted_to_site_admin');?></th>
-            <th><?php echo $this->Paginator->sort('permission', 'Permission');?></th>
+            <th><?php echo $this->Paginator->sort('restricted_to_site_admin', __('Restricted to site admins'));?></th>
+            <th><?php echo $this->Paginator->sort('permission', __('Permissions'));?></th>
             <?php
                 foreach ($permFlags as $k => $flags):
             ?>
@@ -30,8 +30,8 @@
             <?php
                 endforeach;
             ?>
-            <th><?php echo $this->Paginator->sort('memory_limit');?></th>
-            <th><?php echo $this->Paginator->sort('max_execution_time');?></th>
+            <th><?php echo $this->Paginator->sort('memory_limit', __('Memory limit'));?></th>
+            <th><?php echo $this->Paginator->sort('max_execution_time', __('Max execution time'));?></th>
             <th class="actions"><?php echo __('Actions');?></th>
     </tr><?php
 foreach ($list as $item): ?>
@@ -63,7 +63,7 @@ foreach ($list as $item): ?>
             ?>
         </td>
         <td class="short action-links">
-            <?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Role']['id']), array('class' => 'fa fa-edit', 'title' => 'Edit')); ?>
+            <?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Role']['id']), array('class' => 'fa fa-edit', 'title' => __('Edit'))); ?>
             <?php echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $item['Role']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete')), __('Are you sure you want to delete %s?', $item['Role']['name'])); ?>
         </td>
     </tr><?php
diff --git a/app/View/Roles/index.ctp b/app/View/Roles/index.ctp
index 819e5d107..4ed968e80 100644
--- a/app/View/Roles/index.ctp
+++ b/app/View/Roles/index.ctp
@@ -21,7 +21,7 @@
             <th><?php echo $this->Paginator->sort('id');?></th>
             <th><?php echo __('Default');?></th>
             <th><?php echo $this->Paginator->sort('name');?></th>
-            <th><?php echo $this->Paginator->sort('permission', 'Permission');?></th>
+            <th><?php echo $this->Paginator->sort('permission', __('Permissions'));?></th>
             <?php
                 foreach ($permFlags as $k => $flags):
             ?>
diff --git a/app/View/Servers/preview_index.ctp b/app/View/Servers/preview_index.ctp
index 93ec9500e..655159a01 100644
--- a/app/View/Servers/preview_index.ctp
+++ b/app/View/Servers/preview_index.ctp
@@ -61,8 +61,8 @@
                 ),
                 array(
                     'type' => 'search',
-                    'button' => 'Filter',
-                    'placeholder' => 'Enter value to search',
+                    'button' => __('Filter'),
+                    'placeholder' => __('Enter value to search'),
                     'data' => '',
                 )
             )
diff --git a/app/View/Servers/rest.ctp b/app/View/Servers/rest.ctp
index 39b384278..c0dbfc85f 100644
--- a/app/View/Servers/rest.ctp
+++ b/app/View/Servers/rest.ctp
@@ -14,47 +14,91 @@
         ?>
         <div id="apiInfo" style="margin-top: 15px;"></div>
     </div>
-
-    <?php echo $this->Form->create('Server');?>
+    <legend><?php echo __('REST client');?></legend>
+    <?php
+        echo sprintf(
+            '<div style="width:542px">%s%s</div>',
+            sprintf(
+                '<div class="accordion-group"><div class="accordion-heading">%s</div><div id=collapse_%s class="accordion-body collapse">%s</div></div>',
+                sprintf(
+                    '<a class="accordion-toggle" data-toggle="collapse" data-parent="accordion" href="#collapse_%s">%s</a>',
+                    'bookmark',
+                    'Bookmarked queries'
+                ),
+                'bookmark',
+                sprintf(
+                    '<div class="accordion-inner bookmarked_queries"></div>'
+                )
+            ),
+            sprintf(
+                '<div class="accordion-group"><div class="accordion-heading">%s</div><div id=collapse_%s class="accordion-body collapse">%s</div></div>',
+                sprintf(
+                    '<a class="accordion-toggle" data-toggle="collapse" data-parent="accordion" href="#collapse_%s">%s</a>',
+                    'history',
+                    'Query History'
+                ),
+                'history',
+                sprintf(
+                    '<div class="accordion-inner history_queries"></div>'
+                )
+            )
+        );
+        echo $this->Form->create('Server');
+    ?>
     <fieldset>
-        <legend><?php echo __('REST client');?></legend>
         <?php
             echo $this->Form->input('method', array(
-                'label' => __('Relative path to query'),
+                'label' => __('HTTP method to use'),
                 'options' => array(
                     'GET' => 'GET',
                     'POST' => 'POST'
                 )
             ));
         ?>
-        <div class="input clear" style="width:100%;">
+        <div class="input clear" style="width:100%;" /draggable="">
         <?php
             echo $this->Form->input('url', array(
                 'label' => __('Relative path to query'),
                 'class' => 'input-xxlarge'
             ));
         ?>
-        <div class="input clear" style="width:100%;">
+        <div class="input clear" style="width:100%;" />
         <?php
             echo $this->Form->input('use_full_path', array(
-              'label' => 'Use full path - disclose my apikey',
-                    'type' => 'checkbox'
-                ));
+                'label' => __('Use full path - disclose my apikey'),
+                'type' => 'checkbox'
+            ));
+            echo $this->Form->input('bookmark', array(
+                'label' => __('Bookmark query'),
+                'type' => 'checkbox',
+                'onChange' => 'toggleRestClientBookmark();'
+            ));
         ?>
-        <div class="input clear" style="width:100%;">
+        <div class="input clear" style="width:100%;" />
+            <div id="bookmark-name" style="display:none;">
+                <?php
+                    echo $this->Form->input('name', array(
+                        'label' => __('Bookmark name'),
+                        'class' => 'input-xxlarge',
+                    ));
+                ?>
+            </div>
+        <div class="input clear" style="width:100%;" />
         <?php
             echo $this->Form->input('show_result', array(
+                'label' => __('Show result'),
                 'type' => 'checkbox'
             ));
             echo $this->Form->input('skip_ssl_validation', array(
               'type' => 'checkbox',
-              'label' => 'Skip SSL validation'
+              'label' => __('Skip SSL validation')
             ));
         ?>
         <div class="input clear" style="width:100%;">
         <?php
             echo $this->Form->input('header', array(
                     'type' => 'textarea',
+                    'label' => __('HTTP headers'),
                     'div' => 'input clear',
                     'class' => 'input-xxlarge',
                     'default' => !empty($this->request->data['Server']['header']) ? $this->request->data['Server']['header'] : $header
@@ -67,8 +111,8 @@
                     <h3 id="selected-path" >---</h3>
                 </div>
                 <div id="querybuilder"></div>
-                    <button id="btn-inject" type="button" class="btn btn-success"><i class="fa fa-mail-forward" style="transform: scaleX(-1);"></i> Inject </button>
-                    <button id="btn-apply" type="button" class="btn btn-default"><i class="fa fa-list-alt"></i> Show rules </button>
+                    <button id="btn-inject" type="button" class="btn btn-success"><i class="fa fa-mail-forward" style="transform: scaleX(-1);"></i><?php echo __(' Inject')?></button>
+                    <button id="btn-apply" type="button" class="btn btn-default"><i class="fa fa-list-alt"></i><?php echo __(' Show rules')?> </button>
             </div>
         </div>
 
@@ -77,6 +121,7 @@
         <?php
             echo $this->Form->input('body', array(
                     'type' => 'textarea',
+                    'label' => __('HTTP body'),
                     'div' => 'input clear',
                     'class' => 'input-xxlarge'
             ));
@@ -84,7 +129,7 @@
         <div class="input clear" style="width:100%;">
             <div id="template_description" style="display:none;width:700px;" class="alert alert-error">Fill out the JSON template above, make sure to replace all placeholder values. Fields with the value "optional" can be removed.</div>
                 <?php
-                    echo $this->Form->submit('Run query', array('class' => 'btn btn-primary'));
+                    echo $this->Form->submit(__('Run query'), array('class' => 'btn btn-primary'));
                     echo $this->Form->end();
                 ?>
                 <hr />
@@ -142,7 +187,6 @@
 
 <?php
     echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'event-collection', 'menuItem' => 'rest'));
-
     echo $this->Html->script('doT');
     echo $this->Html->script('extendext');
     echo $this->Html->script('moment-with-locales');
@@ -152,7 +196,12 @@
     echo $this->Html->script('restClient');
 ?>
 
-<script>
-    allValidApis = <?php echo json_encode($allValidApis); ?>;
-    fieldsConstraint = <?php echo json_encode($allValidApisFieldsContraint); ?>;
+<script type="text/javascript">
+    var allValidApis = <?php echo json_encode($allValidApis); ?>;
+    var fieldsConstraint = <?php echo json_encode($allValidApisFieldsContraint); ?>;
+    $(document).ready(function() {
+        populate_rest_history('history');
+        populate_rest_history('bookmark');
+        toggleRestClientBookmark();
+    });
 </script>
diff --git a/app/View/TagCollections/import.ctp b/app/View/TagCollections/import.ctp
old mode 100644
new mode 100755
index 7339682a3..19bfcb568
--- a/app/View/TagCollections/import.ctp
+++ b/app/View/TagCollections/import.ctp
@@ -7,6 +7,7 @@
     <?php
         echo $this->Form->input('json', array(
                 'div' => 'input clear',
+                'label' => __('JSON'),
                 'placeholder' => __('Tag collection JSON'),
                 'class' => 'form-control span6',
                 'type' => 'textarea',
diff --git a/app/View/TagCollections/index.ctp b/app/View/TagCollections/index.ctp
old mode 100644
new mode 100755
index d82567336..5253edd6e
--- a/app/View/TagCollections/index.ctp
+++ b/app/View/TagCollections/index.ctp
@@ -1,18 +1,19 @@
 <?php
     echo $this->element('generic_table', array(
         'items' => $list,
+        'alias' => __('Tag Collections'),
         'controller' => 'tag_collections',
         'headers' => array(
             'id' => array('sort' => 1),
-            'uuid' => array('sort' => 1),
+            'uuid' => array('sort' => 1, 'alias' => __('UUID')),
             'name' => array('sort' => 1),
-            'tags' => array(),
-            'galaxies' => array(),
-            'all_orgs' => array(),
-            'org_id' => array('alias' => 'Organisation'),
-            'user_id' => array('alias' => 'User'),
-            'description' => array(),
-            'Actions' => array()
+            'tags' => array('alias' => __('Tags')),
+            'galaxies' => array('alias' => __('Galaxies')),
+            'all_orgs' => array('alias' => __('All orgs')),
+            'org_id' => array('alias' => __('Organisation')),
+            'user_id' => array('alias' => __('User')),
+            'description' => array('alias' => __('Description')),
+            'Actions' => array('alias' => __('Actions'))
         ),
         'row_path' => 'TagCollections/index_row'
     ));
diff --git a/app/View/Tags/ajax/select_tag.ctp b/app/View/Tags/ajax/select_tag.ctp
index 898962e57..e325b09d5 100644
--- a/app/View/Tags/ajax/select_tag.ctp
+++ b/app/View/Tags/ajax/select_tag.ctp
@@ -1,16 +1,2 @@
-<div style="display:none;">
-    <?php
-        if ($scope === 'attribute') {
-            echo $this->Form->create('Attribute', array('url' => '/attributes/addTag/' . $object_id, 'style' => 'margin:0px;'));
-        } elseif ($scope === 'event') {
-            echo $this->Form->create('Event', array('url' => '/events/addTag/' . $object_id, 'style' => 'margin:0px;'));
-        } elseif ($scope === 'tag_collection') {
-            echo $this->Form->create('TagCollection', array('url' => '/tag_collections/addTag/' . $object_id, 'style' => 'margin:0px;'));
-        }
-        echo $this->Form->input('attribute_ids', array('style' => 'display:none;', 'label' => false));
-        echo $this->Form->input('tag', array('value' => 0));
-        echo $this->Form->end();
-    ?>
-</div>
-
+<div id="temp"></div>
 <?php echo $this->element('generic_picker'); ?>
diff --git a/app/View/Tags/edit.ctp b/app/View/Tags/edit.ctp
old mode 100644
new mode 100755
index 782096566..a56732a4d
--- a/app/View/Tags/edit.ctp
+++ b/app/View/Tags/edit.ctp
@@ -1,7 +1,7 @@
 <div class="tag form">
 <?php echo $this->Form->create('Tag');?>
     <fieldset>
-        <legend><?php echo __('Add Tag');?></legend>
+        <legend><?php echo __('Edit Tag');?></legend>
     <?php
         echo $this->Form->input('name', array(
         ));
diff --git a/app/View/Tags/index.ctp b/app/View/Tags/index.ctp
index 5efd16e6a..231c6816f 100644
--- a/app/View/Tags/index.ctp
+++ b/app/View/Tags/index.ctp
@@ -60,8 +60,8 @@
     <table class="table table-striped table-hover table-condensed">
     <tr>
             <th><?php echo $this->Paginator->sort('id');?></th>
-            <th><?php echo $this->Paginator->sort('exportable');?></th>
-            <th><?php echo $this->Paginator->sort('hide_tag', 'Hidden');?></th>
+            <th><?php echo $this->Paginator->sort('exportable', __('Exportable'));?></th>
+            <th><?php echo $this->Paginator->sort('hide_tag', __('Hidden'));?></th>
             <th><?php echo $this->Paginator->sort('name');?></th>
             <th><?php echo __('Restricted to org');?></th>
             <?php if ($isSiteAdmin): ?>
@@ -120,8 +120,8 @@ foreach ($list as $k => $item): ?>
         </td>
         <?php if ($isSiteAdmin): ?>
         <td class="short action-links">
-            <?php echo $this->Html->link('', array('controller' => 'tags', 'action' => 'viewGraph', $item['Tag']['id']), array('class' => 'fa fa-share-alt', 'title' => 'View graph'));?>
-            <?php echo $this->Html->link('', array('action' => 'edit', $item['Tag']['id']), array('class' => 'fa fa-edit', 'title' => 'Edit'));?>
+            <?php echo $this->Html->link('', array('controller' => 'tags', 'action' => 'viewGraph', $item['Tag']['id']), array('class' => 'fa fa-share-alt', 'title' => __('View graph')));?>
+            <?php echo $this->Html->link('', array('action' => 'edit', $item['Tag']['id']), array('class' => 'fa fa-edit', 'title' => __('Edit')));?>
             <?php echo $this->Form->postLink('', array('action' => 'delete', $item['Tag']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete')), __('Are you sure you want to delete "%s"?', $item['Tag']['name']));?>
         </td>
         <?php endif; ?>
diff --git a/app/View/Tasks/index.ctp b/app/View/Tasks/index.ctp
index 82861fbf7..456518ef0 100644
--- a/app/View/Tasks/index.ctp
+++ b/app/View/Tasks/index.ctp
@@ -3,7 +3,7 @@
         echo '<h2>' . __('Scheduled Tasks') . '</h2>';
         echo '<p>' . __('Here you can schedule pre-defined tasks that will be executed every x hours. You can alter the date and time of the next scheduled execution and the frequency at which it will be repeated (expressed in hours). If you set the frequency to 0 then the task will not be repeated. To change and of the above mentioned settings just click on the appropriate field and hit update all when you are done editing the scheduled tasks.') . '</p>';
         echo '<p class="red bold">' . __('Warning: Scheduled tasks come with a lot of caveats and little in regards of customisations / granularity. You can instead simply create cron jobs out of the console commands as described here: ');
-        echo '<a href="' . $baseurl . '/events/automation/#console_tasks">' . __('Automating certain console tasks') . '</a>' . '</p>';
+        echo '<a href="' . $baseurl . '/events/automation/#console_admin_tasks">' . __('Automating certain console tasks') . '</a>' . '</p>';
     ?>
     <div class="pagination">
         <ul>
diff --git a/app/View/Taxonomies/ajax/taxonomy_mass_hide.ctp b/app/View/Taxonomies/ajax/taxonomy_mass_hide.ctp
new file mode 100644
index 000000000..692f3a0a4
--- /dev/null
+++ b/app/View/Taxonomies/ajax/taxonomy_mass_hide.ctp
@@ -0,0 +1,37 @@
+<div class="confirmation">
+<?php
+    echo $this->Form->create('Taxonomy', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/taxonomies/hideTag'));
+?>
+<div class="hidden">
+<?php
+    echo $this->Form->input('nameList', array('value' => '{}'));
+?>
+    </div>
+<?php
+    echo $this->Form->input('taxonomy_id', array('type' => 'hidden', 'value' => $id));
+?>
+<legend><?php echo __('Hide Tags');?></legend>
+<div style="padding-left:5px;padding-right:5px;padding-bottom:5px;">
+<p><?php echo __('Are you sure you want to hide all selected tags?');?></p>
+    <table>
+        <tr>
+            <td style="vertical-align:top">
+                <span id="PromptYesButton" role="button" tabindex="0" aria-label="<?php echo __('Hide all selected tags');?>" title="<?php echo __('Hide all selected tags');?>" class="btn btn-primary" onClick="submitMassTaxonomyTag();"><?php echo __('Yes');?></span>
+            </td>
+            <td style="width:540px;">
+            </td>
+            <td style="vertical-align:top;">
+                <span role="button" tabindex="0" aria-label="<?php echo __('Cancel');?>" title="<?php echo __('Cancel');?>" class="btn btn-inverse" id="PromptNoButton" onClick="cancelPrompt();"><?php echo __('No');?></span>
+            </td>
+        </tr>
+    </table>
+</div>
+<script type="text/javascript">
+    $(document).ready(function(){
+        getSelectedTaxonomyNames();
+    });
+</script>
+<?php
+    echo $this->Form->end();
+?>
+</div>
\ No newline at end of file
diff --git a/app/View/Taxonomies/ajax/taxonomy_mass_unhide.ctp b/app/View/Taxonomies/ajax/taxonomy_mass_unhide.ctp
new file mode 100644
index 000000000..5391b7c98
--- /dev/null
+++ b/app/View/Taxonomies/ajax/taxonomy_mass_unhide.ctp
@@ -0,0 +1,37 @@
+<div class="confirmation">
+<?php
+    echo $this->Form->create('Taxonomy', array('style' => 'margin:0px;', 'id' => 'PromptForm', 'url' => '/taxonomies/unhideTag'));
+?>
+<div class="hidden">
+<?php
+    echo $this->Form->input('nameList', array('value' => '{}'));
+?>
+    </div>
+<?php
+    echo $this->Form->input('taxonomy_id', array('type' => 'hidden', 'value' => $id));
+?>
+<legend><?php echo __('Unhide Tags');?></legend>
+<div style="padding-left:5px;padding-right:5px;padding-bottom:5px;">
+<p><?php echo __('Are you sure you want to unhide all selected tags?');?></p>
+    <table>
+        <tr>
+            <td style="vertical-align:top">
+                <span id="PromptYesButton" role="button" tabindex="0" aria-label="<?php echo __('Unhide all selected tags');?>" title="<?php echo __('Unhide all selected tags');?>" class="btn btn-primary" onClick="submitMassTaxonomyTag();"><?php echo __('Yes');?></span>
+            </td>
+            <td style="width:540px;">
+            </td>
+            <td style="vertical-align:top;">
+                <span role="button" tabindex="0" aria-label="<?php echo __('Cancel');?>" title="<?php echo __('Cancel');?>" class="btn btn-inverse" id="PromptNoButton" onClick="cancelPrompt();"><?php echo __('No');?></span>
+            </td>
+        </tr>
+    </table>
+</div>
+<script type="text/javascript">
+    $(document).ready(function(){
+        getSelectedTaxonomyNames();
+    });
+</script>
+<?php
+    echo $this->Form->end();
+?>
+</div>
\ No newline at end of file
diff --git a/app/View/Taxonomies/ajax/toggle_required.ctp b/app/View/Taxonomies/ajax/toggle_required.ctp
new file mode 100644
index 000000000..c97b2bc0a
--- /dev/null
+++ b/app/View/Taxonomies/ajax/toggle_required.ctp
@@ -0,0 +1,15 @@
+<?php
+    echo $this->Form->create('Taxonomy', array(
+        'id' => 'RequiredCheckboxForm' . h($id),
+        'label' => false,
+        'style' => 'display:none;',
+        'url' => '/taxonomies/toggleRequired/' . $id
+    ));
+    echo $this->Form->checkbox('required', array(
+        'checked' => $required,
+        'label' => false,
+        'disabled' => !$isSiteAdmin,
+        'class' => 'required-toggle'
+    ));
+    echo $this->Form->end();
+?>
diff --git a/app/View/Taxonomies/index.ctp b/app/View/Taxonomies/index.ctp
index fb12eff5b..a1fad5fcf 100644
--- a/app/View/Taxonomies/index.ctp
+++ b/app/View/Taxonomies/index.ctp
@@ -23,6 +23,7 @@
             <th><?php echo $this->Paginator->sort('description');?></th>
             <th><?php echo $this->Paginator->sort('version');?></th>
             <th><?php echo $this->Paginator->sort('enabled');?></th>
+            <th><?php echo $this->Paginator->sort('required', __('Required'));?></th>
             <th><?php echo __('Active Tags');?></th>
             <th class="actions"><?php echo __('Actions');?></th>
     </tr><?php
@@ -33,6 +34,7 @@ foreach ($taxonomies as $item): ?>
         <td ondblclick="document.location.href ='<?php echo $baseurl."/taxonomies/view/".h($item['Taxonomy']['id']);?>'"><?php echo h($item['Taxonomy']['description']); ?>&nbsp;</td>
         <td class="short" ondblclick="document.location.href ='<?php echo $baseurl."/taxonomies/view/".h($item['Taxonomy']['id']);?>'"><?php echo h($item['Taxonomy']['version']); ?>&nbsp;</td>
         <td class="short" ondblclick="document.location.href ='<?php echo $baseurl."/taxonomies/view/".h($item['Taxonomy']['id']);?>'"><?php echo $item['Taxonomy']['enabled'] ? '<span class="green">Yes</span>' : '<span class="red">No</span>'; ?>&nbsp;</td>
+        <td class="short"><input type="checkbox" data-taxonomy-id="<?php echo h($item['Taxonomy']['id']); ?>" class="required-toggle" <?php echo $item['Taxonomy']['required'] ? 'checked' : '';?> id="TaxonomyRequired"></td>
         <td class="shortish"><span><span class="bold"><?php echo h($item['current_count']);?></span> / <?php echo h($item['total_count']);?> <?php if ($item['current_count'] != $item['total_count'] && $isSiteAdmin && $item['Taxonomy']['enabled']) echo '(' . $this->Form->postLink(__('enable all'), array('action' => 'addTag', h($item['Taxonomy']['id'])), array('title' => __('Enable all tags')), (__('Are you sure you want to enable every tag associated to this taxonomy?'))) . ')'; ?></span></td>
         <td class="short action-links">
             <?php
@@ -70,3 +72,10 @@ endforeach; ?>
 <?php
     echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'taxonomies', 'menuItem' => 'index'));
 ?>
+<script type="text/javascript">
+    $(document).ready(function() {
+        $('.required-toggle').click(function(e) {
+            changeTaxonomyRequiredState(this);
+        });
+    });
+</script>
diff --git a/app/View/Taxonomies/view.ctp b/app/View/Taxonomies/view.ctp
index 276a29af7..c969fd944 100644
--- a/app/View/Taxonomies/view.ctp
+++ b/app/View/Taxonomies/view.ctp
@@ -26,9 +26,9 @@
             <?php echo $taxonomy['enabled'] ? '<span class="green">'. __('Yes') . '</span>&nbsp;&nbsp;' : '<span class="red">' . __('No') . '</span>&nbsp;&nbsp;';
                 if ($isSiteAdmin) {
                     if ($taxonomy['enabled']) {
-                        echo $this->Form->postLink('(disable)', array('action' => 'disable', h($taxonomy['id'])), array('title' => __('Disable')), (__('Are you sure you want to disable this taxonomy library?')));
+                        echo $this->Form->postLink(__('(disable)'), array('action' => 'disable', h($taxonomy['id'])), array('title' => __('Disable')), (__('Are you sure you want to disable this taxonomy library?')));
                     } else {
-                        echo $this->Form->postLink('(enable)', array('action' => 'enable', h($taxonomy['id'])), array('title' => __('Enable')), (__('Are you sure you want to enable this taxonomy library?')));
+                        echo $this->Form->postLink(__('(enable)'), array('action' => 'enable', h($taxonomy['id'])), array('title' => __('Enable')), (__('Are you sure you want to enable this taxonomy library?')));
                     }
                 }
             ?>
@@ -64,18 +64,28 @@
             <div style="float:right !important;overflow:hidden;border:0px;padding:0px;padding-right:200px;">
                     <input type="text" id="quickFilterField" class="tabMenuFilterField taxFilter" value="<?php echo h($filter);?>" /><span id="quickFilterButton" class="useCursorPointer taxFilterButton" onClick='quickFilterTaxonomy("<?php echo h($taxonomy['id']);?>");'><?php echo __('Filter');?></span>
             </div>
+            <span class="tabMenuFixed tabMenuFixedLeft tabMenuSides useCursorPointer  noPrint mass-select" style="margin-left:50px;">
+                <span id="multi-edit-button" title="<?php echo __('Hide selected tags');?>" role="button" tabindex="1" aria-label="<?php echo __('Hide selected tags');?>" class="useCursorPointer" onClick="hideSelectedTags(<?php echo $taxonomy['id']; ?>);">
+                    <?php echo __('Hide selected tags');?>
+                </span>
+            </span>
+            <span class="tabMenuFixed tabMenuFixedLeft tabMenuSides useCursorPointer  noPrint mass-select">
+                <span id="multi-edit-button" title="<?php echo __('Unhide selected tags');?>" role="button" tabindex="2" aria-label="<?php echo __('Unhide selected tags');?>" class="useCursorPointer" onClick="unhideSelectedTags(<?php echo $taxonomy['id']; ?>);">
+                    <?php echo __('Unhide selected tags');?>
+                </span>
+            </span>
         </div>
         <table class="table table-striped table-hover table-condensed">
             <tr>
                 <?php if ($isAclTagger && !empty($entries)): ?>
                     <th><input class="select_all" type="checkbox" onClick="toggleAllTaxonomyCheckboxes();" /></th>
                 <?php endif;?>
-                    <th><?php echo $this->Paginator->sort('tag');?></th>
-                    <th><?php echo $this->Paginator->sort('expanded');?></th>
-                    <th><?php echo $this->Paginator->sort('numerical_value');?></th>
+                    <th><?php echo $this->Paginator->sort('tag', __('Tag'));?></th>
+                    <th><?php echo $this->Paginator->sort('expanded', __('Expanded'));?></th>
+                    <th><?php echo $this->Paginator->sort('numerical_value', __('Numerical value'));?></th>
                     <th><?php echo $this->Paginator->sort('events');?></th>
                     <th><?php echo $this->Paginator->sort('attributes');?></th>
-                    <th><?php echo $this->Paginator->sort('tag');?></th>
+                    <th><?php echo $this->Paginator->sort('tag', __('Tags'));?></th>
                     <th><?php echo __('Action');?></th>
             </tr><?php
             foreach ($entries as $k => $item): ?>
@@ -92,7 +102,7 @@
                 <?php
                     if ($item['existing_tag']) {
                 ?>
-                    <a href='<?php echo $baseurl."/events/index/searchtag:". h($item['existing_tag']['Tag']['id']);?>'><?php echo count($item['existing_tag']['EventTag']);?></a>
+                    <a href='<?php echo $baseurl."/events/index/searchtag:". h($item['existing_tag']['Tag']['id']);?>'><?php echo h($item['events']);?></a>
                 <?php
                     } else {
                         echo __('N/A');
@@ -103,7 +113,7 @@
                 <?php
                     if ($item['existing_tag']):
                 ?>
-                        <a href='<?php echo $baseurl."/attributes/search/tags:". h($item['existing_tag']['Tag']['id']);?>'><?php echo count($item['existing_tag']['AttributeTag']);?></a>
+                        <a href='<?php echo $baseurl."/attributes/search/tags:". h($item['existing_tag']['Tag']['id']);?>'><?php echo h($item['attributes']);?></a>
                 <?php
                     else:
                         echo __('N/A');
diff --git a/app/View/Users/admin_edit.ctp b/app/View/Users/admin_edit.ctp
index b2bcc0e3a..a70648830 100644
--- a/app/View/Users/admin_edit.ctp
+++ b/app/View/Users/admin_edit.ctp
@@ -34,8 +34,8 @@
         <div id="PasswordDiv">
             <div class="clear"></div>
             <?php
-                $passwordPopover = '<span class=\"blue bold\">Length</span>: ' . h($length) . '<br />';
-                $passwordPopover .= '<span class=\"blue bold\">Complexity</span>: ' . h($complexity);
+                $passwordPopover = '<span class=\"blue bold\">' . __('Length') .'</span>: ' . h($length) . '<br />';
+                $passwordPopover .= '<span class=\"blue bold\">' . __('Complexity') .'</span>: ' . h($complexity);
                 echo $this->Form->input('password', array(
                     'label' => __('Password') . ' <span id = "PasswordPopover" class="icon-info-sign" ></span>'
                 ));
@@ -51,8 +51,8 @@
                     'label' => __('Organisation'),
             ));
         }
-        echo $this->Form->input('role_id', array('label' => 'Role'));   // TODO ACL, User edit role_id.
-        echo $this->Form->input('authkey', array('disabled' => 'disabled', 'label' => 'Authentication key', 'div' => 'input clear'));
+        echo $this->Form->input('role_id', array('label' => __('Role')));   // TODO ACL, User edit role_id.
+        echo $this->Form->input('authkey', array('disabled' => 'disabled', 'div' => 'input clear'));
         echo $this->Form->input('nids_sid');
     ?>
         <div id = "syncServers" class="hidden">
diff --git a/app/View/Users/admin_index.ctp b/app/View/Users/admin_index.ctp
old mode 100644
new mode 100755
index 674b593fd..c889161dc
--- a/app/View/Users/admin_index.ctp
+++ b/app/View/Users/admin_index.ctp
@@ -58,8 +58,8 @@
                 ),
                 array(
                     'type' => 'search',
-                    'button' => 'Filter',
-                    'placeholder' => 'Enter value to search',
+                    'button' => __('Filter'),
+                    'placeholder' => __('Enter value to search'),
                     'data' => '',
                 )
             )
diff --git a/app/View/Users/admin_view.ctp b/app/View/Users/admin_view.ctp
old mode 100644
new mode 100755
index c8fe52f6f..ffcbe761a
--- a/app/View/Users/admin_view.ctp
+++ b/app/View/Users/admin_view.ctp
@@ -34,7 +34,7 @@ $buttonModifyStatus = $mayModify ? 'button_on':'button_off';
         h($user['User']['authkey']),
         sprintf(
             ' (%s)',
-            $this->Html->link('reset', array('controller' => 'users', 'action' => 'resetauthkey', $user['User']['id']))
+            $this->Html->link(__('reset'), array('controller' => 'users', 'action' => 'resetauthkey', $user['User']['id']))
         )
     );
     $table_data[] = array(
@@ -95,12 +95,13 @@ $buttonModifyStatus = $mayModify ? 'button_on':'button_off';
             $this->element('genericElements/viewMetaTable', array('table_data' => $table_data))
         ),
         sprintf(
-            '<br /><a href="%s" class="btn btn-inverse" download>Download user profile for data portability</a>',
+            '<br /><a href="%s" class="btn btn-inverse" download>%s</a>',
             sprintf(
                 '%s/users/view/%s.json',
                 $baseurl,
                 h($user['User']['id'])
-            )
+            ),
+            __('Download user profile for data portability')
         ),
         '<div id="userEvents"></div>',
         $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'viewUser'))
diff --git a/app/View/Users/edit.ctp b/app/View/Users/edit.ctp
old mode 100644
new mode 100755
index 8de505bd5..bf77caf44
--- a/app/View/Users/edit.ctp
+++ b/app/View/Users/edit.ctp
@@ -7,10 +7,10 @@
     ?>
         <div class="input clear"></div>
     <?php
-        $passwordPopover = '<span class=\"blue bold\">Length</span>: ' . h($length) . '<br />';
-        $passwordPopover .= '<span class=\"blue bold\">Complexity</span>: ' . h($complexity);
+        $passwordPopover = '<span class=\"blue bold\">' . __('Length') .'</span>: ' . h($length) . '<br />';
+        $passwordPopover .= '<span class=\"blue bold\">' . __('Complexity') .'</span>: ' . h($complexity);
         echo $this->Form->input('password', array(
-            'label' => 'Password <span id = "PasswordPopover" class="icon-info-sign" ></span>'
+            'label' => __('Password') . ' <span id = "PasswordPopover" class="icon-info-sign" ></span>'
         ));
         echo $this->Form->input('confirm_password', array('type' => 'password', 'div' => array('class' => 'input password required')));
     ?>
@@ -20,7 +20,7 @@
     ?>
         <div class="input clear"></div>
     <?php
-        echo $this->Form->input('gpgkey', array('label' => 'GnuPG key', 'div' => 'clear', 'class' => 'input-xxlarge'));
+        echo $this->Form->input('gpgkey', array('label' => __('GnuPG key'), 'div' => 'clear', 'class' => 'input-xxlarge'));
         ?>
             <div class="clear"><span role="button" tabindex="0" aria-label="<?php echo __('Fetch GnuPG key');?>" onClick="lookupPGPKey('UserEmail');" class="btn btn-inverse" style="margin-bottom:10px;"><?php echo __('Fetch GnuPG key');?></span></div>
         <?php
diff --git a/app/View/Users/statistics_attackmatrix.ctp b/app/View/Users/statistics_attackmatrix.ctp
deleted file mode 100644
index 5b2cf49c3..000000000
--- a/app/View/Users/statistics_attackmatrix.ctp
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class = "index">
-    <h2><?php echo __('Statistics');?></h2>
-    <?php
-        echo $this->element('Users/statisticsMenu');
-    ?>
-    <p style="margin-bottom: 40px;"><?php echo __('A heatmap showing the usage of ATT&CK Tactic.');?></p>
-
-<div id="attackmatrix_div" style="position: relative; border: solid 1px;" class="statistics_attack_matrix">
-    <?php
-        echo $this->element('view_galaxy_matrix');
-    ?>
-</div>
-
-</div>
-
-<?php
-    echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'statistics'));
-?>
diff --git a/app/View/Users/statistics_galaxymatrix.ctp b/app/View/Users/statistics_galaxymatrix.ctp
new file mode 100644
index 000000000..06b317bfd
--- /dev/null
+++ b/app/View/Users/statistics_galaxymatrix.ctp
@@ -0,0 +1,24 @@
+<div class = "index">
+    <h2><?php echo __('Statistics');?></h2>
+    <?php
+        echo $this->element('Users/statisticsMenu');
+    ?>
+    <p style="margin-bottom: 40px;"><?php echo __(sprintf('A heatmap showing the usage of %s.', $galaxyName));?></p>
+
+    <select id="galaxyMatrixPicker" onchange="this.options[this.selectedIndex].value && (window.location = window.location.pathname.replace(/\/*galaxy_id:\d+/, '') + '/' + 'galaxy_id:' + this.options[this.selectedIndex].value);" >
+        <?php foreach ($matrixGalaxies as $k => $galaxy): ?>
+            <option value="<?php echo h($galaxy['Galaxy']['id']); ?>" <?php echo $galaxy['Galaxy']['id'] == $galaxyId ? 'selected' : ''; ?> ><?php echo h($galaxy['Galaxy']['name']); ?></option>
+        <?php endforeach; ?>
+    </select>
+
+<div id="attackmatrix_div" style="position: relative; border: solid 1px;" class="statistics_attack_matrix">
+    <?php
+        echo $this->element('view_galaxy_matrix');
+    ?>
+</div>
+
+</div>
+
+<?php
+    echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'statistics'));
+?>
diff --git a/app/View/Users/statistics_orgs.ctp b/app/View/Users/statistics_orgs.ctp
index 1df2eac56..4691a5bba 100644
--- a/app/View/Users/statistics_orgs.ctp
+++ b/app/View/Users/statistics_orgs.ctp
@@ -41,14 +41,7 @@
         <tr class="org_row" data-orgid="<?php echo h($data['id']); ?>">
             <td class="short">
                 <?php
-                    if (isset($data['logo'])):
-                ?>
-                        <img src="<?php echo $baseurl; ?>/img/orgs/<?php echo h($data['name']); ?>.png" height="24" width="24" />
-                <?php
-                    else:
-                        echo '&nbsp;';
-                    endif;
-
+                    echo $this->OrgImg->getOrgImg(array('name' => $data['name'], 'id' => $data['id'], 'size' => 24));
                 ?>
             </td>
             <td class="short"><?php echo h($data['name']); ?></td>
diff --git a/app/View/Users/view.ctp b/app/View/Users/view.ctp
old mode 100644
new mode 100755
index 84f4ded98..d78f57ccf
--- a/app/View/Users/view.ctp
+++ b/app/View/Users/view.ctp
@@ -17,7 +17,7 @@
             (Configure::read('MISP.disableUserSelfManagement') && !$isAdmin) ? '' :
                 sprintf(
                     ' (%s)',
-                    $this->Html->link('reset', array('controller' => 'users', 'action' => 'resetauthkey', $user['User']['id']))
+                    $this->Html->link(__('reset'), array('controller' => 'users', 'action' => 'resetauthkey', $user['User']['id']))
                 )
         );
     }
@@ -59,8 +59,9 @@
             $this->element('genericElements/viewMetaTable', array('table_data' => $table_data))
         ),
         sprintf(
-            '<a href="%s" class="btn btn-inverse" download>Download user profile for data portability</a>',
-            $baseurl . '/users/view/me.json'
+            '<a href="%s" class="btn btn-inverse" download>%s</a>',
+            $baseurl . '/users/view/me.json',
+            __('Download user profile for data portability')
         ),
         $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'globalActions', 'menuItem' => 'view'))
     );
diff --git a/app/View/Warninglists/index.ctp b/app/View/Warninglists/index.ctp
old mode 100644
new mode 100755
index 9b9f9aee6..a32a4fa01
--- a/app/View/Warninglists/index.ctp
+++ b/app/View/Warninglists/index.ctp
@@ -32,8 +32,8 @@
             <th><?php echo $this->Paginator->sort('version');?></th>
             <th><?php echo $this->Paginator->sort('description');?></th>
             <th><?php echo $this->Paginator->sort('type');?></th>
-            <th>Valid attributes</th>
-            <th><?php echo $this->Paginator->sort('warninglist_entry_count', 'Entries');?></th>
+            <th><?php echo __('Valid attributes');?></th>
+            <th><?php echo $this->Paginator->sort('warninglist_entry_count', __('Entries'));?></th>
             <th><?php echo $this->Paginator->sort('enabled');?></th>
             <th class="actions"><?php echo __('Actions');?></th>
     </tr><?php
diff --git a/app/View/Whitelists/admin_edit.ctp b/app/View/Whitelists/admin_edit.ctp
old mode 100644
new mode 100755
index af2b4be29..74a175328
--- a/app/View/Whitelists/admin_edit.ctp
+++ b/app/View/Whitelists/admin_edit.ctp
@@ -9,7 +9,10 @@
         ));
     ?>
     </fieldset>
-<?php echo $this->Form->end(__('Submit'));?>
+<?php
+    echo $this->Form->button(__('Submit'), array('class' => 'btn btn-primary'));
+    echo $this->Form->end();
+?>
 </div>
 <?php
     echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'whitelist', 'menuItem' => 'edit', 'id' => $this->Form->value('Whitelist.id')));
diff --git a/app/View/Whitelists/admin_index.ctp b/app/View/Whitelists/admin_index.ctp
index 571456c23..eb4e7049b 100644
--- a/app/View/Whitelists/admin_index.ctp
+++ b/app/View/Whitelists/admin_index.ctp
@@ -28,8 +28,8 @@ foreach ($list as $item):?>
         <td class="short"><?php echo h($item['Whitelist']['id']);?>&nbsp;</td>
         <td><?php echo h($item['Whitelist']['name']);?>&nbsp;</td>
         <td class="short action-links">
-            <?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Whitelist']['id']), array('class' => 'fa fa-edit', 'title' => 'Edit'));?>
-            <?php echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $item['Whitelist']['id']), array('class' => 'fa fa-trash', 'title' => 'Delete'), __('Are you sure you want to delete "%s"?', $item['Whitelist']['name']));?>
+            <?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Whitelist']['id']), array('class' => 'fa fa-edit', 'title' => __('Edit')));?>
+            <?php echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $item['Whitelist']['id']), array('class' => 'fa fa-trash', 'title' => __('Delete')), __('Are you sure you want to delete "%s"?', $item['Whitelist']['name']));?>
         </td>
     </tr><?php
 endforeach;?>
diff --git a/app/files/feed-metadata/defaults.json b/app/files/feed-metadata/defaults.json
index fa6497370..92852d614 100644
--- a/app/files/feed-metadata/defaults.json
+++ b/app/files/feed-metadata/defaults.json
@@ -49,39 +49,6 @@
       "cache_timestamp": "1495871957"
     }
   },
-  {
-    "Feed": {
-      "id": "3",
-      "name": "inThreat OSINT Feed",
-      "provider": "inThreat",
-      "url": "https://feeds.inthreat.com/osint/misp/",
-      "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
-      "enabled": true,
-      "distribution": "0",
-      "sharing_group_id": "0",
-      "tag_id": "615",
-      "default": false,
-      "source_format": "misp",
-      "fixed_event": false,
-      "delta_merge": false,
-      "event_id": "0",
-      "publish": false,
-      "override_ids": false,
-      "settings": "{\"csv\":{\"value\":\"\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
-      "input_source": "network",
-      "delete_local_file": false,
-      "lookup_visible": false,
-      "cache_timestamp": "1495872675"
-    },
-    "Tag": {
-      "id": "615",
-      "name": "osint:source-type=\"block-or-filter-list\"",
-      "colour": "#004f89",
-      "exportable": true,
-      "org_id": "0",
-      "hide_tag": false
-    }
-  },
   {
     "Feed": {
       "id": "28",
@@ -1549,5 +1516,57 @@
       "headers": "",
       "caching_enabled": true
     }
-  }
+  },
+  {
+    "Feed": {
+        "id": "77",
+        "name": "malsilo.url",
+        "provider": "MalSilo",
+        "url": "https:\/\/malsilo.gitlab.io\/feeds\/dumps\/url_list.txt",
+        "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+        "enabled": false,
+        "distribution": "3",
+        "sharing_group_id": "0",
+        "tag_id": "0",
+        "default": false,
+        "source_format": "csv",
+        "fixed_event": true,
+        "delta_merge": false,
+        "event_id": "0",
+        "publish": false,
+        "override_ids": false,
+        "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+        "input_source": "network",
+        "delete_local_file": false,
+        "lookup_visible": true,
+        "headers": "",
+        "caching_enabled": true
+    }
+  },
+  {
+    "Feed": {
+        "id": "78",
+        "name": "malsilo.ipv4",
+        "provider": "MalSilo",
+        "url": "https:\/\/malsilo.gitlab.io\/feeds\/dumps\/ip_list.txt",
+        "rules": "{\"tags\":{\"OR\":[],\"NOT\":[]},\"orgs\":{\"OR\":[],\"NOT\":[]}}",
+        "enabled": false,
+        "distribution": "3",
+        "sharing_group_id": "0",
+        "tag_id": "0",
+        "default": false,
+        "source_format": "csv",
+        "fixed_event": true,
+        "delta_merge": false,
+        "event_id": "0",
+        "publish": false,
+        "override_ids": false,
+        "settings": "{\"csv\":{\"value\":\"3\",\"delimiter\":\",\"},\"common\":{\"excluderegex\":\"\"}}",
+        "input_source": "network",
+        "delete_local_file": false,
+        "lookup_visible": true,
+        "headers": "",
+        "caching_enabled": true
+    }
+}
 ]
diff --git a/app/files/misp-galaxy b/app/files/misp-galaxy
index f2159bfaa..b2538a1f8 160000
--- a/app/files/misp-galaxy
+++ b/app/files/misp-galaxy
@@ -1 +1 @@
-Subproject commit f2159bfaa39c6b5c3243b96c823cdcabcf01ddff
+Subproject commit b2538a1f8ac16e377df8d94bc87f5d089e418690
diff --git a/app/files/misp-objects b/app/files/misp-objects
index d0886ba6a..047595dde 160000
--- a/app/files/misp-objects
+++ b/app/files/misp-objects
@@ -1 +1 @@
-Subproject commit d0886ba6aff1526868efcd59fccb99e920372f3b
+Subproject commit 047595ddeb496a9cba294064902dd6fb5641cde7
diff --git a/app/files/scripts/stix2/misp2stix2.py b/app/files/scripts/stix2/misp2stix2.py
index e4e9f9a68..926420359 100644
--- a/app/files/scripts/stix2/misp2stix2.py
+++ b/app/files/scripts/stix2/misp2stix2.py
@@ -68,7 +68,8 @@ class StixBuilder():
         external_refs = [self.__parse_link(link) for link in self.links]
         report_args = {'type': 'report', 'id': self.report_id, 'name': self.misp_event['info'],
                        'created_by_ref': self.identity_id, 'created': self.misp_event['date'],
-                       'published': self.get_datetime_from_timestamp(self.misp_event['publish_timestamp'])}
+                       'published': self.get_datetime_from_timestamp(self.misp_event['publish_timestamp']),
+                       'interoperability': True}
         labels = _MISP_event_tags
         if self.misp_event.get('Tag'):
             markings = []
@@ -83,7 +84,7 @@ class StixBuilder():
         self.add_all_markings()
         self.add_all_relationships()
         report_args['object_refs'] = self.object_refs
-        return Report(**report_args, interoperability=True)
+        return Report(**report_args)
 
     @staticmethod
     def __parse_link(link):
@@ -364,7 +365,8 @@ class StixBuilder():
         sdo_id = "{}--{}".format(sdo_type, cluster_uuid)
         description = "{} | {}".format(galaxy['description'], cluster['description'])
         labels = ['misp:name=\"{}\"'.format(galaxy['name'])]
-        sdo_args = {'id': sdo_id, 'type': sdo_type, 'name': cluster['value'], 'description': description}
+        sdo_args = {'id': sdo_id, 'type': sdo_type, 'name': cluster['value'],
+                    'description': description, 'interoperability': True}
         if b_killchain:
             killchain = [{'kill_chain_name': 'misp-category',
                           'phase_name': galaxy['type']}]
@@ -383,7 +385,7 @@ class StixBuilder():
     def add_attack_pattern(self, galaxy):
         a_p_args, a_p_id = self.generate_galaxy_args(galaxy, True, False, 'attack-pattern')
         a_p_args['created_by_ref'] = self.identity_id
-        attack_pattern = AttackPattern(**a_p_args, interoperability=True)
+        attack_pattern = AttackPattern(**a_p_args)
         self.append_object(attack_pattern, a_p_id)
 
     def add_course_of_action(self, misp_object):
@@ -406,7 +408,7 @@ class StixBuilder():
 
     def add_coa_stix_object(self, coa_args, coa_id):
         coa_args['created_by_ref'] = self.identity_id
-        course_of_action = CourseOfAction(**coa_args, interoperability=True)
+        course_of_action = CourseOfAction(**coa_args)
         self.append_object(course_of_action, coa_id)
 
     def add_custom(self, attribute):
@@ -441,12 +443,13 @@ class StixBuilder():
         name = attribute['value']
         labels, markings = self.create_labels(attribute)
         identity_args = {'id': identity_id,  'type': identity, 'name': name, 'labels': labels,
-                          'identity_class': 'individual', 'created_by_ref': self.identity_id}
+                          'identity_class': 'individual', 'created_by_ref': self.identity_id,
+                          'interoperability': True}
         if attribute.get('comment'):
             identity_args['description'] = attribute['comment']
         if markings:
             identity_args['object_marking_refs'] = self.handle_tags(markings)
-        identity = Identity(**identity_args, interoperability=True)
+        identity = Identity(**identity_args)
         self.append_object(identity, identity_id)
 
     def add_indicator(self, attribute):
@@ -459,7 +462,8 @@ class StixBuilder():
         attribute_value = attribute['value'] if attribute_type != "AS" else self.define_attribute_value(attribute['value'], attribute['comment'])
         pattern = mispTypesMapping[attribute_type]['pattern'](attribute_type, attribute_value, attribute['data']) if attribute.get('data') else self.define_pattern(attribute_type, attribute_value)
         indicator_args = {'id': indicator_id, 'type': 'indicator', 'labels': labels, 'kill_chain_phases': killchain,
-                           'valid_from': self.misp_event['date'], 'created_by_ref': self.identity_id, 'pattern': pattern}
+                           'valid_from': self.misp_event['date'], 'created_by_ref': self.identity_id,
+                           'pattern': pattern, 'interoperability': True}
         if hasattr(attribute, 'Sighting'):
             for sighting in attribute['Sighting']:
                 if sighting['Organisation']['name'] == self.misp_event['Orgc']['name'] and sighting['type'] == "2":
@@ -469,19 +473,19 @@ class StixBuilder():
             indicator_args['description'] = attribute['comment']
         if markings:
             indicator_args['object_marking_refs'] = self.handle_tags(markings)
-        indicator = Indicator(**indicator_args, interoperability=True)
+        indicator = Indicator(**indicator_args)
         self.append_object(indicator, indicator_id)
 
     def add_intrusion_set(self, galaxy):
         i_s_args, i_s_id = self.generate_galaxy_args(galaxy, False, True, 'intrusion-set')
         i_s_args['created_by_ref'] = self.identity_id
-        intrusion_set = IntrusionSet(**i_s_args, interoperability=True)
+        intrusion_set = IntrusionSet(**i_s_args)
         self.append_object(intrusion_set, i_s_id)
 
     def add_malware(self, galaxy):
         malware_args, malware_id = self.generate_galaxy_args(galaxy, True, False, 'malware')
         malware_args['created_by_ref'] = self.identity_id
-        malware = Malware(**malware_args, interoperability=True)
+        malware = Malware(**malware_args)
         self.append_object(malware, malware_id)
 
     def add_observed_data(self, attribute):
@@ -494,22 +498,22 @@ class StixBuilder():
         observable = mispTypesMapping[attribute_type]['observable'](attribute_type, attribute_value, attribute['data']) if attribute.get('data') else self.define_observable(attribute_type, attribute_value)
         observed_data_args = {'id': observed_data_id, 'type': 'observed-data', 'number_observed': 1,
                               'first_observed': timestamp, 'last_observed': timestamp, 'labels': labels,
-                              'created_by_ref': self.identity_id, 'objects': observable}
+                              'created_by_ref': self.identity_id, 'objects': observable, 'interoperability': True}
         if markings:
             observed_data_args['object_marking_refs'] = self.handle_tags(markings)
-        observed_data = ObservedData(**observed_data_args, interoperability=True)
+        observed_data = ObservedData(**observed_data_args)
         self.append_object(observed_data, observed_data_id)
 
     def add_threat_actor(self, galaxy):
         t_a_args,  t_a_id = self.generate_galaxy_args(galaxy, False, True, 'threat-actor')
         t_a_args['created_by_ref'] = self.identity_id
-        threat_actor = ThreatActor(**t_a_args, interoperability=True)
+        threat_actor = ThreatActor(**t_a_args)
         self.append_object(threat_actor, t_a_id)
 
     def add_tool(self, galaxy):
         tool_args, tool_id = self.generate_galaxy_args(galaxy, True, False, 'tool')
         tool_args['created_by_ref'] = self.identity_id
-        tool = Tool(**tool_args, interoperability=True)
+        tool = Tool(**tool_args)
         self.append_object(tool, tool_id)
 
     def add_vulnerability(self, attribute):
@@ -519,10 +523,11 @@ class StixBuilder():
         labels, markings = self.create_labels(attribute)
         vulnerability_args = {'id': vulnerability_id, 'type': 'vulnerability',
                               'name': name, 'external_references': vulnerability_data,
-                              'created_by_ref': self.identity_id, 'labels': labels}
+                              'created_by_ref': self.identity_id, 'labels': labels,
+                              'interoperability': True}
         if markings:
             vulnerability_args['object_marking_refs'] = self.handle_tags(markings)
-        vulnerability = Vulnerability(**vulnerability_args, interoperability=True)
+        vulnerability = Vulnerability(**vulnerability_args)
         self.append_object(vulnerability, vulnerability_id)
 
     def add_vulnerability_from_galaxy(self, attribute):
@@ -540,8 +545,8 @@ class StixBuilder():
         vulnerability_args = {'id': vulnerability_id, 'type': 'vulnerability',
                               'name': name, 'external_references': vulnerability_data,
                               'created_by_ref': self.identity_id, 'labels': labels,
-                              'description': description}
-        vulnerability = Vulnerability(**vulnerability_args, interoperability=True)
+                              'description': description, 'interoperability': True}
+        vulnerability = Vulnerability(**vulnerability_args)
         self.append_object(vulnerability, vulnerability_id)
 
     def add_object_custom(self, misp_object, to_ids):
@@ -581,11 +586,12 @@ class StixBuilder():
         category = misp_object.get('meta-category')
         killchain = self.create_killchain(category)
         labels = self.create_object_labels(name, category, True)
-        indicator_args = {'id': indicator_id, 'valid_from': self.misp_event['date'], 'type': 'indicator',
-                          'labels': labels, 'description': misp_object['description'],
-                          'pattern': pattern, 'kill_chain_phases': killchain,
-                          'created_by_ref': self.identity_id, 'allow_custom': True}
-        indicator = Indicator(**indicator_args, interoperability=True)
+        indicator_args = {'id': indicator_id, 'valid_from': self.misp_event['date'],
+                          'type': 'indicator', 'labels': labels, 'pattern': pattern,
+                          'description': misp_object['description'], 'allow_custom': True,
+                          'kill_chain_phases': killchain, 'interoperability': True,
+                          'created_by_ref': self.identity_id}
+        indicator = Indicator(**indicator_args)
         self.append_object(indicator, indicator_id)
 
     def add_object_observable(self, misp_object, observable_arg=None):
@@ -599,12 +605,12 @@ class StixBuilder():
         category = misp_object.get('meta-category')
         labels = self.create_object_labels(name, category, False)
         timestamp = self.get_datetime_from_timestamp(misp_object['timestamp'])
-        observed_data_args = {'id': observed_data_id, 'type': 'observed-data',
-                              'number_observed': 1, 'labels': labels, 'objects': observable_objects,
+        observed_data_args = {'id': observed_data_id, 'type': 'observed-data', 'labels': labels,
+                              'number_observed': 1, 'objects': observable_objects, 'allow_custom': True,
                               'first_observed': timestamp, 'last_observed': timestamp,
-                              'created_by_ref': self.identity_id, 'allow_custom': True}
+                              'created_by_ref': self.identity_id, 'interoperability': True}
         try:
-            observed_data = ObservedData(**observed_data_args, interoperability=True)
+            observed_data = ObservedData(**observed_data_args)
         except exceptions.InvalidValueError:
             observed_data = self.fix_enumeration_issues(name, observed_data_args)
         self.append_object(observed_data, observed_data_id)
@@ -625,8 +631,8 @@ class StixBuilder():
                     current_dict[field] = enumeration_fails[field]
             for field in enumeration_fails:
                 current_dict.pop(field)
-            return ObservedData(**ns_args, interoperability=True)
-        return ObservedData(**args, interoperability=True)
+            return ObservedData(**ns_args)
+        return ObservedData(**args)
 
     def add_object_vulnerability(self, misp_object, to_ids):
         vulnerability_id = 'vulnerability--{}'.format(misp_object['uuid'])
@@ -634,8 +640,8 @@ class StixBuilder():
         labels = self.create_object_labels(name, misp_object.get('meta-category'), to_ids)
         vulnerability_args = {'id': vulnerability_id, 'type': 'vulnerability',
                               'name': name, 'created_by_ref': self.identity_id,
-                              'labels': labels}
-        vulnerability = Vulnerability(**vulnerability_args, interoperability=True)
+                              'labels': labels, 'interoperability': True}
+        vulnerability = Vulnerability(**vulnerability_args)
         self.append_object(vulnerability, vulnerability_id)
 
     def append_object(self, stix_object, stix_object_id):
diff --git a/app/files/scripts/stix2/stix2misp.py b/app/files/scripts/stix2/stix2misp.py
index 900033ac9..a74b9b644 100644
--- a/app/files/scripts/stix2/stix2misp.py
+++ b/app/files/scripts/stix2/stix2misp.py
@@ -29,7 +29,7 @@ from stix2misp_mapping import *
 from collections import defaultdict
 
 _MISP_dir = "/".join([p for p in os.path.dirname(os.path.realpath(__file__)).split('/')[:-4]])
-_PyMISP_dir = '{_MISP_dir}/PyMISP/pymisp'.format(_MISP_dir=_MISP_dir)
+_PyMISP_dir = '{_MISP_dir}/PyMISP'.format(_MISP_dir=_MISP_dir)
 _MISP_objects_path = '{_MISP_dir}/app/files/misp-objects/objects'.format(_MISP_dir=_MISP_dir)
 sys.path.append(_PyMISP_dir)
 from pymisp.mispevent import MISPEvent, MISPObject, MISPAttribute
@@ -38,7 +38,7 @@ TAG_REGEX = re.compile(r"\(.+\) .+ = .+")
 special_parsing = ('relationship', 'report', 'galaxy', 'marking-definition')
 galaxy_types = {'attack-pattern': 'Attack Pattern', 'intrusion-set': 'Intrusion Set',
                 'malware': 'Malware', 'threat-actor': 'Threat Actor', 'tool': 'Tool'}
-with open('{_PyMISP_dir}/data/describeTypes.json'.format(_PyMISP_dir=_PyMISP_dir), 'r') as f:
+with open('{_PyMISP_dir}/pymisp/data/describeTypes.json'.format(_PyMISP_dir=_PyMISP_dir), 'r') as f:
     misp_types = json.loads(f.read())['result'].get('types')
 
 class StixParser():
diff --git a/app/files/scripts/stix2misp.py b/app/files/scripts/stix2misp.py
index bb73059d1..b82e62516 100644
--- a/app/files/scripts/stix2misp.py
+++ b/app/files/scripts/stix2misp.py
@@ -28,7 +28,7 @@ from stix.core import STIXPackage
 from collections import defaultdict
 
 _MISP_dir = "/".join([p for p in os.path.dirname(os.path.realpath(__file__)).split('/')[:-3]])
-_PyMISP_dir = '{_MISP_dir}/PyMISP/pymisp'.format(_MISP_dir=_MISP_dir)
+_PyMISP_dir = '{_MISP_dir}/PyMISP'.format(_MISP_dir=_MISP_dir)
 _MISP_objects_path = '{_MISP_dir}/app/files/misp-objects/objects'.format(_MISP_dir=_MISP_dir)
 sys.path.append(_PyMISP_dir)
 from pymisp.mispevent import MISPEvent, MISPObject, MISPAttribute
@@ -40,7 +40,7 @@ cybox_to_misp_object = {"Account": "credential", "AutonomousSystem": "asn",
 
 threat_level_mapping = {'High': '1', 'Medium': '2', 'Low': '3', 'Undefined': '4'}
 
-with open("{_PyMISP_dir}/data/describeTypes.json".format(_PyMISP_dir=_PyMISP_dir), 'r') as f:
+with open("{_PyMISP_dir}/pymisp/data/describeTypes.json".format(_PyMISP_dir=_PyMISP_dir), 'r') as f:
     categories = json.loads(f.read())['result'].get('categories')
 
 class StixParser():
diff --git a/app/files/taxonomies b/app/files/taxonomies
index 8b57a1bf1..bb9cf757e 160000
--- a/app/files/taxonomies
+++ b/app/files/taxonomies
@@ -1 +1 @@
-Subproject commit 8b57a1bf144e6cfb9a65d7c15cba3ff1eccbc103
+Subproject commit bb9cf757ed648786e424b9e2624905a7d0372aa5
diff --git a/app/files/warninglists b/app/files/warninglists
index 2b6b07b28..04e8f468d 160000
--- a/app/files/warninglists
+++ b/app/files/warninglists
@@ -1 +1 @@
-Subproject commit 2b6b07b28a2937f658accc2f7eeb825396b8120c
+Subproject commit 04e8f468d9b789956adb1bea44fa108c4012229f
diff --git a/app/webroot/css/distribution-graph.css b/app/webroot/css/distribution-graph.css
index d19c6ea22..85f5e5682 100644
--- a/app/webroot/css/distribution-graph.css
+++ b/app/webroot/css/distribution-graph.css
@@ -2,6 +2,44 @@
 	color: #333333;
 }
 
+.eventgraph_header {
+	background: #f9f9f9;
+	box-shadow: 0px 0px 6px #B2B2B2;
+	margin-bottom: 2px;
+	width: 100%;
+	height: 40px;
+	overflow: hidden;
+}
+
+select.center-in-network-header {
+	margin-bottom: 0px;
+	width: fit-content;
+}
+
+input[type="text"].center-in-network-header {
+	top: 5px;
+	margin: 0px;
+	margin-left: 5px;
+}
+
+input[type="checkbox"].center-in-network-header {
+	top: 0px;
+	margin: 0px;
+	margin-left: 5px;
+}
+
+label.center-in-network-header {
+	user-select: none;
+	font-weight: bold;
+}
+
+.center-in-network-header {
+	position: relative;
+	display: inline-block;
+	top: 5px;
+	margin-left: 5px;
+}
+
 .loadingPopover {
 	position: absolute;
 	left: 50%;
@@ -105,3 +143,21 @@
 	border-radius: 4px;
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
 }
+
+.advancedSharingNetwork {
+	position: fixed;
+	top: 45px;
+	right: 0px;
+	height: 800px;
+	width: 800px;
+	background: #ffffffcc;;
+	z-index: 1;
+	border: 1px solid #0088cc;
+	border-radius: 6px;
+	box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+}
+
+.sharingNetworkOrgFinder {
+	position: absolute !important;
+	right: 30px !important;
+}
diff --git a/app/webroot/js/event-distribution-graph.js b/app/webroot/js/event-distribution-graph.js
index 3130df72c..b458e99b6 100644
--- a/app/webroot/js/event-distribution-graph.js
+++ b/app/webroot/js/event-distribution-graph.js
@@ -1,369 +1,455 @@
 var scope_id = $('#eventdistri_graph').data('event-id');
 var event_distribution = $('#eventdistri_graph').data('event-distribution');
+var event_distribution_text = $('#eventdistri_graph').data('event-distribution-text');
 var extended_text = $('#eventdistri_graph').data('extended') == 1 ? true : false;
 var spanOffset_orig = 15; // due to padding
 var payload = {};
 var distribution_chart;
+var distributionData;
 
 function clickHandlerGraph(evt) {
-	var firstPoint = distribution_chart.getElementAtEvent(evt)[0];
-	var distribution_id;
-	if (firstPoint) {
-		var value = distribution_chart.data.datasets[firstPoint._datasetIndex].data[firstPoint._index];
-		if (value == 0) {
-			document.getElementById('attributesFilterField').value = "";
-			filterAttributes('all', scope_id);
-		} else {
-			distribution_id = distribution_chart.data.distribution[firstPoint._index].value;
-			var value_to_set = String(distribution_id);
-			value_to_set += distribution_id == event_distribution ? '|' + '5' : '';
-			value_to_set = value_to_set.split('|');
-			var rules = {
-				condition: 'AND',
-				rules: [
-					{
-						field: 'distribution',
-						value: value_to_set
-					}
-				]
-			};
-			performQuery(rules);
-		}
-	}
+    var firstPoint = distribution_chart.getElementAtEvent(evt)[0];
+    var distribution_id;
+    if (firstPoint) {
+        var value = distribution_chart.data.datasets[firstPoint._datasetIndex].data[firstPoint._index];
+        if (value == 0) {
+            document.getElementById('attributesFilterField').value = "";
+            filterAttributes('all', scope_id);
+        } else {
+            distribution_id = distribution_chart.data.distribution[firstPoint._index].value;
+            var value_to_set = String(distribution_id);
+            value_to_set += distribution_id == event_distribution ? '|' + '5' : '';
+            value_to_set = value_to_set.split('|');
+            var rules = {
+                condition: 'AND',
+                rules: [
+                    {
+                        field: 'distribution',
+                        value: value_to_set
+                    }
+                ]
+            };
+            performQuery(rules);
+        }
+    }
 }
 
 function generate_additional_info(info) {
-	if (info.length == 0) {
-		return "";
-	} else {
-		var to_ret = "\n\nInvolved:\n";
-		var sel = document.createElement('select');
-		sel.classList.add('distributionInfo');
-		info.forEach(function(i) {
-			var opt = document.createElement('option');
-			opt.val = i;
-			opt.innerHTML = i;
-			sel.appendChild(opt);
-		});
-		return to_ret += sel.outerHTML;
-	}
+    if (info.length == 0) {
+        return "";
+    } else {
+        var to_ret = "\n\nInvolved:\n";
+        var sel = document.createElement('select');
+        sel.classList.add('distributionInfo');
+        info.forEach(function(i) {
+            var opt = document.createElement('option');
+            opt.val = i;
+            opt.innerHTML = i;
+            sel.appendChild(opt);
+        });
+        return to_ret += sel.outerHTML;
+    }
+}
+
+function generate_pie_chart(data, placeholder) {
+    var labels = Object.keys(data);
+    var dough_data = labels.map(function(l) {
+        return data[l];
+    });
+
+    if (labels.length == 0) {
+        return
+    } else {
+        var sgDistributionChart = new Chart(placeholder, {
+            type: 'doughnut',
+            data: {
+                labels: labels,
+                datasets: [{
+                    data: dough_data,
+                    backgroundColor: labels.map(function(l) { return '#7a86e0'; })
+                }],
+            },
+            options: {
+                title: {
+                    display: false
+                },
+                animation: {
+                    duration: 500
+                },
+                legend: {
+                    display: false
+                }
+            },
+        });
+    }
 }
 
 function clickHandlerPbText(evt) {
-	var distribution_id = evt.target.dataset.distribution;
-	var value_to_set = String(distribution_id);
-	var rules = {
-		condition: 'AND',
-		rules: [
-			{
-				field: 'distribution',
-				value: [value_to_set]
-			}
-		]
-	};
-	performQuery(rules);
+    var distribution_id = evt.target.dataset.distribution;
+    var value_to_set = String(distribution_id);
+    var rules = {
+        condition: 'AND',
+        rules: [
+            {
+                field: 'distribution',
+                value: [value_to_set]
+            }
+        ]
+    };
+    performQuery(rules);
 }
 function clickHandlerPb(evt) {
-	var distribution_id = $(evt.target).data('distribution');
-	var value_to_set = String(distribution_id);
-	value_to_set = value_to_set.split('|')
-	var rules = {
-		condition: 'AND',
-		rules: [
-			{
-				field: 'distribution',
-				value: value_to_set
-			}
-		]
-	};
-	performQuery(rules);
+    var distribution_id = $(evt.target).data('distribution');
+    var value_to_set = String(distribution_id);
+    value_to_set = value_to_set.split('|')
+    var rules = {
+        condition: 'AND',
+        rules: [
+            {
+                field: 'distribution',
+                value: value_to_set
+            }
+        ]
+    };
+    performQuery(rules);
 }
 
 function fill_distri_for_search(start_distri, end_distri) {
-	var to_ret = "";
-	for (var i=start_distri; i<end_distri; i++) {
-		to_ret += String(i) + "|";
-		to_ret += i==event_distribution ? "5|" : "";
-	}
-	to_ret += String(end_distri);
-	to_ret += end_distri==event_distribution ? "|5" : "";
-	return to_ret;
+    var to_ret = "";
+    for (var i=start_distri; i<end_distri; i++) {
+        to_ret += String(i) + "|";
+        to_ret += i==event_distribution ? "5|" : "";
+    }
+    to_ret += String(end_distri);
+    to_ret += end_distri==event_distribution ? "|5" : "";
+    return to_ret;
 }
 
 function get_maximum_distribution(array) {
-	var org = array[0];
-	var community = array[1];
-	var connected = array[2];
-	var all = array[3];
-	var sharing = array[4];
-	if (all != 0) {
-		return 3;
-	} else if (connected != 0) {
-		return 2;
-	} else if (community != 0) {
-		return 1;
-	} else {
-		return 0;
-	}
+    var org = array[0];
+    var community = array[1];
+    var connected = array[2];
+    var all = array[3];
+    var sharing = array[4];
+    if (all != 0) {
+        return 3;
+    } else if (connected != 0) {
+        return 2;
+    } else if (community != 0) {
+        return 1;
+    } else {
+        return 0;
+    }
 }
 
 function get_minimum_distribution(array, event_dist) {
-	var org = array[0];
-	var community = array[1];
-	var connected = array[2];
-	var all = array[3];
-	var sharing = array[4];
-	if (connected != 0 && 3 == event_distribution) {
-		return 2;
-	} else if (community != 0 && 1 < event_distribution) {
-		return 1;
-	} else if (org != 0 && 0 < event_distribution) {
-		return 0;
-	} else {
-		return -1;
-	}
+    var org = array[0];
+    var community = array[1];
+    var connected = array[2];
+    var all = array[3];
+    var sharing = array[4];
+    if (connected != 0 && 3 == event_distribution) {
+        return 2;
+    } else if (community != 0 && 1 < event_distribution) {
+        return 1;
+    } else if (org != 0 && 0 < event_distribution) {
+        return 0;
+    } else {
+        return -1;
+    }
 }
 
 function add_level_to_pb(distribution, additionalInfo, maxLevel) {
-	var pb_container = document.getElementById('eventdistri_pb_container');
-	var pb = document.getElementById('eventdistri_pb_background');
-	document.getElementById('eventdistri_graph').style.left = spanOffset_orig + 'px'; // center graph inside the popover
-	var pbStep = pb.clientWidth / 4.0;
-	var pb_top = pb.offsetTop;
+    var pb_container = document.getElementById('eventdistri_pb_container');
+    var pb = document.getElementById('eventdistri_pb_background');
+    document.getElementById('eventdistri_graph').style.left = spanOffset_orig + 'px'; // center graph inside the popover
+    var pbStep = pb.clientWidth / 4.0;
+    var pb_top = pb.offsetTop;
 
-	var spanOffset = spanOffset_orig;
-	distribution = jQuery.extend({}, distribution); // deep clone distribution object
-	for (var d in distribution) {
-		d = parseInt(d);
-		if (d == 4) { // skip sharing group
-			continue;
-		}
-		// text
-		var span = document.createElement('span');
-		span.classList.add('useCursorPointer', 'pbDistributionText', 'badge');
-		span.onclick = clickHandlerPbText;
-		span.innerHTML = distribution[d].key;
-		span.setAttribute('data-distribution', d);
-		span.style.whiteSpace = 'pre-wrap';
-		if (maxLevel == d+1) { // current event distribution
-			span.style.fontSize = 'larger';
-			span.style.top = d % 2 == 0 ? pb_top-37+'px' : pb_top+30+'px';
-			span.style.boxShadow = '3px 3px 5px 1px rgba(0,0,0,0.6)';
-		} else {
-			span.style.opacity = '0.5';
-			span.style.top = d % 2 == 0 ? pb_top-37+'px' : pb_top+30+'px';
-		}
-		pb_container.appendChild(span);
-		if (d == Object.keys(distribution).length-2) { // last one, move a bit to the left. (-2 because sharing is not considered)
-			span.style.left = (pbStep*(d+1))+spanOffset-span.clientWidth/2-35 + 'px';
-		} else {
-			span.style.left = (pbStep*(d+1))+spanOffset-span.clientWidth/2 + 'px';
-		}
-		var pop = $(span).popover({
-			placement: d % 2 == 0 ? 'top' : 'bottom',
-			trigger: 'click',
-			content: '<b>Distribution description:</b> ' + distribution[d].desc + generate_additional_info(additionalInfo[d]),
-			title: distribution[d].key,
-			container: 'body',
-			html: true,
-			template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title distributionInfo"></h3><div class="popover-content distributionInfo" style="white-space: pre-wrap"></div></div>'
-		});
+    var spanOffset = spanOffset_orig;
+    distribution = jQuery.extend({}, distribution); // deep clone distribution object
+    for (var d in distribution) {
+        d = parseInt(d);
+        if (d == 4) { // skip sharing group
+            continue;
+        }
+        // text
+        var span = document.createElement('span');
+        span.classList.add('useCursorPointer', 'pbDistributionText', 'badge', 'toBeCleared');
+        span.onclick = clickHandlerPbText;
+        span.innerHTML = distribution[d].key;
+        span.setAttribute('data-distribution', d);
+        span.style.whiteSpace = 'pre-wrap';
+        if (maxLevel == d+1) { // current event distribution
+            span.style.fontSize = 'larger';
+            span.style.top = d % 2 == 0 ? pb_top-37+'px' : pb_top+30+'px';
+            span.style.boxShadow = '3px 3px 5px 1px rgba(0,0,0,0.6)';
+        } else {
+            span.style.opacity = '0.5';
+            span.style.top = d % 2 == 0 ? pb_top-37+'px' : pb_top+30+'px';
+        }
+        pb_container.appendChild(span);
+        if (d == Object.keys(distribution).length-2) { // last one, move a bit to the left. (-2 because sharing is not considered)
+            span.style.left = (pbStep*(d+1))+spanOffset-span.clientWidth/2-35 + 'px';
+        } else {
+            span.style.left = (pbStep*(d+1))+spanOffset-span.clientWidth/2 + 'px';
+        }
+        var pop = $(span).popover({
+            placement: d % 2 == 0 ? 'top' : 'bottom',
+            trigger: 'click',
+            content: '<b>Distribution description:</b> ' + distribution[d].desc + generate_additional_info(additionalInfo[d]),
+            title: distribution[d].key,
+            container: 'body',
+            html: true,
+            template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title distributionInfo"></h3><div class="popover-content distributionInfo" style="white-space: pre-wrap"></div></div>'
+        });
 
-		// tick
-		var span = document.createElement('span');
-		span.classList.add('pbDistributionTick');
-		spanOffset += (pbStep*(d+1))+spanOffset > pb_container.clientWidth ? -3 : 0; // avoid the tick width to go further than the pb
-		span.style.left = (pbStep*(d+1))+spanOffset + 'px';
-		span.style.top = d % 2 == 0 ? pb_top-15+'px' : pb_top+0+'px';
-		if (maxLevel == d+1) {
-			span.style.opacity = '0.6';
-		} else {
-			span.style.opacity = '0.2';
-		}
-		pb_container.appendChild(span);
-	}
+        // tick
+        var span = document.createElement('span');
+        span.classList.add('pbDistributionTick', 'toBeCleared');
+        spanOffset += (pbStep*(d+1))+spanOffset > pb_container.clientWidth ? -3 : 0; // avoid the tick width to go further than the pb
+        span.style.left = (pbStep*(d+1))+spanOffset + 'px';
+        span.style.top = d % 2 == 0 ? pb_top-15+'px' : pb_top+0+'px';
+        if (maxLevel == d+1) {
+            span.style.opacity = '0.6';
+        } else {
+            span.style.opacity = '0.2';
+        }
+        pb_container.appendChild(span);
+    }
 
 }
+
+function construct_piechart(data) {
+    $('.toBeCleared').remove();
+
+    $(".loadingPopover").hide();
+
+    // DISTRIBUTION PROGRESSBAR
+    $('#eventdistri_pb_invalid').tooltip();
+    $('#eventdistri_pb').tooltip();
+    $('#eventdistri_pb_min').tooltip();
+
+    $('#eventdistri_pb_invalid').click(function(evt) { clickHandlerPb(evt); });
+    $('#eventdistri_pb').click(function(evt) { clickHandlerPb(evt); });
+    $('#eventdistri_pb_min').click(function(evt) { clickHandlerPb(evt); });
+    $('#eventdistri_sg_pb').click(function(evt) { clickHandlerPb(evt); });
+
+    // pb
+    var event_dist, min_distri, max_distri;
+    if (event_distribution == 4) { // if distribution is sharing group, overwrite default behavior
+        var event_dist = 1;
+        var min_distri = 0;
+        var max_distri = 0;
+    } else {
+        var event_dist = event_distribution+1; // +1 to reach the first level
+        var min_distri = get_minimum_distribution(data.event, event_dist)+1; // +1 to reach the first level
+        var max_distri = get_maximum_distribution(data.event)+1; // +1 to reach the first level
+    }
+    add_level_to_pb(data.distributionInfo, data.additionalDistributionInfo, event_dist);
+
+    var bg_width_step = $('#eventdistri_pb_background').width()/4.0;
+    $('#eventdistri_pb_min').width(bg_width_step*min_distri + 'px');
+    $('#eventdistri_pb_min').data("distribution", fill_distri_for_search(0, min_distri-1));
+    $('#eventdistri_pb_min').attr('aria-valuenow', min_distri*25);
+    $('#eventdistri_pb_min').css("background", "#ffc107");
+
+    $('#eventdistri_pb').width((event_dist)*25+'%');
+    $('#eventdistri_pb').data("distribution", fill_distri_for_search(0, event_dist-1));
+    $('#eventdistri_pb').attr('aria-valuenow', (event_dist-min_distri)*25);
+    $('#eventdistri_pb').css("background", "#28a745");
+
+    $('#eventdistri_pb_invalid').width((max_distri-event_dist)*25+'%');
+    $('#eventdistri_pb_invalid').data("distribution", fill_distri_for_search(event_dist, max_distri-1));
+    $('#eventdistri_pb_invalid').attr('aria-valuenow', (max_distri-event_dist)*25);
+    $('#eventdistri_pb_invalid').css("background", "#dc3545");
+
+    // SHARING GROUPS
+    var sgNum = data.additionalDistributionInfo[4].length;
+    var sgPerc = (sgNum/data.allSharingGroup.length)*100;
+    if (sgPerc > 0) {
+        $('#eventdistri_sg_pb').width(sgPerc+'%');
+        $('#eventdistri_sg_pb').tooltip({
+            title: "Distribution among sharing group: "+(sgNum +' / '+ data.allSharingGroup.length)
+        });
+        $('#eventdistri_sg_pb').data("distribution", '4' + (event_distribution==4 ? '|5' : ''));
+        $('#eventdistri_sg_pb').attr('aria-valuenow', sgPerc);
+        $('#eventdistri_sg_pb').css("background", "#7a86e0");
+    } else { // no sg, hide it and display
+        $('#eventdistri_sg_pb_background').text("Event not distributed to any sharing group");
+    }
+
+    $('.sharingGroup_pb_text').popover({
+        placement: 'bottom',
+        trigger: 'click',
+        title: 'Sharing group',
+        content: '<b>Distribution description:</b> ' + data.distributionInfo[4].desc + generate_additional_info(data.additionalDistributionInfo[4]) + '<div class="distributionInfo" style="height: 150px; width: 300px; position: relative; left: 25%;"><canvas class="distributionInfo" id="sg_distribution_graph_canvas" height="150px" width="300px"></canvas></div>',
+        container: 'body',
+        html: true,
+        template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title distributionInfo"></h3><div class="popover-content distributionInfo" style="white-space: pre-wrap"></div></div>'
+    })
+    .click(function() {
+        generate_pie_chart(data.sharingGroupRepartition, document.getElementById('sg_distribution_graph_canvas'));
+    });
+
+    // doughtnut
+    var doughnutColors = ['#ff0000', '#ff9e00', '#957200', '#008000', 'rgb(122, 134, 224)'];
+    var doughnut_dataset = [
+        {
+            label: "All",
+            data: data.event,
+            hidden: false,
+            backgroundColor: doughnutColors
+        },
+        {
+            label: "Attributes",
+            data: data.attribute,
+            hidden: false,
+            backgroundColor: doughnutColors
+        },
+        {
+            label: "Object attributes",
+            data: data.obj_attr,
+            hidden: false,
+            backgroundColor: doughnutColors
+        },
+
+    ];
+    var ctx = document.getElementById("distribution_graph_canvas");
+    ctx.onclick = function(evt) { clickHandlerGraph(evt); };
+
+    var count = 0;
+    for (var i=0, n=data.event.length; i < n; i++) {
+        count += data.event[i];
+    }
+    if (count > 0) {
+        distribution_chart = new Chart(ctx, {
+            type: 'doughnut',
+            data: {
+                labels: data.distributionInfo.map(function(elem, index) { return [elem.key]; }),
+                distribution: data.distributionInfo,
+                datasets: doughnut_dataset,
+            },
+            options: {
+                title: {
+                    display: false
+                },
+                animation: {
+                    duration: 500
+                },
+                tooltips: {
+                    callbacks: {
+                        label: function(item, data) {
+                            return data.datasets[item.datasetIndex].label
+                                + " - " + data.labels[item.index]
+                                + ": " + data.datasets[item.datasetIndex].data[item.index];
+                        }
+                    }
+                }
+            },
+        });
+    } else {
+        var canvas = ctx;
+        ctx = canvas.getContext("2d");
+        ctx.font = "30px Comic Sans MS";
+        ctx.textAlign = "center";
+        ctx.fillText("Event is empty", canvas.width/2, canvas.height/2);
+    }
+
+    // create checkboxes
+    var div = $('<div class="toBeCleared"></div>');
+    div.addClass('distribution_checkboxes_dataset');
+    var distri_graph = $('#eventdistri_graph');
+    var distriOffset = distri_graph.offset();
+    var distriHeight = distri_graph.height()/2;
+    div.css({left: '50px'});
+    for (var i in doughnut_dataset) {
+        var item = doughnut_dataset[i];
+        var label = $('<label></label>');
+        label.addClass('useCursorPointer');
+        label.css({'user-select': 'none'});
+        var checkbox = $('<input type="checkbox">');
+        checkbox.data('dataset-index', i);
+        checkbox.prop('checked', true);
+        checkbox.change(function(evt) {
+            var clickedIndex = $(this).data('dataset-index');
+            var isChecked = $(this).prop('checked');
+            distribution_chart.config.data.datasets[clickedIndex].hidden = !isChecked;
+            distribution_chart.update();
+        });
+        label.append(checkbox);
+        label.append(item.label);
+        div.append(label);
+    }
+    distri_graph.append(div);
+}
+
+function fetchDistributionData(callback) {
+    $.ajax({
+        url: "/events/"+"getDistributionGraph"+"/"+scope_id+"/event.json",
+        dataType: 'json',
+        type: 'post',
+        contentType: 'application/json',
+        data: JSON.stringify( payload ),
+        processData: false,
+        beforeSend: function (XMLHttpRequest) {
+            $(".loadingPopover").show();
+        },
+        success: function( data, textStatus, jQxhr ){
+            distributionData = data;
+            if (callback !== undefined) {
+                callback(data);
+            }
+        },
+        error: function( jqXhr, textStatus, errorThrown ){
+            console.log( errorThrown );
+        }
+    });
+}
+
+function drawBarChart(data) {
+    var csv = "scope,val\n";
+    var lineCount = 0;
+    data.event.forEach(function(d, i) {
+        var scope = data.distributionInfo[i].key;
+        var val = d;
+        csv += scope + "," + val + "\n";
+        lineCount++;
+    })
+    sparklineBar('#distribution_graph_bar', csv, lineCount);
+}
+
 $(document).ready(function() {
-	var pop = $('.distribution_graph').popover({
-		title: "<b>Distribution graph</b> [atomic event]",
-		html: true,
-		content: function() { return $('#distribution_graph_container').html(); },
-		template : '<div class="popover" role="tooltip" style="z-index: 1;"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content" style="padding-left: '+spanOffset_orig+'px; padding-right: '+spanOffset_orig*2+'px;"></div></div>'
-	});
+    var rightBtn = '<div style="float:right;"><span type="button" id="reloadDistributionGraph" title="Reload Distribution Graph" class="fa fa-refresh useCursorPointer" aria-hidden="true" style="margin-left: 5px;" onclick="fetchDistributionData(function(data) { construct_piechart(data); });"></span></div>';
+    var pop = $('.distribution_graph').popover({
+        title: "<b>Distribution graph</b> [atomic event]" + rightBtn,
+        html: true,
+        content: function() { return $('#distribution_graph_container').html(); },
+        template : '<div class="popover" role="tooltip" style="z-index: 1;"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content" style="padding-left: '+spanOffset_orig+'px; padding-right: '+spanOffset_orig*2+'px;"></div></div>'
+    }).on('shown.bs.popover', function(e) {
+        if (distributionData !== undefined) {
+            construct_piechart(distributionData);
+        } else {
+            fetchDistributionData(function(data) {
+                construct_piechart(data);
+            });
+        }
+    }).on('hide.bs.popover', function(e) {
+    });
 
-	$('body').on('mouseup', function(e) {
-		if(!$(e.target).hasClass('distributionInfo') && !($(e.target).hasClass('pbDistributionText') || $(e.target).hasClass('sharingGroup_pb_text'))) {
-			$('.pbDistributionText').popover('hide');
-			$('.sharingGroup_pb_text').popover('hide');
-		}
-	});
+    $('body').on('mouseup', function(e) {
+        if(!$(e.target).hasClass('distributionInfo') && !($(e.target).hasClass('pbDistributionText') || $(e.target).hasClass('sharingGroup_pb_text'))) {
+            $('.pbDistributionText').popover('hide');
+            $('.sharingGroup_pb_text').popover('hide');
+        }
+    });
 
-	$('.distribution_graph').click(function() {
-		if ($(this).data('shown') == 'true') {
-			$(this).data('shown', 'false');
-			return;
-		} else {
-			$(this).data('shown', 'true');
-		}
-		$.ajax({
-			url: "/events/"+"getDistributionGraph"+"/"+scope_id+"/event.json",
-			dataType: 'json',
-			type: 'post',
-			contentType: 'application/json',
-			data: JSON.stringify( payload ),
-			processData: false,
-			beforeSend: function (XMLHttpRequest) {
-				$(".loadingPopover").show();
-			},
-			success: function( data, textStatus, jQxhr ){
-				$(".loadingPopover").hide();
-
-				// DISTRIBUTION PROGRESSBAR
-				$('#eventdistri_pb_invalid').tooltip();
-				$('#eventdistri_pb').tooltip();
-				$('#eventdistri_pb_min').tooltip();
-
-				$('#eventdistri_pb_invalid').click(function(evt) { clickHandlerPb(evt); });
-				$('#eventdistri_pb').click(function(evt) { clickHandlerPb(evt); });
-				$('#eventdistri_pb_min').click(function(evt) { clickHandlerPb(evt); });
-				$('#eventdistri_sg_pb').click(function(evt) { clickHandlerPb(evt); });
-
-				// pb
-				var event_dist, min_distri, max_distri;
-				if (event_distribution == 4) { // if distribution is sharing group, overwrite default behavior
-					var event_dist = 1;
-					var min_distri = 0;
-					var max_distri = 0;
-				} else {
-					var event_dist = event_distribution+1; // +1 to reach the first level
-					var min_distri = get_minimum_distribution(data.event, event_dist)+1; // +1 to reach the first level
-					var max_distri = get_maximum_distribution(data.event)+1; // +1 to reach the first level
-				}
-				add_level_to_pb(data.distributionInfo, data.additionalDistributionInfo, event_dist);
-
-				var bg_width_step = $('#eventdistri_pb_background').width()/4.0;
-				$('#eventdistri_pb_min').width(bg_width_step*min_distri + 'px');
-				$('#eventdistri_pb_min').data("distribution", fill_distri_for_search(0, min_distri-1));
-				$('#eventdistri_pb_min').attr('aria-valuenow', min_distri*25);
-				$('#eventdistri_pb_min').css("background", "#ffc107");
-
-				$('#eventdistri_pb').width((event_dist)*25+'%');
-				$('#eventdistri_pb').data("distribution", fill_distri_for_search(0, event_dist-1));
-				$('#eventdistri_pb').attr('aria-valuenow', (event_dist-min_distri)*25);
-				$('#eventdistri_pb').css("background", "#28a745");
-
-				$('#eventdistri_pb_invalid').width((max_distri-event_dist)*25+'%');
-				$('#eventdistri_pb_invalid').data("distribution", fill_distri_for_search(event_dist, max_distri-1));
-				$('#eventdistri_pb_invalid').attr('aria-valuenow', (max_distri-event_dist)*25);
-				$('#eventdistri_pb_invalid').css("background", "#dc3545");
-
-				// SHARING GROUPS
-				var sgNum = data.additionalDistributionInfo[4].length;
-				var sgPerc = (sgNum/data.allSharingGroup.length)*100;
-				if (sgPerc > 0) {
-					$('#eventdistri_sg_pb').width(sgPerc+'%');
-					$('#eventdistri_sg_pb').tooltip({
-						title: "Distribution among sharing group: "+(sgNum +' / '+ data.allSharingGroup.length)
-					});
-					$('#eventdistri_sg_pb').data("distribution", '4' + (event_distribution==4 ? '|5' : ''));
-					$('#eventdistri_sg_pb').attr('aria-valuenow', sgPerc);
-					$('#eventdistri_sg_pb').css("background", "#7a86e0");
-				} else { // no sg, hide it and display
-					$('#eventdistri_sg_pb_background').text("Event not distributed to any sharing group");
-				}
-
-				$('.sharingGroup_pb_text').popover({
-					placement: 'bottom',
-					trigger: 'click',
-					title: 'Sharing group',
-					content: '<b>Distribution description:</b> ' + data.distributionInfo[4].desc + generate_additional_info(data.additionalDistributionInfo[4]),
-					container: 'body',
-					html: true,
-					template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title distributionInfo"></h3><div class="popover-content distributionInfo" style="white-space: pre-wrap"></div></div>'
-				});
-
-				// doughtnut
-				var doughnutColors = ['#ff0000', '#ff9e00', '#957200', '#008000', 'rgb(122, 134, 224)'];
-				var doughnut_dataset = [
-					{
-						label: "All",
-						data: data.event,
-						hidden: false,
-						backgroundColor: doughnutColors
-					},
-					{
-						label: "Attributes",
-						data: data.attribute,
-						hidden: false,
-						backgroundColor: doughnutColors
-					},
-					{
-						label: "Object attributes",
-						data: data.obj_attr,
-						hidden: false,
-						backgroundColor: doughnutColors
-					},
-
-				];
-				var ctx = document.getElementById("distribution_graph_canvas");
-				ctx.onclick = function(evt) { clickHandlerGraph(evt); };
-				distribution_chart = new Chart(ctx, {
-					type: 'doughnut',
-					data: {
-						labels: data.distributionInfo.map(function(elem, index) { return [elem.key]; }),
-						distribution: data.distributionInfo,
-						datasets: doughnut_dataset,
-					},
-					options: {
-						title: {
-							display: false
-						},
-						animation: {
-							duration: 500
-						},
-						tooltips: {
-							callbacks: {
-								label: function(item, data) {
-									return data.datasets[item.datasetIndex].label
-										+ " - " + data.labels[item.index]
-										+ ": " + data.datasets[item.datasetIndex].data[item.index];
-								}
-							}
-						}
-					},
-				});
-
-				// create checkboxes
-				var div = $('<div></div>');
-				div.addClass('distribution_checkboxes_dataset');
-				var distri_graph = $('#eventdistri_graph');
-				var distriOffset = distri_graph.offset();
-				var distriHeight = distri_graph.height()/2;
-				div.css({left: '50px'});
-				for (var i in doughnut_dataset) {
-					var item = doughnut_dataset[i];
-					var label = $('<label></label>');
-					label.addClass('useCursorPointer');
-					label.css({'user-select': 'none'});
-					var checkbox = $('<input type="checkbox">');
-					checkbox.data('dataset-index', i);
-					checkbox.prop('checked', true);
-					checkbox.change(function(evt) {
-						var clickedIndex = $(this).data('dataset-index');
-						var isChecked = $(this).prop('checked');
-						distribution_chart.config.data.datasets[clickedIndex].hidden = !isChecked;
-						distribution_chart.update();
-					});
-					label.append(checkbox);
-					label.append(item.label);
-					div.append(label);
-				}
-				distri_graph.append(div);
-			},
-			error: function( jqXhr, textStatus, errorThrown ){
-				console.log( errorThrown );
-			}
-		});
-	});
+    fetchDistributionData(function(data) {
+        drawBarChart(data);
+        $('#showAdvancedSharingButton').distributionNetwork({
+            event_distribution: event_distribution,
+            distributionData: data,
+            scope_id: scope_id
+        });
+    });
 });
diff --git a/app/webroot/js/misp.js b/app/webroot/js/misp.js
index 4d31a50d3..74ad090f9 100644
--- a/app/webroot/js/misp.js
+++ b/app/webroot/js/misp.js
@@ -579,9 +579,11 @@ function submitForm(type, id, field, context) {
 
 function quickSubmitTagForm(selected_tag_ids, addData) {
     var event_id = addData.id;
+    var formData = fetchFormDataAjax("/events/addTag/" + event_id);
+    $('#temp').html(formData);
     $('#EventTag').val(JSON.stringify(selected_tag_ids));
     $.ajax({
-        data: $('#EventSelectTagForm').closest("form").serialize(),
+        data: $('#EventAddTagForm').serialize(),
         beforeSend: function (XMLHttpRequest) {
             $(".loading").show();
         },
@@ -596,6 +598,7 @@ function quickSubmitTagForm(selected_tag_ids, addData) {
             loadGalaxies(event_id, 'event');
         },
         complete:function() {
+            $('#temp').empty();
             $("#popover_form").fadeOut();
             $("#gray_out").fadeOut();
             $(".loading").hide();
@@ -603,17 +606,20 @@ function quickSubmitTagForm(selected_tag_ids, addData) {
         type:"post",
         url:"/events/addTag/" + event_id
     });
+    $('#temp').remove();
     return false;
 }
 
 function quickSubmitAttributeTagForm(selected_tag_ids, addData) {
     var attribute_id = addData.id;
+    var formData = fetchFormDataAjax("/attributes/addTag/" + attribute_id);
+    $('#temp').html(formData);
     $('#AttributeTag').val(JSON.stringify(selected_tag_ids));
     if (attribute_id == 'selected') {
         $('#AttributeAttributeIds').val(getSelected());
     }
     $.ajax({
-        data: $('#AttributeSelectTagForm').closest("form").serialize(),
+        data: $('#AttributeAddTagForm').serialize(),
         beforeSend: function (XMLHttpRequest) {
             $(".loading").show();
         },
@@ -639,14 +645,17 @@ function quickSubmitAttributeTagForm(selected_tag_ids, addData) {
         type:"post",
         url:"/attributes/addTag/" + attribute_id
     });
+    $('#temp').remove();
     return false;
 }
 
 function quickSubmitTagCollectionTagForm(selected_tag_ids, addData) {
     var tag_collection_id = addData.id;
+    var formData = fetchFormDataAjax("/tag_collections/addTag/" + tag_collection_id);
+    $('#temp').html(formData);
     $('#TagCollectionTag').val(JSON.stringify(selected_tag_ids));
     $.ajax({
-        data: $('#TagCollectionSelectTagForm').closest("form").serialize(),
+        data: $('#TagCollectionAddTagForm').serialize(),
         beforeSend: function (XMLHttpRequest) {
             $(".loading").show();
         },
@@ -666,6 +675,7 @@ function quickSubmitTagCollectionTagForm(selected_tag_ids, addData) {
         type:"post",
         url:"/tag_collections/addTag/" + tag_collection_id
     });
+    $('#temp').remove();
     return false;
 }
 
@@ -877,6 +887,20 @@ function addSelectedTaxonomies(taxonomy) {
     });
 }
 
+function hideSelectedTags(taxonomy) {
+	$.get("/taxonomies/taxonomyMassHide/"+taxonomy, function(data) {
+		$("#confirmation_box").html(data);
+		openPopup("#confirmation_box");
+	});
+}
+
+function unhideSelectedTags(taxonomy) {
+	$.get("/taxonomies/taxonomyMassUnhide/"+taxonomy, function(data) {
+		$("#confirmation_box").html(data);
+		openPopup("#confirmation_box");
+	});
+}
+
 function submitMassTaxonomyTag() {
     $('#PromptForm').submit();
 }
@@ -2996,12 +3020,12 @@ function syncUserSelected() {
 }
 
 function filterAttributes(filter, id) {
-    url = "/events/viewEventAttributes/" + id + "/attributeFilter:" + filter;
+    url = "/events/viewEventAttributes/" + id;
     if(filter === 'value'){
         filter = $('#quickFilterField').val().trim();
         url += filter.length > 0 ? "/searchFor:" + filter : "";
     } else if(filter !== 'all') {
-        url += "/filterColumnsOverwrite:" + filter;
+        url += "/attributeFilter:" + filter
         filter = $('#quickFilterField').val().trim();
         url += filter.length > 0 ? "/searchFor:" + filter : "";
     }
@@ -3549,12 +3573,15 @@ function addGalaxyListener(id) {
 function quickSubmitGalaxyForm(cluster_ids, additionalData) {
     var target_id = additionalData['target_id'];
     var scope = additionalData['target_type'];
+    var formData = fetchFormDataAjax("/galaxies/attachMultipleClusters/" + target_id + "/" + scope);
+    console.log(formData);
+    $('#temp').html(formData);
     $('#GalaxyTargetIds').val(JSON.stringify(cluster_ids));
     if (target_id == 'selected') {
         $('#AttributeAttributeIds').val(getSelected());
     }
     $.ajax({
-        data: $('#GalaxySelectClusterForm').closest("form").serialize(),
+        data: $('#GalaxyAttachMultipleClustersForm').serialize(),
         beforeSend: function (XMLHttpRequest) {
             $(".loading").show();
         },
@@ -3582,6 +3609,7 @@ function quickSubmitGalaxyForm(cluster_ids, additionalData) {
         type:"post",
         url: "/galaxies/attachMultipleClusters/" + target_id + "/" + scope
     });
+    $('#temp').remove();
     return false;
 }
 
@@ -3984,6 +4012,173 @@ function liveFilter() {
     }
 }
 
+function sparklineBar(elemId, data, lineCount) {
+    data = d3.csv.parse(data);
+    var y_max = 0;
+    data.forEach(function(e) {
+        e = parseInt(e.val);
+        y_max = e > y_max ? e : y_max;
+    });
+    var WIDTH      = 50;
+    var HEIGHT     = 25;
+    var DATA_COUNT = lineCount;
+    var BAR_WIDTH  = (WIDTH - DATA_COUNT) / DATA_COUNT;
+    var x    = d3.scale.linear().domain([0, DATA_COUNT]).range([0, WIDTH]);
+    var y    = d3.scale.linear().domain([0, y_max]).range([0, HEIGHT]);
+
+    var distributionGraphBarTooltip = d3.select("body").append("div")
+        .attr("class", "distributionGraphBarTooltip")
+        .style("opacity", 0);
+
+    var svg = d3.select(elemId).append('svg')
+      .attr('width', WIDTH)
+      .attr('height', HEIGHT)
+      .append('g');
+    svg.selectAll('.bar').data(data)
+      .enter()
+      .append('g')
+        .attr('title', function(d, i) { return d.scope + ': ' + d.val })
+        .attr('class', 'DGbar')
+      .append('rect')
+        .attr('class', 'bar')
+        .attr('x', function(d, i) { return x(i); })
+        .attr('y', function(d, i) { return HEIGHT - y(d.val); })
+        .attr('width', BAR_WIDTH)
+        .attr('height', function(d, i) { return y(d.val); })
+        .attr('fill', '#3465a4');
+
+        $('.DGbar').tooltip({container: 'body'});
+}
+
+function generic_picker_move(scope, direction) {
+    if (direction === 'right') {
+        $('#' + scope + 'Left option:selected').remove().appendTo('#' + scope + 'Right');
+    } else {
+        $('#' + scope + 'Right option:selected').remove().appendTo('#' + scope + 'Left');
+    }
+}
+
+
+function submit_feed_overlap_tool(feedId) {
+    var result = {"Feed": [], "Server": []};
+    $('#FeedLeft').children().each(function() {
+        result.Feed.push($(this).val());
+    });
+    $('#ServerLeft').children().each(function() {
+        result.Server.push($(this).val());
+    });
+    $.ajax({
+        beforeSend: function (XMLHttpRequest) {
+            $(".loading").show();
+        },
+        data: result,
+        success:function (data, textStatus) {
+            if (!isNaN(data)) {
+                $('#feed_coverage_bar').text(data + '%');
+                $('#feed_coverage_bar').css('width', data + '%');
+            } else {
+                handleGenericAjaxResponse({'saved':false, 'errors':['Something went wrong. Received response not in the expected format.']});
+            }
+        },
+        error:function() {
+            handleGenericAjaxResponse({'saved':false, 'errors':['Could not complete the requested action.']});
+        },
+        complete:function() {
+            $(".loading").hide();
+        },
+        type:"post",
+        cache: false,
+        url:"/feeds/feedCoverage/" + feedId,
+    });
+}
+
+function populate_rest_history(scope) {
+    if (scope === 'history') {
+        scope = '';
+        var container_class = 'history_queries';
+    } else {
+        scope = '1';
+        var container_class = 'bookmarked_queries';
+    }
+    $.get("/rest_client_history/index/" + scope, function(data) {
+        $('.' + container_class).html(data);
+    });
+}
+
+function loadRestClientHistory(k, data_container) {
+    $('#ServerMethod').val(data_container[k]['RestClientHistory']['http_method']);
+    $('#ServerUseFullPath').prop("checked", data_container[k]['RestClientHistory']['use_full_path']);
+    $('#ServerShowResult').prop("checked", data_container[k]['RestClientHistory']['show_result']);
+    $('#ServerSkipSslValidation').prop("checked", data_container[k]['RestClientHistory']['skip_ssl_validation']);
+    $('#ServerUrl').val(data_container[k]['RestClientHistory']['url']);
+    $('#ServerHeader').val(data_container[k]['RestClientHistory']['headers']);
+    $('#ServerBody').val(data_container[k]['RestClientHistory']['body']);
+    toggleRestClientBookmark();
+}
+
+function toggleRestClientBookmark() {
+    if ($('#ServerBookmark').prop("checked") == true) {
+        $('#bookmark-name').css('display', 'block');
+    } else {
+        $('#bookmark-name').css('display', 'none');
+    }
+}
+
+function removeRestClientHistoryItem(id) {
+    $.ajax({
+        data: '[]',
+        success:function (data, textStatus) {
+            populate_rest_history('bookmark');
+            populate_rest_history('history');
+        },
+        error:function() {
+            handleGenericAjaxResponse({'saved':false, 'errors':['Request failed due to an unexpected error.']});
+        },
+        type:"post",
+        cache: false,
+        url: '/rest_client_history/delete/' + id,
+    });
+}
+
+function changeTaxonomyRequiredState(checkbox) {
+    var checkbox_state = $(checkbox).is(":checked");
+    var taxonomy_id = $(checkbox).data('taxonomy-id');
+    var formData = fetchFormDataAjax('/taxonomies/toggleRequired/' + taxonomy_id);
+    $.ajax({
+        data: $(formData).serialize(),
+        success:function (data, textStatus) {
+            handleGenericAjaxResponse({'saved':true, 'success':['Taxonomy\'s required state toggled.']});
+        },
+        error:function() {
+            $(checkbox).prop('checked', !$(checkbox).prop('checked'));
+            handleGenericAjaxResponse({'saved':false, 'errors':['Could not toggle the required state of the taxonomy.']});
+        },
+        async:"false",
+        type:"post",
+        cache: false,
+        url: '/taxonomies/toggleRequired/' + taxonomy_id,
+    });
+    formData = false;
+}
+
+function fetchFormDataAjax(url) {
+    var formData = false;
+    $.ajax({
+        data: '[]',
+        success:function (data, textStatus) {
+            formData = data;
+        },
+        error:function() {
+            handleGenericAjaxResponse({'saved':false, 'errors':['Request failed due to an unexpected error.']});
+        },
+        async: false,
+        type:"get",
+        cache: false,
+        url: url
+    });
+    return formData;
+}
+
 (function(){
     "use strict";
     $(".datepicker").datepicker({
diff --git a/app/webroot/js/network-distribution-graph.js b/app/webroot/js/network-distribution-graph.js
new file mode 100644
index 000000000..0d17d3236
--- /dev/null
+++ b/app/webroot/js/network-distribution-graph.js
@@ -0,0 +1,612 @@
+/*
+*
+*/
+
+(function(factory) {
+        "use strict";
+        if (typeof define === 'function' && define.amd) {
+            define(['jquery'], factory);
+        } else if (window.jQuery && !window.jQuery.fn.DistributionNetwork) {
+            factory(window.jQuery);
+        }
+    }
+    (function($) {
+        'use strict';
+
+        // DistributionNetwork object
+        var DistributionNetwork = function(container, options) {
+            this._default_options = {
+                network_options: {
+                    width: '800px',
+                    height: '759px',
+                    layout: {randomSeed: 0},
+                    edges: {
+                        arrowStrikethrough: false,
+                        arrows: {
+                            to: {enabled: true, scaleFactor:1, type:'arrow'},
+                        },
+                        shadow: {
+                            enabled: true,
+                            size: 7,
+                            x: 3,
+                            y: 3
+                        }
+                    },
+                    physics:{
+                        barnesHut: {
+                            gravitationalConstant: -10000,
+                            centralGravity: 0.3,
+                            springLength: 150,
+                            springConstant: 0.02,
+                            damping: 0.09,
+                            avoidOverlap: 0
+                        },
+                        repulsion: {
+                            centralGravity: 0.2,
+                            springLength: 200,
+                            springConstant: 0.02,
+                            nodeDistance: 200,
+                            damping: 0.15
+                        },
+
+                        solver: 'barnesHut'
+                    },
+                    nodes: {
+                        shadow: {
+                            enabled: true,
+                            size: 7,
+                            x: 3,
+                            y: 3
+                        }
+                    },
+                    groups: {
+                        'root': {
+                            shape: 'icon',
+                            icon: {
+                                face: 'FontAwesome',
+                                code: '\uf10c',
+                                color: '#000000',
+                                size: 50
+                            },
+                            font: {size: 30},
+                            color: '#000000',
+                        },
+                        'org-only': {
+                            shape: 'icon',
+                            icon: {
+                                face: 'FontAwesome',
+                                code: '\uf2c2',
+                                color: '#ff0000',
+                                size: 30
+                            },
+                            font: {
+                                size: 14, // px
+                                color: '#ff0000',
+                                background: 'rgba(255, 255, 255, 0.7)'
+                            },
+                            color: '#ff0000',
+                        },
+                        'root-this-community': {
+                            shape: 'icon',
+                            icon: {
+                                face: 'FontAwesome',
+                                code: '\uf1e1',
+                                color: '#ff9725',
+                                size: 70
+                            },
+                            font: {
+                                size: 18, // px
+                                color: '#ff9725',
+                                background: 'rgba(255, 255, 255, 0.7)'
+                            },
+                            color: '#ff9725',
+                        },
+                        'this-community': {
+                            font: {color: 'white'},
+                            color: '#ff9725',
+                            shape: 'box',
+                            margin: 3
+                        },
+                        'otherOrg': {
+                            shape: 'ellipse',
+                            font: {color: 'white', size: 24},
+                            color: '#ff9725',
+                            margin: 3
+                        },
+                        'root-connected-community': {
+                            shape: 'icon',
+                            icon: {
+                                face: 'FontAwesome',
+                                code: '\uf0e8',
+                                color: '#9b6e1b',
+                                size: 70
+                            },
+                            font: {
+                                size: 18, // px
+                                color: '#9b6e1b',
+                                background: 'rgba(255, 255, 255, 0.7)'
+                            },
+                            color: '#9b6e1b',
+                        },
+                        'connected-community': {
+                            shape: 'image',
+                            image: '/img/orgs/MISP.png'
+                        },
+                        'web': {
+                            shape: 'icon',
+                            icon: {
+                                face: 'FontAwesome',
+                                code: '\uf0ac',
+                                color: '#007d20',
+                                size: 70
+                            },
+                            font: {
+                                size: 18, // px
+                                color: '#007d20',
+                                background: 'rgba(255, 255, 255, 0.7)'
+                            },
+                            color: '#007d20',
+                        },
+                        'root-sharing-group': {
+                            shape: 'icon',
+                            icon: {
+                                face: 'FontAwesome',
+                                code: '\uf0c0',
+                                color: '#1369a0',
+                                size: 70
+                            },
+                            font: {
+                                size: 18, // px
+                                color: '#1369a0',
+                                background: 'rgba(255, 255, 255, 0.7)'
+                            },
+                            color: '#1369a0',
+                        }
+                    }
+                },
+                EDGE_LENGTH_HUB: 300,
+                THRESHOLD_ORG_NUM: 30
+            };
+
+            this.container = $(container);
+            this._validateOptions(options);
+
+            this.network_wrapper = false;
+            this.options = $.extend({}, this._default_options, options);
+
+            this.event_distribution = this.options.event_distribution;
+            this.scope_id = this.options.scope_id;
+            this.distributionData = this.options.distributionData;
+            this.network;
+            this.nodes_distri;
+            this.edges_distri;
+            this.cacheAddedOrgName = {};
+
+            this._constructUI();
+            this._registerListener();
+        };
+
+        DistributionNetwork.prototype = {
+            constructor: DistributionNetwork,
+
+            _validateOptions: function(options) {
+                if (options.event_distribution === undefined) {
+                    // try to fetch is from the container
+                    var event_distribution = this.container.data('event-distribution');
+                    var event_distribution_name = this.container.data('event-distribution-name');
+                    if (event_distribution !== undefined && event_distribution_name !== undefined) {
+                        options.event_distribution = event_distribution;
+                        options.event_distribution_name = event_distribution_name;
+                        this._adjust_sharing_numbers(options)
+                    } else {
+                        throw "Event distribution or Org not set";
+                    }
+                }
+
+                if (options.distributionData === undefined) {
+                    throw "Distribution data not set";
+                }
+                if (options.scope_id === undefined) {
+                    // try to fetch is from the container
+                    var scope_id = this.container.data('scope-id');
+                    if (scope_id !== undefined) {
+                        options.scope_id = scope_id;
+                    } else {
+                        throw "Scope id is not set";
+                    }
+                }
+            },
+
+            _adjust_sharing_numbers: function (options) {
+                var sum = options.distributionData.event.reduce(function(pv, cv) { return pv + cv; }, 0);
+                if (sum == 0) { // if event does not contain anything (or we don't know about its content)
+                    options.distributionData.event[options.event_distribution] = 1;
+                }
+                if (options.event_distribution == 4) {
+                    options.distributionData.additionalDistributionInfo[4].push(options.event_distribution_name);
+                }
+            },
+
+            _registerListener: function() {
+                var that = this;
+                this.container.click(function() {
+                    $('#sharingNetworkWrapper').toggle('slide', {direction: 'right'}, 300);
+                    that._construct_network();
+
+                    $('body').off('keyup.distributionNetwork').on('keyup.distributionNetwork', function(e) {
+                        if (e.keyCode == 27) { // ESC
+                            $('body').off('keyup.distributionNetwork');
+                            that.dismissNetwork();
+                        }
+                    });
+                });
+
+            },
+
+            dismissNetwork: function() {
+                $('#sharingNetworkWrapper').hide('slide', {direction: 'right'}, 300);
+            },
+
+            _constructUI: function() {
+                var that = this;
+                if ($('#sharingNetworkWrapper').length > 0) {
+                    return; // Wrapper already exists
+                }
+
+                var allow_interactive_picking = $('#attributes_div table tr').length > 0;
+
+                var $div = '<div id="sharingNetworkWrapper" class="advancedSharingNetwork hidden">'
+                    + '<div class="eventgraph_header" style="border-radius: 5px; display: flex;">'
+                    + '<it class="fa fa-circle-o" style="margin: auto 10px; font-size: x-large"></it>'
+                    + '<input type="text" id="sharingNetworkTargetId" class="center-in-network-header network-typeahead" style="width: 200px;" disabled></input>';
+                if (allow_interactive_picking) {
+                    $div += '<div class="form-group" style="margin: auto 10px;"><div class="checkbox">'
+                        + '<label style="user-select: none;"><input id="interactive_picking_mode" type="checkbox" title="Click on a element to see how it is distributed" style="margin-top: 4px;">Enable interactive picking mode</label>'
+                        + '</div></div>'
+                }
+                $div += '<select type="text" id="sharingNetworkOrgFinder" class="center-in-network-header network-typeahead sharingNetworkOrgFinder" style="width: 200px;"></select>'
+                    + '<button id="closeButton" type="button" class="close" style="margin: 1px 5px; right: 0px; position: absolute;">×</button>'
+                    + '</div><div id="advancedSharingNetwork"></div></div>';
+                $div = $($div);
+                this.network_wrapper = $div;
+                $div.find('#closeButton').click(function() {
+                    that.dismissNetwork();
+                });
+                $('body').append($div);
+            },
+
+            _construct_network: function(target_distribution, scope_text, overwriteSg) {
+                var that = this;
+                if (this.network !== undefined) {
+                    this.network.destroy();
+                    this.cacheAddedOrgName = {};
+                }
+                if (scope_text == undefined) {
+                    scope_text = 'Event ' + this.options.scope_id;
+                }
+                $('#sharingNetworkTargetId').val(scope_text);
+
+                this.nodes_distri = new vis.DataSet([
+                    {id: 'root', group: 'root', label: scope_text, x: 0, y: 0, fixed: true, mass: 20},
+                    {id: this.distributionData.additionalDistributionInfo[0][0], label: this.distributionData.additionalDistributionInfo[0][0], group: 'org-only'},
+
+                ]);
+                this.edges_distri = new vis.DataSet([
+                    {from: 'root', to: this.distributionData.additionalDistributionInfo[0][0], length: 30, width: 3},
+                ]);
+                if (target_distribution === undefined || target_distribution == 5) {
+                    target_distribution = this.event_distribution;
+                }
+
+                if (target_distribution !== 0) {
+                    // Event always restrict propagation (sharing group is a special case)
+                    var temp_target_disti = target_distribution;
+                    if (target_distribution !== 4 && temp_target_disti >= this.event_distribution) {
+                        while (temp_target_disti >= this.event_distribution) {
+                            var toID = false;
+                            switch (temp_target_disti) {
+                                case 0:
+                                    break;
+                                case 1:
+                                    toID = 'this-community';
+                                    break;
+                                case 2:
+                                    toID = 'connected-community';
+                                    break;
+                                case 3:
+                                    toID = 'all-community';
+                                    break;
+                                case 4:
+                                    toID = 'sharing-group';
+                                    break;
+                                default:
+                                    break;
+                            }
+                            var edgeData = {from: 'root', to: toID, width: 3};
+                            if (temp_target_disti != this.event_distribution) {
+                                edgeData.label = 'X';
+                                edgeData.title = 'The distribution of the Event restricts the distribution level of this element';
+                                edgeData.font = {
+                                    size: 50,
+                                    color: '#ff0000',
+                                    strokeWidth: 6,
+                                    strokeColor: '#ff0000'
+                                };
+                            }
+                            if (toID !== false) {
+                                this.edges_distri.add(edgeData);
+                            }
+                            temp_target_disti--;
+                        }
+                    } else {
+                        switch (temp_target_disti) {
+                            case 0:
+                                break;
+                            case 1:
+                                toID = 'this-community';
+                                break;
+                            case 2:
+                                toID = 'connected-community';
+                                break;
+                            case 3:
+                                toID = 'all-community';
+                                break;
+                            case 4:
+                                toID = 'sharing-group';
+                                break;
+                            default:
+                                break;
+                        }
+                        var edgeData = {from: 'root', to: toID, width: 3};
+                        if (toID !== false) {
+                            this.edges_distri.add(edgeData);
+                        }
+                    }
+                }
+
+                var nodesToAdd = [];
+                var edgesToAdd = [];
+                this.cacheAddedOrgName[this.distributionData.additionalDistributionInfo[0][0]] = 1;
+
+                // Community
+                if (target_distribution >= 1 && target_distribution != 4
+                    && (this.distributionData.event[1] > 0 || this.distributionData.event[2] > 0 || this.distributionData.event[3] > 0)
+                ) {
+                    nodesToAdd.push({id: 'this-community', label: 'This community', group: 'root-this-community'});
+                    this._inject_this_community_org(nodesToAdd, edgesToAdd, this.distributionData.additionalDistributionInfo[1], 'this-community', 'this-community');
+                }
+                // Connected Community
+                if (target_distribution >= 2 && target_distribution != 4
+                    && (this.distributionData.event[2] > 0 || this.distributionData.event[3] > 0)
+                ) {
+                    nodesToAdd.push({id: 'connected-community', label: 'Connected communities', group: 'root-connected-community'});
+                    this.distributionData.additionalDistributionInfo[2].forEach(function(orgName) {
+                        if (orgName === 'This community') {
+                            edgesToAdd.push({from: 'connected-community', to: 'this-community', length: that.options.EDGE_LENGTH_HUB});
+                        } else {
+                            nodesToAdd.push({
+                                id: 'connected-community_' + orgName,
+                                label: orgName,
+                                group: 'connected-community'
+                            });
+                            edgesToAdd.push({from: 'connected-community', to: 'connected-community_' + orgName});
+                        }
+                    });
+                }
+
+                // All Community
+                if (target_distribution >= 3 && target_distribution != 4
+                    && this.distributionData.event[3] > 0
+                ) {
+                    nodesToAdd.push({id: 'all-community', label: 'All communities', group: 'web'});
+                    this.distributionData.additionalDistributionInfo[3].forEach(function(orgName) {
+                        if (orgName === 'This community') {
+                            edgesToAdd.push({from: 'all-community', to: 'this-community', length: that.options.EDGE_LENGTH_HUB});
+                        } else if (orgName === 'All other communities') {
+                            edgesToAdd.push({from: 'all-community', to: 'connected-community', length: that.options.EDGE_LENGTH_HUB});
+                        }
+                    });
+                }
+                // Sharing Group
+                if (this.distributionData.event[4] > 0) {
+                    this.distributionData.allSharingGroup.forEach(function(sg) {
+                        var sgName = sg.SharingGroup.name;
+                        if (overwriteSg === undefined) { // if overwriteSg not set, use the one from the event
+                            overwriteSg = that.distributionData.additionalDistributionInfo[4];
+                        }
+                        if (overwriteSg.indexOf(sgName) == -1) {
+                            return true;
+                        }
+
+                        nodesToAdd.push({
+                            id: 'sharing-group_' + sgName,
+                            label: sgName,
+                            group: 'root-sharing-group'
+                        });
+                        edgesToAdd.push({from: 'root', to: 'sharing-group_' + sgName, width: 3});
+                        sg.SharingGroupOrg.forEach(function(org) {
+                            var sgOrgName = org.Organisation.name;
+                            if (that.cacheAddedOrgName[sgOrgName] === undefined) {
+                                nodesToAdd.push({
+                                    id: sgOrgName,
+                                    label: sgOrgName,
+                                    group: 'sharing-group'
+                                });
+                                that.cacheAddedOrgName[sgOrgName] = 1;
+                            }
+                            edgesToAdd.push({
+                                from: 'sharing-group_' + sgName,
+                                to: sgOrgName,
+                                arrows: {
+                                    to: { enabled: false }
+                                },
+                                color: { opacity: 0.4 }
+                            });
+                        });
+                    });
+                }
+
+                var options = '<option></option>';
+                $('#sharingNetworkOrgFinder').empty();
+                Object.keys(this.cacheAddedOrgName).forEach(function(org) {
+                    options += '<option value="'+org+'">'+org+'</option>';
+                });
+                $('#sharingNetworkOrgFinder').append(options)
+                .trigger('chosen:updated')
+                .chosen({
+                    inherit_select_classes: true,
+                    no_results_text: "Focus to an organisation",
+                    placeholder_text_single: "Focus to an organisation",
+                    allow_single_deselect: true
+                })
+                .off('change')
+                .on('change', function(evt, params) {
+                    if (this.value !== '') {
+                        if (that.nodes_distri.get(this.value) !== null) {
+                            that.network.focus(this.value, {animation: true});
+                            that.network.selectNodes([this.value]);
+                        }
+                    } else {
+                        that.network.fit({animation: true})
+                    }
+                });
+
+                this.nodes_distri.add(nodesToAdd);
+                this.edges_distri.add(edgesToAdd);
+                var data = { nodes: this.nodes_distri, edges: this.edges_distri };
+                this.network = new vis.Network(document.getElementById('advancedSharingNetwork'), data, this.options.network_options);
+
+                this.network.on("dragStart", function (params) {
+                    params.nodes.forEach(function(nodeId) {
+                        that.nodes_distri.update({id: nodeId, fixed: {x: false, y: false}});
+                    });
+                });
+                this.network.on("dragEnd", function (params) {
+                    params.nodes.forEach(function(nodeId) {
+                        that.nodes_distri.update({id: nodeId, fixed: {x: true, y: true}});
+                    });
+                });
+
+                $('#interactive_picking_mode').off('change').on('change', function(e) {
+                    var target_id = $(this).val();
+                    if (this.checked) {
+                        that._toggleRowListener(true);
+                    } else {
+                        that._toggleRowListener(false);
+                        that._construct_network(this.event_distribution)
+                    }
+                });
+            },
+
+            _toggleRowListener: function(toAdd) {
+                var that = this;
+                if (toAdd) {
+                    var $table = $('#attributes_div table tr');
+                    if ($table.length == 0) {
+                        return;
+                    }
+                    $table.off('click.advancedSharing').on('click.advancedSharing', function() {
+                        var $row = $(this);
+                        var clicked_type = $row.attr('id').split('_')[0];
+                        var clicked_id = $row.attr('id').split('_')[1];
+                        var $dist_cell = $row.find('div').filter(function() {
+                            return $(this).attr('id') !== undefined && $(this).attr('id').includes(clicked_id+'_distribution');
+                        });
+
+                        var distribution_value;
+                        var overwriteSg;
+                        switch ($dist_cell.text().trim()) {
+                            case 'Organisation':
+                                distribution_value = 0;
+                                break;
+                            case 'Community':
+                                distribution_value = 1;
+                                break;
+                            case 'Connected':
+                                distribution_value = 2;
+                                break;
+                            case 'All':
+                                distribution_value = 3;
+                                break;
+                            case 'Inherit':
+                                distribution_value = 5;
+                                if (that.event_distribution == 4) {
+                                    overwriteSg = that.event_distribution_text.trim();
+                                }
+                                break;
+                            default:
+                                distribution_value = 4;
+                                overwriteSg = $dist_cell.text().trim();
+                                break
+                        }
+                        that._construct_network(distribution_value, clicked_type+' '+clicked_id, [overwriteSg]);
+                    });
+                } else {
+                    $('#attributes_div table tr').off('click.advancedSharing');
+                }
+            },
+
+            _inject_this_community_org: function(nodesToAdd, edgesToAdd, orgs, group, root) {
+                var that = this;
+                for (var i=0; i<orgs.length; i++) {
+                    if (i > this.options.THRESHOLD_ORG_NUM) {
+                        nodesToAdd.push({
+                            id: 'OthersOrgRemaining',
+                            label: (orgs.length - i) + " Organisations remaining",
+                            group: 'otherOrg',
+                            size: 50,
+                        });
+                        that.cacheAddedOrgName[orgName] = 1;
+                        edgesToAdd.push({
+                            from: root,
+                            to: 'OthersOrgRemaining',
+                            arrows: {
+                                to: { enabled: false }
+                            },
+                            color: { opacity: 0.4 }
+                        });
+                        break;
+                    } else {
+                        var orgName = orgs[i];
+                        if (that.cacheAddedOrgName[orgName] === undefined) {
+                            nodesToAdd.push({
+                                id: orgName,
+                                label: orgName,
+                                group: group
+                            });
+                            that.cacheAddedOrgName[orgName] = 1;
+                        }
+                        edgesToAdd.push({
+                            from: root,
+                            to: orgName,
+                            arrows: {
+                                to: { enabled: false }
+                            },
+                            color: { opacity: 0.4 }
+                        });
+                    }
+                }
+            },
+
+        };
+
+        $.distributionNetwork = DistributionNetwork;
+        $.fn.distributionNetwork = function(option) {
+            var pickedArgs = arguments;
+
+            return this.each(function() {
+                var $this = $(this),
+                    inst = $this.data('distributionNetwork'),
+                    options = ((typeof option === 'object') ? option : {});
+                if ((!inst) && (typeof option !== 'string')) {
+                    $this.data('distributionNetwork', new DistributionNetwork(this, options));
+                } else {
+                    if (typeof option === 'string') {
+                        inst[option].apply(inst, Array.prototype.slice.call(pickerArgs, 1));
+                    }
+                }
+            });
+        };
+
+        $.fn.distributionNetwork.constructor = DistributionNetwork;
+    }));
diff --git a/cti-python-stix2 b/cti-python-stix2
index 469d17bce..407f346eb 160000
--- a/cti-python-stix2
+++ b/cti-python-stix2
@@ -1 +1 @@
-Subproject commit 469d17bceeed65373da3ac3b4f96600dfea8ca68
+Subproject commit 407f346eb8118d57b43035ef0da47e2ff77ed00e
diff --git a/docs/INSTALL.ubuntu1804.md b/docs/INSTALL.ubuntu1804.md
index ac824839c..be25500c5 100644
--- a/docs/INSTALL.ubuntu1804.md
+++ b/docs/INSTALL.ubuntu1804.md
@@ -473,6 +473,13 @@ echo "User  (misp) DB Password: $DBPASSWORD_MISP"
 sudo -H -u www-data ${PATH_TO_MISP}/venv/bin/pip install pyzmq
 ```
 
+#### MISP has a feature for publishing events to Kafka. To enable it, simply run the following commands
+```bash
+apt-get install librdkafka-dev php-dev
+pecl install rdkafka
+find /etc -name php.ini | while read f; do echo 'extension=rdkafka.so' | tee -a "$f"; done
+```
+
 {!generic/misp-dashboard-debian.md!}
 
 {!generic/viper-debian.md!}
diff --git a/docs/archive/INSTALL.ubuntu1604.md b/docs/archive/INSTALL.ubuntu1604.md
index c9d3b76d7..f5c6e3692 100644
--- a/docs/archive/INSTALL.ubuntu1604.md
+++ b/docs/archive/INSTALL.ubuntu1604.md
@@ -441,6 +441,13 @@ echo "User  (misp) DB Password: $DBPASSWORD_MISP"
 sudo -H -u www-data /var/www/MISP/venv/bin/pip install pyzmq
 ```
 
+#### MISP has a feature for publishing events to Kafka. To enable it, simply run the following commands
+```bash
+apt-get install librdkafka-dev php-dev
+pecl install rdkafka
+find /etc -name php.ini | while read f; do echo 'extension=rdkafka.so' | tee -a "$f"; done
+```
+
 !!! warning
     There is an issue with the apache config of misp-dashboard in Ubuntu 16.04
     You need to **remove** the following 3 options from **WSGIDaemonProcess**
diff --git a/docs/generic/mail_to_misp-debian.md b/docs/generic/mail_to_misp-debian.md
index aa56612af..b12939f54 100644
--- a/docs/generic/mail_to_misp-debian.md
+++ b/docs/generic/mail_to_misp-debian.md
@@ -7,17 +7,20 @@
 mail2misp () {
   debug "Installing Mail2${LBLUE}MISP${NC}"
   cd /usr/local/src/
-  sudo apt-get install cmake libcaca-dev -y
+  sudo apt-get install cmake libcaca-dev liblua5.3-dev -y
   $SUDO_USER git clone https://github.com/MISP/mail_to_misp.git
   $SUDO_USER git clone git://github.com/stricaud/faup.git faup
-  sudo chown -R ${MISP_USER}:${MISP_USER} faup mail_to_misp
-  cd faup
-  # TODO Check permissions
-  ##$SUDO mkdir -p build
+  $SUDO_USER git clone git://github.com/stricaud/gtcaca.git gtcaca
+  sudo chown -R ${MISP_USER}:${MISP_USER} faup mail_to_misp gtcaca
+  cd gtcaca
+  $SUDO_USER mkdir -p build
+  cd build
+  $SUDO_USER cmake .. && $SUDO_USER make
+  sudo make install
+  cd ../../faup
   $SUDO_USER mkdir -p build
   cd build
   $SUDO_USER cmake .. && $SUDO_USER make
-  ##$SUDO cmake .. && $SUDO make
   sudo make install
   sudo ldconfig
   cd ../../mail_to_misp
diff --git a/docs/generic/misp-modules-debian.md b/docs/generic/misp-modules-debian.md
index 990125054..4b359d77d 100644
--- a/docs/generic/misp-modules-debian.md
+++ b/docs/generic/misp-modules-debian.md
@@ -8,6 +8,7 @@ mispmodules () {
 ##sudo sed -i -e '$i \sudo -u www-data /var/www/MISP/venv/bin/misp-modules -l 127.0.0.1 -s > /tmp/misp-modules_rc.local.log &\n' /etc/rc.local
   cd /usr/local/src/
   ## TODO: checkUsrLocalSrc in main doc
+  debug "Cloning misp-modules"
   $SUDO_USER git clone https://github.com/MISP/misp-modules.git
   cd misp-modules
   # some misp-modules dependencies
diff --git a/docs/generic/supportFunctions.md b/docs/generic/supportFunctions.md
index 79a91563e..504ccb2ec 100644
--- a/docs/generic/supportFunctions.md
+++ b/docs/generic/supportFunctions.md
@@ -277,25 +277,14 @@ checkUsrLocalSrc () {
     else
       # TODO: The below might be shorter, more elegant and more modern
       #[[ -n $KALI ]] || [[ -n $UNATTENDED ]] && echo "Just do it" 
-      if [ "$KALI" == "1" -o "$UNATTENDED" == "1" ]; then
-        ANSWER="y"
-      else
-        space
-        echo "/usr/local/src need to be writeable by $MISP_USER for misp-modules, viper etc."
-        echo -n "Permission to fix? (y/n) "
-        read ANSWER
-        ANSWER=$(echo $ANSWER |tr [A-Z] [a-z])
-        space
-      fi
-      if [ "$ANSWER" == "y" ]; then
-        sudo chmod 2775 /usr/local/src
-        sudo chown root:staff /usr/local/src
-      fi
+      sudo chmod 2775 /usr/local/src
+      sudo chown root:staff /usr/local/src
     fi
   else
     echo "/usr/local/src does not exist, creating."
-    mkdir /usr/local/src
+    mkdir -p /usr/local/src
     sudo chmod 2775 /usr/local/src
+    # FIXME: This might fail on distros with no staff user
     sudo chown root:staff /usr/local/src
   fi
 }
@@ -658,7 +647,7 @@ genRCLOCAL () {
 
 # Run PyMISP tests
 runTests () {
-  sudo sed -i -E "s/url\ =\ (.*)/url\ =\ 'https:\/\/misp.local'/g" $PATH_TO_MISP/PyMISP/tests/testlive_comprehensive.py
+  sudo sed -i -E "s~url\ =\ (.*)~url\ =\ '${MISP_BASEURL}'~g" $PATH_TO_MISP/PyMISP/tests/testlive_comprehensive.py
   sudo sed -i -E "s/key\ =\ (.*)/key\ =\ '${AUTH_KEY}'/g" $PATH_TO_MISP/PyMISP/tests/testlive_comprehensive.py
   sudo chown -R $WWW_USER:$WWW_USER $PATH_TO_MISP/PyMISP/
 
diff --git a/docs/xINSTALL.debian9.md b/docs/xINSTALL.debian9.md
index a3e21f312..a113212af 100644
--- a/docs/xINSTALL.debian9.md
+++ b/docs/xINSTALL.debian9.md
@@ -490,6 +490,13 @@ In case you are using a virtualenv make sure pyzmq is installed therein.
 sudo -u www-data ${PATH_TO_MISP}/venv/bin/pip install pyzmq
 ```
 
+#### MISP has a feature for publishing events to Kafka. To enable it, simply run the following commands
+```bash
+apt-get install librdkafka-dev php-dev
+pecl install rdkafka
+find /etc -name php.ini | while read f; do echo 'extension=rdkafka.so' | tee -a "$f"; done
+```
+
 {!generic/misp-dashboard-debian.md!}
 
 {!generic/viper-debian.md!}
diff --git a/docs/xINSTALL.debian_testing.md b/docs/xINSTALL.debian_testing.md
index e88103d94..af66308cf 100644
--- a/docs/xINSTALL.debian_testing.md
+++ b/docs/xINSTALL.debian_testing.md
@@ -486,6 +486,13 @@ In case you are using a virtualenv make sure pyzmq is installed therein.
 sudo -u www-data ${PATH_TO_MISP}/venv/bin/pip install pyzmq
 ```
 
+#### MISP has a feature for publishing events to Kafka. To enable it, simply run the following commands
+```bash
+apt-get install librdkafka-dev php-dev
+pecl install rdkafka
+find /etc -name php.ini | while read f; do echo 'extension=rdkafka.so' | tee -a "$f"; done
+```
+
 {!generic/misp-dashboard-debian.md!}
 
 {!generic/viper-debian.md!}
diff --git a/docs/xINSTALL.ubuntu1804.with.webmin.md b/docs/xINSTALL.ubuntu1804.with.webmin.md
index 21649bf45..48c415fd8 100644
--- a/docs/xINSTALL.ubuntu1804.with.webmin.md
+++ b/docs/xINSTALL.ubuntu1804.with.webmin.md
@@ -444,6 +444,13 @@ sudo pip3 install pyzmq
 sudo pip3 install redis
 ```
 
+#### MISP has a feature for publishing events to Kafka. To enable it, simply run the following commands
+```bash
+apt-get install librdkafka-dev php-dev
+pecl install rdkafka
+find /etc -name php.ini | while read f; do echo 'extension=rdkafka.so' | tee -a "$f"; done
+```
+
 #### Experimental ssdeep correlations
 ```bash
 # installing ssdeep
diff --git a/tools/misp-backup/misp-backup.conf.sample b/tools/misp-backup/misp-backup.conf.sample
index bdac411eb..88972e1e8 100644
--- a/tools/misp-backup/misp-backup.conf.sample
+++ b/tools/misp-backup/misp-backup.conf.sample
@@ -1,5 +1,5 @@
 # Path to your MISP installation
-MISPPath=/var/www/MISP
+PATH_TO_MISP=/var/www/MISP
 
 # First part of output file name
 # Name of output file for default would be e.g. MISP-Backup-20170601_215628.tar.gz
diff --git a/tools/misp-backup/misp-backup.sh b/tools/misp-backup/misp-backup.sh
index e1fe5ee36..fcf81c120 100755
--- a/tools/misp-backup/misp-backup.sh
+++ b/tools/misp-backup/misp-backup.sh
@@ -1,8 +1,7 @@
-#@IgnoreInspection BashAddShebang
-#!/bin/sh
+#!/usr/bin/env bash
 ## $Id: misp-backup.sh 07.04.2016 $
 ##
-## script to backup MISP on debian/ubuntu 18.04.1
+## script to backup MISP on debian/ubuntu 18.04.2
 ##
 ## Authored by daverstephens@gmail.com
 ## https://github.com/daverstephens/The-SOC-Shop
@@ -15,22 +14,31 @@
 
 ##
 ## This script can be used to backup a complete MISP
-## DB and config to restore onto a freshly
+## MySQL DB and config to restore onto a freshly
 ## built system. This is not intended as an upgrade script
 ## to move between MISP versions - But it might work ;).
 ##
-## Tested against MISP 2.4.101
+## Tested against MISP 2.4.102
 ##
-## Run the script as the standard user with the command below
+## Run the script as the standard web user with the command below
 ##
 ## cp misp-backup.conf.sample misp-backup.conf
 ## vi misp-backup.conf # adjust values
-## sudo sh -x misp-backup.sh 2>&1 | tee misp-backup.log
+## sudo bash misp-backup.sh 2>&1 | tee misp-backup.log
 ##
 ## TODO: Target directory, rudimentary free space check: stat -f --format="%a" OutputDirName
 ## TODO: Make sure no directories are blank
+## TODO: Review how much sense it makes to ask fo MySQL credentials when most of the script does auto detection anyway.
 ##
 
+# Leave empty for NO debug messages, if run with set -x or bash -x it will enable DEBUG by default
+DEBUG=
+
+case "$-" in
+  *x*)  NO_PROGRESS=1; DEBUG=1 ;;
+  *)    NO_PROGRESS=0 ;;
+esac
+
 ## Functions
 
 # Dynamic horizontal spacer
@@ -48,91 +56,161 @@ space () {
 
 # Make sure the target has enough free space
 checkDiskFree () {
+  if [[ ! -e $1 ]]; then
+    echo "$1 does not exist, creating"
+    mkdir -p $1
+  fi
   threshhold=90
   free=$(df -l --sync --output=pcent $1 |tail -1|cut -f 1 -d% | tr -d \ )
-  if [ $free > $threshhold ]; then
+  if [[ "$free" > "$threshhold" ]]; then
+    space
     echo "Your destination folder is $threshhold% full."
+    space
     exit 1
   fi
 }
 
+# Check if variable is empty
+checkVar () {
+  [[ $# < 1 ]] && echo "checkVar function needs at least 1 argument. Please fix." && exit 1
+  [[ -z "$2" ]] && echo "The variable '$1' is empty, please investigate." && exit 1
+}
+
 ## Time to set some variables
 ##
 
 FILE=./misp-backup.conf
 
+# Extract base directory where this script is and cd into it
+cd "${0%/*}"
+
+# Set to the current webroot owner
+WWW_USER=$(ls -l $0 |awk {'print $3'}|tail -1)
+
+# In most cases the owner of the cake script is also the user as which it should be executed.
+if [[ "$USER" != "$WWW_USER" ]]; then
+  echo "You run this script as $USER and the owner of the backup script is $WWW_USER. FYI."
+  space
+fi
+
+# Check if run as root
+if [[ "$EUID" != "0" ]]; then
+    space
+    echo "Please run the backup script as root"
+    space
+    exit 1
+fi
+
 # Source configuration file
 if [ -f $FILE ];
 then
-   echo "File $FILE exists."
+  echo "File $(pwd)$FILE exists."
+  space
    . $FILE
 else
         echo "Config File $FILE does not exist. Please enter values manually"
-        ## MySQL stuff
-        echo 'Please enter your MySQL root account username'
+        space
+        echo -n 'Please enter your MySQL root account username: '
         read MySQLRUser
-        echo 'Please enter your MySQL root account password'
+        echo -n 'Please enter your MySQL root account password: '
         read MySQLRPass
-        echo 'What would you like to call the backup archive?'
-        echo 'Eg. MISPBackup'
+        echo -n 'Please enter a name for the backup archive (e.g MISPBackup): '
         read OutputFileName
-        echo 'Where would you like to save the file?'
-        echo 'Eg. /tmp'
+        echo -n 'Please enter the destination for the archive (e.g /tmp): '
         read OutputDirName
 fi
 
-
 # Fill in any missing values with defaults
 
-# MISP path
-MISPPath=${MISPPath:-$(locate MISP/app/webroot/index.php|sed 's/\/app\/webroot\/index\.php//')}
+# MISP path detector
+if [[ -z $PATH_TO_MISP ]]; then
+  if [[ "$(locate > /dev/null 2> /dev/null ; echo $?)" != "127" ]]; then
+    if [[ "$(locate MISP/app/webroot/index.php |wc -l)" > 1 ]]; then
+      echo "We located more then 1 MISP/app/webroot, reverting to manual"
+      PATH_TO_MISP=${PATH_TO_MISP:-$(locate MISP/app/webroot/index.php|sed 's/\/app\/webroot\/index\.php//')}
+      echo -n 'Please enter the base path of your MISP install (e.g /var/www/MISP): '
+      read PATH_TO_MISP
+      space
+    fi
+  fi
+fi
+
 # Output
 OutputFileName=${OutputFileName:-MISP-Backup}
 OutputDirName=${OutputDirName:-/tmp}
 OutputFull="${OutputDirName}/${OutputFileName}-$(date '+%Y%m%d_%H%M%S').tar.gz"
-# database.php
-MySQLUUser=$(grep -o -P "(?<='login' => ').*(?=')" $MISPPath/app/Config/database.php)
-MySQLUPass=$(grep -o -P "(?<='password' => ').*(?=')" $MISPPath/app/Config/database.php)
-MISPDB=$(grep -o -P "(?<='database' => ').*(?=')" $MISPPath/app/Config/database.php)
-DB_Port=$(grep -o -P "(?<='port' => ).*(?=,)" $MISPPath/app/Config/database.php)
-MISPDBHost=$(grep -o -P "(?<='host' => ').*(?=')" $MISPPath/app/Config/database.php)
-# config.php
-Salt=$(grep -o -P "(?<='salt' => ').*(?=')" $MISPPath/app/Config/config.php)
-BaseURL=$(grep -o -P "(?<='baseurl' => ').*(?=')" $MISPPath/app/Config/config.php)
-OrgName=$(grep -o -P "(?<='org' => ').*(?=')" $MISPPath/app/Config/config.php)
-LogEmail=$(grep -o -P "(?<='email' => ').*(?=')" $MISPPath/app/Config/config.php|head -1)
-AdminEmail=$(grep -o -P "(?<='contact' => ').*(?=')" $MISPPath/app/Config/config.php)
-GnuPGEmail=$(sed -n -e '/GnuPG/,$p' $MISPPath/app/Config/config.php|grep -o -P "(?<='email' => ').*(?=')")
-GnuPGHomeDir=$(grep -o -P "(?<='homedir' => ').*(?=')" $MISPPath/app/Config/config.php)
-GnuPGPass=$(grep -o -P "(?<='password' => ').*(?=')" $MISPPath/app/Config/config.php)
 
-## Folders to be checked for useable space: OutputDirName
-## To be checked for emptiness: all?
+# database.php
+MySQLUUser=$(grep -o -P "(?<='login' => ').*(?=')" $PATH_TO_MISP/app/Config/database.php) ; \
+  checkVar MySQLUUser $(echo $MySQLUUser)
+
+MySQLUPass=$(grep -o -P "(?<='password' => ').*(?=')" $PATH_TO_MISP/app/Config/database.php) ; \
+  checkVar MySQLUPass $(echo $MySQLUPass)
+
+MISPDB=$(grep -o -P "(?<='database' => ').*(?=')" $PATH_TO_MISP/app/Config/database.php) ; \
+  checkVar MISPDB $(echo $MISPDB)
+
+DB_Port=$(grep -o -P "(?<='port' => ).*(?=,)" $PATH_TO_MISP/app/Config/database.php |head -1) ; \
+  checkVar DB_Port $(echo $DB_Port)
+
+MISPDBHost=$(grep -o -P "(?<='host' => ').*(?=')" $PATH_TO_MISP/app/Config/database.php) ; \
+  checkVar MISPDBHost $(echo $MISPDBHost)
+
+# config.php
+BaseURL=$(grep -o -P "(?<='baseurl' => ').*(?=')" $PATH_TO_MISP/app/Config/config.php) # BaseURL can be empty
+GnuPGPass=$(grep -o -P "(?<='password' => ').*(?=')" $PATH_TO_MISP/app/Config/config.php) # GnuPGPass can be empty
+
+Salt=$(grep -o -P "(?<='salt' => ').*(?=')" $PATH_TO_MISP/app/Config/config.php) ; \
+  checkVar Salt $(echo $Salt)
+
+OrgName=$(grep -o -P "(?<='org' => ').*(?=')" $PATH_TO_MISP/app/Config/config.php) ; \
+  checkVar OrgName $(echo $OrgName)
+
+LogEmail=$(grep -o -P "(?<='email' => ').*(?=')" $PATH_TO_MISP/app/Config/config.php|head -1) ; \
+  checkVar LogEmail $(echo $LogEmail)
+
+AdminEmail=$(grep -o -P "(?<='contact' => ').*(?=')" $PATH_TO_MISP/app/Config/config.php) ; \
+  checkVar AdminEmail $(echo $AdminEmail)
+
+GnuPGEmail=$(sed -n -e '/GnuPG/,$p' $PATH_TO_MISP/app/Config/config.php|grep -o -P "(?<='email' => ').*(?=')") ; \
+  checkVar GnuPGEmail $(echo $GnuPGEmail)
+
+GnuPGHomeDir=$(grep -o -P "(?<='homedir' => ').*(?=')" $PATH_TO_MISP/app/Config/config.php) ; \
+  checkVar GnuPGHomeDir $(echo $GnuPGHomeDir)
+
+
+checkDiskFree $OutputDirName
 
 # Create backup files
 TmpDir="$(mktemp --tmpdir=$OutputDirName -d)"
-cp -r $GnuPGHomeDir/* $TmpDir/
+cp -rp $GnuPGHomeDir/* $TmpDir/
 echo "copy of org images and other custom images"
-cp -r $MISPPath/app/webroot/img/orgs $TmpDir/
-cp -r $MISPPath/app/webroot/img/custom $TmpDir/
-cp -r $MISPPath/app/files $TmpDir
+cp -rp $PATH_TO_MISP/app/webroot/img/orgs $TmpDir/
+cp -rp $PATH_TO_MISP/app/webroot/img/custom $TmpDir/
+cp -rp $PATH_TO_MISP/app/files $TmpDir
 
 #  MISP Config files
 mkdir -p $TmpDir/Config
-cp $MISPPath/app/Config/bootstrap.php $TmpDir/Config
-cp $MISPPath/app/Config/config.php $TmpDir/Config
-cp $MISPPath/app/Config/core.php $TmpDir/Config
-cp $MISPPath/app/Config/database.php $TmpDir/Config
+cp -p $PATH_TO_MISP/app/Config/bootstrap.php $TmpDir/Config
+cp -p $PATH_TO_MISP/app/Config/config.php $TmpDir/Config
+cp -p $PATH_TO_MISP/app/Config/core.php $TmpDir/Config
+cp -p $PATH_TO_MISP/app/Config/database.php $TmpDir/Config
 
 echo "MySQL Dump"
 MySQLRUser=${MySQLRUser:-$MySQLUUser}
 MySQLRPass=${MySQLRPass:-$MySQLUPass}
 mysqldump --opt -u $MySQLRUser -p$MySQLRPass $MISPDB > $TmpDir/MISPbackupfile.sql
+if [[ "$?" != "0" ]]; then
+  echo "MySQLdump failed, abort." && exit 1
+fi
 # Create compressed archive
 cd $TmpDir
-tar -zcf $OutputFull ./*
+tar -pzcf $OutputFull ./*
 cd -
 rm -rf $TmpDir
+space
 echo "MISP Backup Completed, OutputDir: ${OutputDirName}"
+space
 echo "FileName: ${OutputFileName}-$(date '+%Y%m%d_%H%M%S').tar.gz"
 echo "FullName: ${OutputFull}"
+space
diff --git a/tools/misp-backup/misp-restore.sh b/tools/misp-backup/misp-restore.sh
old mode 100644
new mode 100755
index c279bc522..ea750a9ed
--- a/tools/misp-backup/misp-restore.sh
+++ b/tools/misp-backup/misp-restore.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 # 
 # Inspired from daverstephens@gmail.com and @alexanderjaeger work on misp-backup.sh
 #
@@ -22,58 +22,166 @@
 #
 # sudo sh ./misp-restore.sh  PATH_TO_ARCHIVE.tar.gz
 # 
+
+# TODO: Make script UNATTENDEDable
+# TODO: Move DB, check DB?
+# TODO: Check db user exists.
+
+# Leave empty for NO debug messages, if run with set -x or bash -x it will enable DEBUG by default
+DEBUG=
+
+case "$-" in
+  *x*)  NO_PROGRESS=1; DEBUG=1 ;;
+  *)    NO_PROGRESS=0 ;;
+esac
+
+## Functions
+
+# Dynamic horizontal spacer
+space () {
+  if [[ "$NO_PROGRESS" == "1" ]]; then
+    return
+  fi
+  # Check terminal width
+  num=`tput cols`
+  for i in `seq 1 $num`; do
+    echo -n "-"
+  done
+  echo ""
+}
+
+# Make sure the target has enough free space
+checkDiskFree () {
+  if [[ ! -e $1 ]]; then
+    echo "$1 does not exist, creating"
+    mkdir -p $1
+  fi
+  threshhold=90
+  free=$(df -l --sync --output=pcent $1 |tail -1|cut -f 1 -d% | tr -d \ )
+  if [[ "$free" > "$threshhold" ]]; then
+    space
+    echo "Your destination folder is $threshhold% full."
+    space
+    exit 1
+  fi
+}
+
+# Check if variable is empty
+checkVar () {
+  [[ -z $1 ]] && echo "$1 is empty, please investigate." && exit 1
+}
+
+# Small function to import SQL export
+mysqlImport () {
+  myDB=$(mysqlshow |grep -o $MISPDB)
+  if [[ "$myDB" == "$MISPDB" ]]; then
+    echo -n "$myDB detected, I can remove this if wanted. (y/n) "
+    read REMOVE
+    REMOVE=$(echo $REMOVE |tr [A-Z] [a-z])
+    [[ "$REMOVE" == "y" ]] && mysqladmin drop $myDB
+  fi
+
+  mysql -h $MISPDBHost -u $MySQLRUser -p -Bse "CREATE DATABASE IF NOT EXISTS $MISPDB ;\
+      GRANT USAGE ON *.* TO '$MySQLUUser'@'localhost' IDENTIFIED BY '$MySQLUPass';\
+      GRANT ALL PRIVILEGES ON $MISPDB.* TO '$MySQLUUser'@'localhost' ; \
+      FLUSH PRIVILEGES;"
+
+  mysql -s -h $MISPDBHost -u $MySQLUUser -p$MySQLUPass $MISPDB < $BackupDir/MISPbackupfile.sql
+}
 echo '-- Starting MISP restore process'
 
 FILE=./misp-backup.conf
 
-if [ ! -z $1 ] && [ -f $1 ];
-then 
+# Extract base directory where this script is and cd into it
+cd "${0%/*}"
+
+# Set to the current webroot owner
+WWW_USER=$(ls -l $0 |awk {'print $3'}|tail -1)
+
+MySQLRUser="root"
+
+# In most cases the owner of the cake script is also the user as which it should be executed.
+if [[ "$USER" != "$WWW_USER" ]]; then
+  echo "You run this script as $USER and the owner of the backup script is $WWW_USER, this should be your web server user. FYI."
+fi
+
+# Check if run as root
+if [[ "$EUID" != "0" ]]; then
+    echo "Please run the backup script as root"
+    exit 1
+fi
+
+if [ ! -z $1 ] && [ -f $1 ]; then 
     BackupFile=$1
 else
     echo 'Specify backup file by running ./misp-restore.sh  PATH_TO_ARCHIVE.tar.gz'
-exit 1
+    exit 1
 fi
 
 # Source configuration file
-if [ -f $FILE ];
-then
-   echo "--- File $FILE exists."
-   . $FILE
+if [ -f $FILE ]; then
+  echo "--- File $(pwd)$FILE exists."
+  . $FILE
 else
-        echo "--- Config File $FILE does not exist. Please enter values manually"
-        echo '--- Where would you like to decompress backup files?'
-        echo 'Eg. /tmp'
-        read OutputDirName
+  echo "--- Config File $FILE does not exist. Please enter values manually"
+  echo -n '--- Where would you like to decompress backup files (Eg. /tmp)? '
+  read OutputDirName
 fi
 
+checkDiskFree OutputDirName
+
 # Decompress archive
 BackupDir=$OutputDirName/$(basename -s ".tar.gz" $BackupFile)
 mkdir $BackupDir
 echo '--- Decompressing files'
-tar zxf $1 -C $BackupDir
+tar zxpf $BackupFile -C $BackupDir
 
 # Fill in any missing values with defaults
-# MISP path - Required : MISP should be installed
-MISPPath=${MISPPath:-$(locate MISP/app/webroot/index.php|sed 's/\/app\/webroot\/index\.php//')}
+# MISP path detector
+if [[ -z $UNATTENDED ]]; then
+  if [[ -z $PATH_TO_MISP ]]; then
+    if [[ "$(locate > /dev/null 2> /dev/null ; echo $?)" != "127" ]]; then
+      if [[ "$(locate MISP/app/webroot/index.php |wc -l)" > 1 ]]; then
+        echo "We located more then 1 MISP/app/webroot, reverting to manual"
+        PATH_TO_MISP=${PATH_TO_MISP:-$(locate MISP/app/webroot/index.php|sed 's/\/app\/webroot\/index\.php//')}
+        echo -n 'Please enter the base path of your MISP install (e.g /var/www/MISP): '
+        read PATH_TO_MISP
+      fi
+    fi
+  fi
 
+  if [[ -d $PATH_TO_MISP ]] && [[ -f $PATH_TO_MISP/VERSION.json ]]; then
+    echo "$PATH_TO_MISP exists and seems to include an existing install."
+    echo "We can move it out of the way, or leave as is."
+    echo -n "Move $PATH_TO_MISP to $OutputDirName/MISP-$(date +%Y%m%d)?"
+    read MOVE
+    MOVE=$(echo $MOVE |tr [A-Z] [a-z])
+    [[ "$MOVE" == "y" ]] && mv $PATH_TO_MISP $OutputDirName/MISP-$(date +%Y%m%d) && mkdir $PATH_TO_MISP
+  fi
+fi
 
 # database.php
-MySQLUUser=$(grep -o -P "(?<='login' => ').*(?=')" $BackupDir/Config/database.php)
-MySQLUPass=$(grep -o -P "(?<='password' => ').*(?=')" $BackupDir/Config/database.php)
-MISPDB=$(grep -o -P "(?<='database' => ').*(?=')" $BackupDir/Config/database.php)
-DB_Port=$(grep -o -P "(?<='port' => ).*(?=,)" $BackupDir/Config/database.php)
-MISPDBHost=$(grep -o -P "(?<='host' => ').*(?=')" $BackupDir/Config/database.php)
+MySQLUUser=$(grep -o -P "(?<='login' => ').*(?=')" $BackupDir/Config/database.php) ; checkVar MySQLUUser
+MySQLUPass=$(grep -o -P "(?<='password' => ').*(?=')" $BackupDir/Config/database.php) ; checkVar MySQLUPass
+MISPDB=$(grep -o -P "(?<='database' => ').*(?=')" $BackupDir/Config/database.php) ; checkVar MISPDB
+DB_Port=$(grep -o -P "(?<='port' => ).*(?=,)" $BackupDir/Config/database.php) ; checkVar DB_Port
+MISPDBHost=$(grep -o -P "(?<='host' => ').*(?=')" $BackupDir/Config/database.php) ; checkVar MISPDBHost
 
 # config.php
-Salt=$(grep -o -P "(?<='salt' => ').*(?=')" $BackupDir/Config/config.php)
-BaseURL=$(grep -o -P "(?<='baseurl' => ').*(?=')" $BackupDir/Config/config.php)
-OrgName=$(grep -o -P "(?<='org' => ').*(?=')" $BackupDir/Config/config.php)
-LogEmail=$(grep -o -P "(?<='email' => ').*(?=')" $BackupDir/Config/config.php|head -1)
-AdminEmail=$(grep -o -P "(?<='contact' => ').*(?=')" $BackupDir/Config/config.php)
-GnuPGEmail=$(sed -n -e '/GnuPG/,$p' $BackupDir/Config/config.php|grep -o -P "(?<='email' => ').*(?=')")
-GnuPGHomeDir=$(grep -o -P "(?<='homedir' => ').*(?=')" $BackupDir/Config/config.php)
-GnuPGPass=$(grep -o -P "(?<='password' => ').*(?=')" $BackupDir/Config/config.php)
+Salt=$(grep -o -P "(?<='salt' => ').*(?=')" $BackupDir/Config/config.php) ; checkVar Salt
+BaseURL=$(grep -o -P "(?<='baseurl' => ').*(?=')" $BackupDir/Config/config.php) # BaseURL can be empty
+OrgName=$(grep -o -P "(?<='org' => ').*(?=')" $BackupDir/Config/config.php) ; checkVar OrgName
+LogEmail=$(grep -o -P "(?<='email' => ').*(?=')" $BackupDir/Config/config.php|head -1) ; checkVar LogEmail
+AdminEmail=$(grep -o -P "(?<='contact' => ').*(?=')" $BackupDir/Config/config.php) ; checkVar AdminEmail
+GnuPGEmail=$(sed -n -e '/GnuPG/,$p' $BackupDir/Config/config.php|grep -o -P "(?<='email' => ').*(?=')") ; checkVar GnuPGEmail
+GnuPGHomeDir=$(grep -o -P "(?<='homedir' => ').*(?=')" $BackupDir/Config/config.php) ; checkVar GnuPGHomeDir
+GnuPGPass=$(grep -o -P "(?<='password' => ').*(?=')" $BackupDir/Config/config.php) ; checkVar GnuPGPass
 
+if [[ -f /tmp/MISPbackupfile.sql ]]; then
+  mysqlImport
+  rm /tmp/MISPbackupfile.sql
+  exit
+fi
 
 # Restore backup files
 echo "--- Copy of GnuPG files"
@@ -83,21 +191,21 @@ cp $BackupDir/random_seed $GnuPGHomeDir/
 
 
 echo "--- Copy of org and images and files"
-cp -r $BackupDir/orgs $MISPPath/app/webroot/img/
-cp -r $BackupDir/custom $MISPPath/app/webroot/img/
-cp -r $BackupDir/files $MISPPath/app/
+cp -pr $BackupDir/orgs $PATH_TO_MISP/app/webroot/img/
+cp -pr $BackupDir/custom $PATH_TO_MISP/app/webroot/img/
+cp -pr $BackupDir/files $PATH_TO_MISP/app/
 
 
 #  Restore MISP Config files
 echo "--- Copy of app/Config files"
-cp $BackupDir/Config/bootstrap.php $MISPPath/app/Config
-cp $BackupDir/Config/config.php $MISPPath/app/Config
-cp $BackupDir/Config/core.php $MISPPath/app/Config
-cp $BackupDir/Config/database.php $MISPPath/app/Config
+cp -p $BackupDir/Config/bootstrap.php $PATH_TO_MISP/app/Config
+cp -p $BackupDir/Config/config.php $PATH_TO_MISP/app/Config
+cp -p $BackupDir/Config/core.php $PATH_TO_MISP/app/Config
+cp -p $BackupDir/Config/database.php $PATH_TO_MISP/app/Config
 
 # Permissions
 echo "--- Setting persmissions"
-chown -R www-data:www-data /var/www/MISP
+chown -R $WWW_USER:$WWW_USER /var/www/MISP
 chmod -R 750 /var/www/MISP
 chmod -R g+ws /var/www/MISP/app/tmp
 chmod -R g+ws /var/www/MISP/app/files
@@ -107,17 +215,26 @@ chmod -R g+ws /var/www/MISP/app/files/scripts/tmp
 
 # Restore DB
 echo "--- Starting MySQL database Restore"
-echo '---- Please enter your MySQL root account username'
+echo -n '---- Please enter your MySQL root account username: '
 read MySQLRUser
 
 echo "---- Creating database and user if not exists with data found in MISP configuration files"
-mysql -h $MISPDBHost -u $MySQLRUser -p -Bse "CREATE DATABASE IF NOT EXISTS $MISPDB ;\
-    GRANT USAGE ON *.* TO '$MySQLUUser'@'localhost' IDENTIFIED BY '$MySQLUPass';\
-    GRANT ALL PRIVILEGES ON $MISPDB.* TO '$MySQLUUser'@'localhost' ; \
-    FLUSH PRIVILEGES;"
+mysqlImport
+
+##if [[ "$returnCode" != "0" ]]; then
+##  echo "Something went wrong, MySQL returned: $returnCode"
+##  echo "The MISPbackupfile.sql will be copied to: /tmp for you to handle this situation manually."
+##  echo "You can also run this script again and we will retry to import the SQL."
+##  cp $BackupDir/MISPbackupfile.sql /tmp > /dev/null 2> /dev/null
+##  rm -rf $BackupDir
+##  exit $returnCode
+##fi
 
-mysql -s -h $MISPDBHost -u $MySQLUUser -p$MySQLUPass $MISPDB < $BackupDir/MISPbackupfile.sql
     
 rm -rf $BackupDir
 
-echo "-- MISP Restore Complete!!! URL:  $BaseURL"
+if [[ ! -z $BaseURL ]]; then
+  echo "-- MISP Restore Complete! URL: $BaseURL"
+else
+  echo "-- MISP Restore Complete!"
+fi